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

kni: fix igb build with kernel 4.1

Browse Source 
ndo_bridge_getlink has changed in kernel release 4.1. It
adds new parameter which breaks compilation.

This patch add the properly checks to fix it.

Linux: 46c264daaaa5 ("bridge/nl: remove wrong use of NLM_F_MULTI")

Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
Acked-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
This commit is contained in:
Miguel Bernal Marin 2015-06-26 17:14:35 -05:00 committed by Thomas Monjalon
parent 8ec019a947
commit b2b5baa029
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2250,8 +2250,14 @@ static int igb_ndo_bridge_setlink(struct net_device *dev,
}
#ifdef HAVE_BRIDGE_FILTER
#ifdef HAVE_NDO_BRIDGE_GETLINK_FILTER_MASK
static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
struct net_device *dev, u32 filter_mask,
int nlflags)
#else
static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
struct net_device *dev, u32 filter_mask)
#endif /* HAVE_NDO_BRIDGE_GETLINK_FILTER_MASK */
#else
static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
struct net_device *dev)
@ -2269,7 +2275,11 @@ static int igb_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
mode = BRIDGE_MODE_VEPA;
#ifdef HAVE_NDO_FDB_ADD_VID
#ifdef HAVE_NDO_BRIDGE_GETLINK_FILTER_MASK
return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0, nlflags);
#else
return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode, 0, 0);
#endif /* HAVE_NDO_BRIDGE_GETLINK_FILTER_MASK */
#else
return ndo_dflt_bridge_getlink(skb, pid, seq, dev, mode);
#endif /* HAVE_NDO_FDB_ADD_VID */

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

@ -3891,4 +3891,9 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
#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) )
/* ndo_bridge_getlink adds new nlflags parameter */
#define HAVE_NDO_BRIDGE_GETLINK_FILTER_MASK
#endif /* >= 4.1.0 */
#endif /* _KCOMPAT_H_ */