summaryrefslogtreecommitdiff
path: root/net/batman-adv
diff options
context:
space:
mode:
authorJiri Pirko <jiri@mellanox.com>2015-12-03 14:12:10 +0300
committerDavid S. Miller <davem@davemloft.net>2015-12-03 19:49:25 +0300
commit6dffb0447c25476f499d205dfceb1972e8dae919 (patch)
tree5f74b59c691acc6de6310aaa9a238da8fc6cdf25 /net/batman-adv
parente0ba1414f310c83bf425fe26fa2cd5f1befcd6dc (diff)
downloadlinux-6dffb0447c25476f499d205dfceb1972e8dae919.tar.xz
net: 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>
Diffstat (limited to 'net/batman-adv')
-rw-r--r--net/batman-adv/hard-interface.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index f11345e163d7..a7f4f1085dbb 100644
--- a/net/batman-adv/hard-interface.c
+++ b/net/batman-adv/hard-interface.c
@@ -464,7 +464,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;