From: "Roberts, Lee A." <lee.roberts@hpe.com>
To: "dev@dpdk.org" <dev@dpdk.org>
Subject: Re: [dpdk-dev] dpdk 2.1 building failure on rhel 7.2 rc1
Date: Thu, 3 Dec 2015 18:31:14 +0000 [thread overview]
Message-ID: <D64EC45690EF85409BA6C4730E01622472D4B2F0@G4W3231.americas.hpqcorp.net> (raw)
When compiling DPDK 2.1.0 on RHEL 7.2, errors are encountered in ../librte_eal/linuxapp/kni/ethtool/igb/igb_main.c.
The following changes can be applied relative to dpdk-2.2.0-rc2 to resolve these issues.
- Lee Roberts
[root@dp91 lroberts]# diff -rc dpdk-2.2.0-rc2 dpdk-2.2.0-rc2-rhel7.2
diff -rc dpdk-2.2.0-rc2/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c dpdk-2.2.0-rc2-rhel7.2/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
*** dpdk-2.2.0-rc2/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c 2015-11-25 16:45:50.000000000 -0700
--- dpdk-2.2.0-rc2-rhel7.2/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c 2015-12-03 10:45:17.574014636 -0700
***************
*** 2274,2280 ****
else
mode = BRIDGE_MODE_VEPA;
! #ifdef HAVE_NDO_FDB_ADD_VID
#ifdef HAVE_NDO_BRIDGE_GETLINK_NLFLAGS
#ifdef HAVE_NDO_BRIDGE_GETLINK_FILTER_MASK_VLAN_FILL
return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0,
--- 2274,2280 ----
else
mode = BRIDGE_MODE_VEPA;
! #ifdef HAVE_NDO_DFLT_BRIDGE_ADD_MASK
#ifdef HAVE_NDO_BRIDGE_GETLINK_NLFLAGS
#ifdef HAVE_NDO_BRIDGE_GETLINK_FILTER_MASK_VLAN_FILL
return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0,
***************
*** 2287,2293 ****
#endif /* HAVE_NDO_BRIDGE_GETLINK_NLFLAGS */
#else
return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode);
! #endif /* HAVE_NDO_FDB_ADD_VID */
}
#endif /* HAVE_BRIDGE_ATTRIBS */
#endif /* NTF_SELF */
--- 2287,2293 ----
#endif /* HAVE_NDO_BRIDGE_GETLINK_NLFLAGS */
#else
return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode);
! #endif /* HAVE_NDO_DFLT_BRIDGE_ADD_MASK */
}
#endif /* HAVE_BRIDGE_ATTRIBS */
#endif /* NTF_SELF */
diff -rc dpdk-2.2.0-rc2/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h dpdk-2.2.0-rc2-rhel7.2/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
*** dpdk-2.2.0-rc2/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h 2015-11-25 16:45:50.000000000 -0700
--- dpdk-2.2.0-rc2-rhel7.2/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h 2015-12-03 10:51:09.551371049 -0700
***************
*** 3881,3900 ****
#endif /* < RHEL7 */
#endif /* < 3.14.0 */
! #if ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0) )
#define SET_ETHTOOL_OPS(netdev, ops) ((netdev)->ethtool_ops = (ops))
#define HAVE_VF_MIN_MAX_TXRATE 1
#endif /* >= 3.16.0 */
! #if ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) )
#define HAVE_NDO_FDB_ADD_VID
#endif /* >= 3.19.0 */
! #if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) )
/* vlan_tx_xx functions got renamed to skb_vlan */
#define vlan_tx_tag_get skb_vlan_tag_get
#define vlan_tx_tag_present skb_vlan_tag_present
#define HAVE_NDO_BRIDGE_SET_DEL_LINK_FLAGS
#endif /* 4.0.0 */
#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0) )
--- 3881,3909 ----
#endif /* < RHEL7 */
#endif /* < 3.14.0 */
! #if (( LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0) ) \
! || ( RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7,2) ))
! #undef SET_ETHTOOL_OPS
#define SET_ETHTOOL_OPS(netdev, ops) ((netdev)->ethtool_ops = (ops))
#define HAVE_VF_MIN_MAX_TXRATE 1
#endif /* >= 3.16.0 */
! #if (( LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0) ) \
! || ( RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7,2) ))
! #define HAVE_NDO_DFLT_BRIDGE_ADD_MASK
! #if (!( RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7,2) ))
#define HAVE_NDO_FDB_ADD_VID
+ #endif /* !RHEL 7.2 */
#endif /* >= 3.19.0 */
! #if (( LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) ) \
! || ( RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7,2) ))
/* vlan_tx_xx functions got renamed to skb_vlan */
#define vlan_tx_tag_get skb_vlan_tag_get
#define vlan_tx_tag_present skb_vlan_tag_present
+ #if (!( RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7,2) ))
#define HAVE_NDO_BRIDGE_SET_DEL_LINK_FLAGS
+ #endif /* !RHEL 7.2 */
#endif /* 4.0.0 */
#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,1,0) )
[root@dp91 lroberts]#
next reply other threads:[~2015-12-03 18:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-12-03 18:31 Roberts, Lee A. [this message]
2015-12-03 19:06 ` Thomas Monjalon
-- strict thread matches above, loose matches on Subject: below --
2015-11-13 20:09 Serguei Bezverkhi (sbezverk)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=D64EC45690EF85409BA6C4730E01622472D4B2F0@G4W3231.americas.hpqcorp.net \
--to=lee.roberts@hpe.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).