lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <1344871635-1052-6-git-send-email-jiri@resnulli.us> Date: Mon, 13 Aug 2012 17:27:04 +0200 From: Jiri Pirko <jiri@...nulli.us> To: netdev@...r.kernel.org Cc: davem@...emloft.net, edumazet@...gle.com, faisal.latif@...el.com, roland@...nel.org, sean.hefty@...el.com, hal.rosenstock@...il.com, fubar@...ibm.com, andy@...yhouse.net, divy@...lsio.com, jitendra.kalsaria@...gic.com, sony.chacko@...gic.com, linux-driver@...gic.com, kaber@...sh.net, ursula.braun@...ibm.com, blaschka@...ux.vnet.ibm.com, linux390@...ibm.com, shemminger@...tta.com, bhutchings@...arflare.com, therbert@...gle.com, xiyou.wangcong@...il.com, joe@...ches.com, gregory.v.rose@...el.com, john.r.fastabend@...el.com, linux-rdma@...r.kernel.org, linux-kernel@...r.kernel.org, linux-s390@...r.kernel.org, bridge@...ts.linux-foundation.org, fbl@...hat.com Subject: [patch net-next 05/16] team: remove usage of netdev_set_master() Signed-off-by: Jiri Pirko <jiri@...nulli.us> --- drivers/net/team/team.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index ba10c46..0533cbf 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1040,10 +1040,11 @@ static int team_port_add(struct team *team, struct net_device *port_dev) } } - err = netdev_set_master(port_dev, dev); + err = netdev_unique_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, @@ -1076,9 +1077,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: @@ -1121,7 +1122,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); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists