renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-23 12:43:55 +08:00
Code

team: 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:53 +00:00 committed by David S. Miller
parent 898e506171
commit b1cc9850cd
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/team/team.c
View File

@ -1055,10 +1055,11 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
}
}
err = netdev_set_master(port_dev, dev);
err = netdev_master_upper_dev_link(port_dev, dev);
if (err) {
netdev_err(dev, "Device %s failed to set master\n", portname);
goto err_set_master;
netdev_err(dev, "Device %s failed to set upper link\n",
portname);
goto err_set_upper_link;
}
err = netdev_rx_handler_register(port_dev, team_handle_frame,
@ -1091,9 +1092,9 @@ err_option_port_add:
netdev_rx_handler_unregister(port_dev);
err_handler_register:
netdev_set_master(port_dev, NULL);
netdev_upper_dev_unlink(port_dev, dev);
err_set_master:
err_set_upper_link:
team_port_disable_netpoll(port);
err_enable_netpoll:
@ -1137,7 +1138,7 @@ static int team_port_del(struct team *team, struct net_device *port_dev)
team_port_disable(team, port);
list_del_rcu(&port->list);
netdev_rx_handler_unregister(port_dev);
netdev_set_master(port_dev, NULL);
netdev_upper_dev_unlink(port_dev, dev);
team_port_disable_netpoll(port);
vlan_vids_del_by_dev(port_dev, dev);
dev_close(port_dev);