diff options
-rw-r--r-- | backport/backport-include/linux/rtnetlink.h | 6 | ||||
-rw-r--r-- | patches/collateral-evolutions/network/0072-netdevice-ndo_fdb_add/igb.patch | 14 |
2 files changed, 20 insertions, 0 deletions
diff --git a/backport/backport-include/linux/rtnetlink.h b/backport/backport-include/linux/rtnetlink.h index 6dea700b..806f212f 100644 --- 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 index 00000000..e068ea3b --- /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 */ |