Commit 982cf3b3 authored by Xin Long's avatar Xin Long Committed by David S. Miller

team: move dev_mc_sync after master_upper_dev_link in team_port_add

The same fix as in 'bonding: move dev_mc_sync after master_upper_dev_link
in bond_enslave' is needed for team driver.

The panic can be reproduced easily:

  ip link add team1 type team
  ip link set team1 up
  ip link add link team1 vlan1 type vlan id 80
  ip link set vlan1 master team1

Fixes: cb41c997 ("team: team should sync the port's uc/mc addrs when add a port")
Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e49c78f4
...@@ -1197,11 +1197,6 @@ static int team_port_add(struct team *team, struct net_device *port_dev) ...@@ -1197,11 +1197,6 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
goto err_dev_open; goto err_dev_open;
} }
netif_addr_lock_bh(dev);
dev_uc_sync_multiple(port_dev, dev);
dev_mc_sync_multiple(port_dev, dev);
netif_addr_unlock_bh(dev);
err = vlan_vids_add_by_dev(port_dev, dev); err = vlan_vids_add_by_dev(port_dev, dev);
if (err) { if (err) {
netdev_err(dev, "Failed to add vlan ids to device %s\n", netdev_err(dev, "Failed to add vlan ids to device %s\n",
...@@ -1241,6 +1236,11 @@ static int team_port_add(struct team *team, struct net_device *port_dev) ...@@ -1241,6 +1236,11 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
goto err_option_port_add; goto err_option_port_add;
} }
netif_addr_lock_bh(dev);
dev_uc_sync_multiple(port_dev, dev);
dev_mc_sync_multiple(port_dev, dev);
netif_addr_unlock_bh(dev);
port->index = -1; port->index = -1;
list_add_tail_rcu(&port->list, &team->port_list); list_add_tail_rcu(&port->list, &team->port_list);
team_port_enable(team, port); team_port_enable(team, port);
...@@ -1265,8 +1265,6 @@ static int team_port_add(struct team *team, struct net_device *port_dev) ...@@ -1265,8 +1265,6 @@ static int team_port_add(struct team *team, struct net_device *port_dev)
vlan_vids_del_by_dev(port_dev, dev); vlan_vids_del_by_dev(port_dev, dev);
err_vids_add: err_vids_add:
dev_uc_unsync(port_dev, dev);
dev_mc_unsync(port_dev, dev);
dev_close(port_dev); dev_close(port_dev);
err_dev_open: err_dev_open:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment