From 22d04e8d7c01ebe1012711fc6244826fd43a7296 Mon Sep 17 00:00:00 2001 From: Jiri Pirko Date: Fri, 1 Feb 2013 08:17:25 +0000 Subject: [PATCH] --- yaml --- r: 352070 b: refs/heads/master c: c3969d80a396bffd7f80ff57987b15793be67926 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/team/team.c | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c58e6be2a189..c4d9cef412c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d90f889e9cc76daf3a6d91120bb158b16c4af444 +refs/heads/master: c3969d80a396bffd7f80ff57987b15793be67926 diff --git a/trunk/drivers/net/team/team.c b/trunk/drivers/net/team/team.c index 738f7445ea87..694ccf6d71a3 100644 --- a/trunk/drivers/net/team/team.c +++ b/trunk/drivers/net/team/team.c @@ -1131,10 +1131,6 @@ static int team_port_del(struct team *team, struct net_device *port_dev) return -ENOENT; } - __team_option_inst_mark_removed_port(team, port); - __team_options_change_check(team); - __team_option_inst_del_port(team, port); - __team_port_change_port_removed(port); team_port_disable(team, port); list_del_rcu(&port->list); netdev_rx_handler_unregister(port_dev); @@ -1143,6 +1139,12 @@ static int team_port_del(struct team *team, struct net_device *port_dev) vlan_vids_del_by_dev(port_dev, dev); dev_close(port_dev); team_port_leave(team, port); + + __team_option_inst_mark_removed_port(team, port); + __team_options_change_check(team); + __team_option_inst_del_port(team, port); + __team_port_change_port_removed(port); + team_port_set_orig_dev_addr(port); dev_set_mtu(port_dev, port->orig.mtu); synchronize_rcu();