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/team | |
| parent | e0ba1414f310c83bf425fe26fa2cd5f1befcd6dc (diff) | |
| download | op-kernel-dev-6dffb0447c25476f499d205dfceb1972e8dae919.zip op-kernel-dev-6dffb0447c25476f499d205dfceb1972e8dae919.tar.gz | |
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/team')
| -rw-r--r-- | drivers/net/team/team.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index d2f3ee8..b37f8d1 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -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; |
