summaryrefslogtreecommitdiff
path: root/drivers/net/vrf.c
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 /drivers/net/vrf.c
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 'drivers/net/vrf.c')
-rw-r--r--drivers/net/vrf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c
index c2d54c4ed556..59c5bddeaedd 100644
--- a/drivers/net/vrf.c
+++ b/drivers/net/vrf.c
@@ -624,7 +624,7 @@ static int do_vrf_add_slave(struct net_device *dev, struct net_device *port_dev)
goto out_fail;
}
- ret = netdev_master_upper_dev_link(port_dev, dev);
+ ret = netdev_master_upper_dev_link(port_dev, dev, NULL);
if (ret < 0)
goto out_unregister;