redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

bridge: remove usage of netdev_set_master()

Browse source 
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jiri Pirko 2013-01-03 22:48:54 +00:00 committed by David S. Miller
parent b1cc9850cd
commit 74fdd93fbc
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
net/bridge/br_if.c
View file

@ -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, GFP_KERNEL))))
goto err3;
err = netdev_set_master(dev, br->dev);
err = netdev_master_upper_dev_link(dev, br->dev);
if (err)
goto err4;
@ -403,7 +403,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev)
return 0;
err5:
netdev_set_master(dev, NULL);
netdev_upper_dev_unlink(dev, br->dev);
err4:
br_netpoll_disable(p);
err3: