diff options
| author | Mark Brown <broonie@kernel.org> | 2016-02-05 19:28:22 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-02-05 19:28:22 +0000 |
| commit | cd6f5814252060db2d38f57c602db33696c549c0 (patch) | |
| tree | 0bcf23a07f1316cb57f0127e5b1622fea59c3e8e /drivers/net/team/team.c | |
| parent | d235b7b42ab59e2e616082a0735b3bcc76685c7b (diff) | |
| parent | e14ca734b547e3187713441909897aefdf4e4016 (diff) | |
Merge tag 'v3.10.96' into linux-linaro-lsk-v3.10lsk-v3.10-16.02
This is the 3.10.96 stable release
Diffstat (limited to 'drivers/net/team/team.c')
| -rw-r--r-- | drivers/net/team/team.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index 14179a6593ef..5225d4321e7c 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1636,10 +1636,10 @@ static int team_vlan_rx_kill_vid(struct net_device *dev, __be16 proto, u16 vid) struct team *team = netdev_priv(dev); struct team_port *port; - rcu_read_lock(); - list_for_each_entry_rcu(port, &team->port_list, list) + mutex_lock(&team->lock); + list_for_each_entry(port, &team->port_list, list) vlan_vid_del(port->dev, proto, vid); - rcu_read_unlock(); + mutex_unlock(&team->lock); return 0; } |