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

@@ -1083,7 +1083,7 @@ static int team_upper_dev_link(struct net_device *dev,
{
int err;
err = netdev_master_upper_dev_link(port_dev, dev);
err = netdev_master_upper_dev_link(port_dev, dev, NULL);
if (err)
return err;
port_dev->priv_flags |= IFF_TEAM_PORT;