header: remove vid parameter from ndo_dflt_fdb_add()

The signature was changed in Linux kernel commit f6f6424ba "net: make
vid as a parameter for ndo_fdb_add/ndo_fdb_del".

In addition the signature of the callback ndo_fdb_add was also changed.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

diff --git a/backport/backport-include/linux/rtnetlink.h b/backport/backport-include/linux/rtnetlink.h
index 6dea700b390890a4504fc4570cc711400ede7a6c..806f212fe8f32cc6d258b4576f1eb7f188314e76 100644 (file)
--- a/backport/backport-include/linux/rtnetlink.h
+++ b/backport/backport-include/linux/rtnetlink.h
@@ -13,4 +13,10 @@
                                 lockdep_rtnl_is_held())
 #endif
 
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0))
+#define ndo_dflt_fdb_add(ndm, tb, dev, addr, vid, flags) \
+       ndo_dflt_fdb_add(ndm, tb, dev, addr, flags)
+#endif
+
+                           
 #endif /* __BACKPORT_LINUX_RTNETLINK_H */

diff --git a/patches/collateral-evolutions/network/0072-netdevice-ndo_fdb_add/igb.patch b/patches/collateral-evolutions/network/0072-netdevice-ndo_fdb_add/igb.patch
new file mode 100644 (file)
index 0000000..e068ea3
--- /dev/null
+++ b/patches/collateral-evolutions/network/0072-netdevice-ndo_fdb_add/igb.patch
@@ -0,0 +1,14 @@
+--- a/drivers/net/ethernet/intel/igb/igb_main.c
++++ b/drivers/net/ethernet/intel/igb/igb_main.c
+@@ -2078,7 +2078,11 @@ static int igb_set_features(struct net_d
+ 
+ static int igb_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
+                          struct net_device *dev,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
++                         const unsigned char *addr,
++#else
+                          const unsigned char *addr, u16 vid,
++#endif
+                          u16 flags)
+ {
+       /* guarantee we can provide a unique filter for the unicast address */