The following commit has been merged in the merge/master branch: commit d794c1cd9d4f9101d135cc7bfd8ff37604bc06f3 Author: Jiri Pirko jiri@mellanox.com Date: Tue Dec 8 21:35:13 2015 +0100

batman-adv: propagate upper priv via netdev_master_upper_dev_link

Eliminate netdev_master_upper_dev_link_private and pass priv directly as a parameter of netdev_master_upper_dev_link.

Signed-off-by: Jiri Pirko jiri@mellanox.com Signed-off-by: David S. Miller davem@davemloft.net Signed-off-by: Marek Lindner mareklindner@neomailbox.ch

diff --git a/compat-include/linux/netdevice.h b/compat-include/linux/netdevice.h index f19f624..a8da7bf 100644 --- a/compat-include/linux/netdevice.h +++ b/compat-include/linux/netdevice.h @@ -117,4 +117,11 @@ static inline int batadv_netdev_set_master(struct net_device *slave,

#endif /* < KERNEL_VERSION(3, 19, 0) */

+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 5, 0) + +#define netdev_master_upper_dev_link(dev, upper_dev, upper_priv) \ + netdev_master_upper_dev_link(dev, upper_dev) + +#endif /* < KERNEL_VERSION(4, 5, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_LINUX_NETDEVICE_H_ */ diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index bef9147..484c50e0 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -466,7 +466,8 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface);

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