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/bonding | |
| parent | e0ba1414f310c83bf425fe26fa2cd5f1befcd6dc (diff) | |
| download | linux-6dffb0447c25476f499d205dfceb1972e8dae919.tar.bz2 | |
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/bonding')
| -rw-r--r-- | drivers/net/bonding/bond_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 9e0f8a7ef8b1..924015729b2d 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -1204,7 +1204,7 @@ static int bond_master_upper_dev_link(struct net_device *bond_dev, { int err; - err = netdev_master_upper_dev_link_private(slave_dev, bond_dev, slave); + err = netdev_master_upper_dev_link(slave_dev, bond_dev, slave); if (err) return err; slave_dev->flags |= IFF_SLAVE; |