diff options
author | Jiri Pirko <jiri@mellanox.com> | 2015-12-03 12:12:10 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-12-03 11:49:25 -0500 |
commit | 6dffb0447c25476f499d205dfceb1972e8dae919 (patch) | |
tree | 5f74b59c691acc6de6310aaa9a238da8fc6cdf25 /drivers/net/vrf.c | |
parent | e0ba1414f310c83bf425fe26fa2cd5f1befcd6dc (diff) | |
download | linux-6dffb0447c25476f499d205dfceb1972e8dae919.tar.gz linux-6dffb0447c25476f499d205dfceb1972e8dae919.tar.bz2 linux-6dffb0447c25476f499d205dfceb1972e8dae919.zip |
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.c | 2 |
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; |