diff options
| author | Ido Schimmel <idosch@mellanox.com> | 2016-01-18 17:30:22 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-18 11:52:38 -0500 |
| commit | 60a6531bfe49555581ccd65f66a350cc5693fcde (patch) | |
| tree | abbbac4aaf6fe529dec3bd9a413626517497d4a0 /drivers/net/team | |
| parent | 918f618f564e208dd181d8ac7525694ccf4bc097 (diff) | |
| download | op-kernel-dev-60a6531bfe49555581ccd65f66a350cc5693fcde.zip op-kernel-dev-60a6531bfe49555581ccd65f66a350cc5693fcde.tar.gz | |
team: Replace rcu_read_lock with a mutex in team_vlan_rx_kill_vid
We can't be within an RCU read-side critical section when deleting
VLANs, as underlying drivers might sleep during the hardware operation.
Therefore, replace the RCU critical section with a mutex. This is
consistent with team_vlan_rx_add_vid.
Fixes: 3d249d4ca7d0 ("net: introduce ethernet teaming device")
Acked-by: Jiri Pirko <jiri@mellanox.com>
Signed-off-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/team')
| -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 2528331..718ceea 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c @@ -1872,10 +1872,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; } |
