diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2013-02-01 08:17:25 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-02-04 14:55:45 -0500 |
| commit | c3969d80a396bffd7f80ff57987b15793be67926 (patch) | |
| tree | 76e397a8fda90efd24a8bbe98c19638590c2df60 /drivers | |
| parent | d90f889e9cc76daf3a6d91120bb158b16c4af444 (diff) | |
team: move netlink event notifiers after team_port_leave()
In team_port_del(), there is need to be do all the cleanup related
things first and netlink event notifiers should be called after that.
This fixes two problems:
team carrier is now correctly set (port is removed from list first)
mode can set option as changed in .port_leave op
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/team/team.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 738f7445ea87..694ccf6d71a3 100644 --- a/drivers/net/team/team.c +++ b/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(); |