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>
This commit is contained in:
Jiri Pirko
2015-12-03 12:12:10 +01:00
committed by David S. Miller
parent e0ba1414f3
commit 6dffb0447c
8 changed files with 15 additions and 22 deletions

View File

@@ -493,7 +493,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
dev->priv_flags |= IFF_BRIDGE_PORT;
err = netdev_master_upper_dev_link(dev, br->dev);
err = netdev_master_upper_dev_link(dev, br->dev, NULL);
if (err)
goto err5;