d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kni: fix igb build with kernel 4.2

Browse Source 
Kernel 4.2 has introduced two new parameters in ndo_bridge_getlink,
which breaks DPDK compilation.

Linux: 7d4f8d87 ("switchdev: ad VLAN support for ports bridge-getlink")

This patch adds the necessary checks to fix it.

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
This commit is contained in:
Pablo de Lara 2015-10-12 13:52:58 +01:00 committed by Thomas Monjalon
parent 492d31ac02
commit 00c1464382
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/librte_eal/linuxapp/kni/ethtool/igb/igb_main.c
View File

@ -2276,7 +2276,12 @@ static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
#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,
nlflags, filter_mask, NULL);
#else
return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0, nlflags);
#endif /* HAVE_NDO_BRIDGE_GETLINK_FILTER_MASK_VLAN_FILL */
#else
return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0);
#endif /* HAVE_NDO_BRIDGE_GETLINK_NLFLAGS */

5
lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
View File

@ -3901,4 +3901,9 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
/* ndo_bridge_getlink adds new nlflags parameter */
#define HAVE_NDO_BRIDGE_GETLINK_NLFLAGS
#endif /* >= 4.1.0 */
#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) )
/* ndo_bridge_getlink adds new filter_mask and vlan_fill parameters */
#define HAVE_NDO_BRIDGE_GETLINK_FILTER_MASK_VLAN_FILL
#endif /* >= 4.2.0 */
#endif /* _KCOMPAT_H_ */