Commit 74fdd93f authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

bridge: remove usage of netdev_set_master()


Signed-off-by: default avatarJiri Pirko <jiri@resnulli.us>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b1cc9850
...@@ -148,7 +148,7 @@ static void del_nbp(struct net_bridge_port *p) ...@@ -148,7 +148,7 @@ static void del_nbp(struct net_bridge_port *p)
netdev_rx_handler_unregister(dev); netdev_rx_handler_unregister(dev);
synchronize_net(); synchronize_net();
netdev_set_master(dev, NULL); netdev_upper_dev_unlink(dev, br->dev);
br_multicast_del_port(p); br_multicast_del_port(p);
...@@ -364,7 +364,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) ...@@ -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, GFP_KERNEL)))) if (br_netpoll_info(br) && ((err = br_netpoll_enable(p, GFP_KERNEL))))
goto err3; goto err3;
err = netdev_set_master(dev, br->dev); err = netdev_master_upper_dev_link(dev, br->dev);
if (err) if (err)
goto err4; goto err4;
...@@ -403,7 +403,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) ...@@ -403,7 +403,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
return 0; return 0;
err5: err5:
netdev_set_master(dev, NULL); netdev_upper_dev_unlink(dev, br->dev);
err4: err4:
br_netpoll_disable(p); br_netpoll_disable(p);
err3: err3:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment