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

kni: fix build with Linux 5.1

Browse Source 
Build error seen with Linux kernel 5.1 and
when CONFIG_RTE_KNI_KMOD_ETHTOOL is enabled.

Build error:
kernel/linux/kni/igb_main.c:2352:18:
  error: initialization of ... from incompatible pointer type ...
  [-Werror=incompatible-pointer-types]
    .ndo_fdb_add  = igb_ndo_fdb_add,
                      ^~~~~~~~~~~~~~~

ndo_fdb_add() is changed in Linux kernel version 5.1 and now requires
a new parameter, 'struct netlink_ext_ack *extack':
Linux Commit 87b0984ebfab ("net: Add extack argument to ndo_fdb_add()")

ndo_fdb_add() parameter updated with compile time Linux kernel version
check.

Cc: stable@dpdk.org

Signed-off-by: Ferruh Yigit <ferruh.yigit@intel.com>
Tested-by: Bruce Richardson <bruce.richardson@intel.com>
Reviewed-by: Rami Rosen <ramirose@gmail.com>
This commit is contained in:
Ferruh Yigit 2019-04-08 15:22:26 +01:00 committed by Thomas Monjalon
parent 261fb94185
commit db9178c24c
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/linux/kni/ethtool/igb/igb_main.c
View File

@ -2112,7 +2112,13 @@ static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
#ifdef HAVE_NDO_FDB_ADD_VID
u16 vid,
#endif
#ifdef HAVE_NDO_FDB_ADD_EXTACK
u16 flags,
struct netlink_ext_ack *extack)
#else
u16 flags)
#endif
#else
static int igb_ndo_fdb_add(struct ndmsg *ndm,
struct net_device *dev,

4
kernel/linux/kni/ethtool/igb/kcompat.h
View File

@ -3945,6 +3945,10 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
#define HAVE_NDO_BRIDGE_SETLINK_EXTACK
#endif /* >= 5.0.0 */
#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(5,1,0) )
#define HAVE_NDO_FDB_ADD_EXTACK
#endif /* >= 5.1.0 */
#if defined(timer_setup) && defined(from_timer)
#define HAVE_TIMER_SETUP
#endif