Repository : ssh://git@open-mesh.org/batman-adv

On branch : master

commit 93418db608c2d131ef2956aa6c436c8182183184 Author: David Ahern dsahern@gmail.com Date: Sat Oct 7 14:18:53 2017 +0200

batman-adv: Add extack to upper device linking

Add extack arg to netdev_upper_dev_link and netdev_master_upper_dev_link

Signed-off-by: David Ahern dsahern@gmail.com Signed-off-by: David S. Miller davem@davemloft.net [sven@narfation.org: added compat code] Signed-off-by: Sven Eckelmann sven@narfation.org

93418db608c2d131ef2956aa6c436c8182183184 compat-include/linux/netdevice.h | 11 ++++++++--- net/batman-adv/hard-interface.c | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index 00ed5e40..c29d6d21 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -66,15 +66,20 @@

#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)

-#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) \ +#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info, extack) \ netdev_set_master(dev, upper_dev)

#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0)

-#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) \ +#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info, extack) \ netdev_master_upper_dev_link(dev, upper_dev)

-#endif /* < KERNEL_VERSION(4, 5, 0) */ +#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) + +#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info, extack) \ + netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info) + +#endif /* < KERNEL_VERSION(4, 15, 0) */

#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)

diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index d4aa99c0..4e3d5340 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -738,7 +738,7 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, bat_priv = netdev_priv(hard_iface->soft_iface);

ret = netdev_master_upper_dev_link(hard_iface->net_dev, - soft_iface, NULL, NULL); + soft_iface, NULL, NULL, NULL); if (ret) goto err_dev;