diff options
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) | |||
1131 | return -ENOENT; | 1131 | return -ENOENT; |
1132 | } | 1132 | } |
1133 | 1133 | ||
1134 | __team_option_inst_mark_removed_port(team, port); | ||
1135 | __team_options_change_check(team); | ||
1136 | __team_option_inst_del_port(team, port); | ||
1137 | __team_port_change_port_removed(port); | ||
1138 | team_port_disable(team, port); | 1134 | team_port_disable(team, port); |
1139 | list_del_rcu(&port->list); | 1135 | list_del_rcu(&port->list); |
1140 | netdev_rx_handler_unregister(port_dev); | 1136 | netdev_rx_handler_unregister(port_dev); |
@@ -1143,6 +1139,12 @@ static int team_port_del(struct team *team, struct net_device *port_dev) | |||
1143 | vlan_vids_del_by_dev(port_dev, dev); | 1139 | vlan_vids_del_by_dev(port_dev, dev); |
1144 | dev_close(port_dev); | 1140 | dev_close(port_dev); |
1145 | team_port_leave(team, port); | 1141 | team_port_leave(team, port); |
1142 | |||
1143 | __team_option_inst_mark_removed_port(team, port); | ||
1144 | __team_options_change_check(team); | ||
1145 | __team_option_inst_del_port(team, port); | ||
1146 | __team_port_change_port_removed(port); | ||
1147 | |||
1146 | team_port_set_orig_dev_addr(port); | 1148 | team_port_set_orig_dev_addr(port); |
1147 | dev_set_mtu(port_dev, port->orig.mtu); | 1149 | dev_set_mtu(port_dev, port->orig.mtu); |
1148 | synchronize_rcu(); | 1150 | synchronize_rcu(); |