From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from g4t3425.houston.hp.com (g4t3425.houston.hp.com [15.201.208.53]) by dpdk.org (Postfix) with ESMTP id A147995DE for ; Mon, 7 Dec 2015 16:00:04 +0100 (CET) Received: from g9t2301.houston.hp.com (g9t2301.houston.hp.com [16.216.185.78]) by g4t3425.houston.hp.com (Postfix) with ESMTP id ECE0664 for ; Mon, 7 Dec 2015 15:00:03 +0000 (UTC) Received: from laptop.telco.fc.hp.com (unknown [16.79.28.131]) by g9t2301.houston.hp.com (Postfix) with ESMTP id B3B944C; Mon, 7 Dec 2015 15:00:03 +0000 (UTC) From: Lee Roberts To: dev@dpdk.org Date: Mon, 7 Dec 2015 07:59:59 -0700 Message-Id: <1449500399-3060-1-git-send-email-lee.roberts@hpe.com> X-Mailer: git-send-email 1.9.1 Subject: [dpdk-dev] [PATCH 1/1] kni: Fix compilation problems on RHEL 7.2. X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 07 Dec 2015 15:00:04 -0000 RHEL 7.2 contains additional backports from newer upstream kernels. Add RHEL_RELEASE_CODE logic for RHEL_RELEASE_VERSION(7,2) to pick up the changes to kernel functions. Signed-off-by: Lee Roberts --- lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c | 4 ++-- lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c index b330b20..9d4fa59 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c @@ -2274,7 +2274,7 @@ static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, else mode = BRIDGE_MODE_VEPA; -#ifdef HAVE_NDO_FDB_ADD_VID +#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,7 +2287,7 @@ static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq, #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_NDO_DFLT_BRIDGE_ADD_MASK */ } #endif /* HAVE_BRIDGE_ATTRIBS */ #endif /* NTF_SELF */ diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index 68a3b9f..e2cf71e 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h @@ -3881,20 +3881,29 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type) #endif /* < RHEL7 */ #endif /* < 3.14.0 */ -#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,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) ) +#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) ) +#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) ) -- 1.9.1