diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2016-07-08 23:45:52 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2016-07-13 19:15:31 +0200 |
| commit | 085bdbc6a27deb9ce877e061420fa1989424d1c1 (patch) | |
| tree | f05aa57509c28a3fbbf76c0571a3aa283fbb0bf5 | |
| parent | ea21e2e0d8927d647df070622c0da8c538b92e72 (diff) | |
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>
| -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 */ |