[patch net-next 06/16] bridge: remove usage of netdev_set_master()

Jiri Pirko
2012-08-13T15:27:05Z

net/bridge/br_if.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index e1144e1..5933900 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -148,7 +148,7 @@ static void del_nbp(struct net_bridge_port *p)
netdev_rx_handler_unregister(dev);
synchronize_net();

- netdev_set_master(dev, NULL);
+ netdev_upper_dev_unlink(dev, br->dev);

br_multicast_del_port(p);

@@ -364,7 +364,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
if (br_netpoll_info(br) && ((err = br_netpoll_enable(p))))
goto err3;

- err = netdev_set_master(dev, br->dev);
+ err = netdev_unique_upper_dev_link(dev, br->dev);
if (err)
goto err3;

@@ -403,7 +403,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
return 0;

err4:
- netdev_set_master(dev, NULL);
+ netdev_upper_dev_unlink(dev, br->dev);
err3:
sysfs_remove_link(br->ifobj, p->dev->name);
err2:
--
1.7.10.4