netdev: Do not use TX lock to protect address lists.
Now that we have a specific lock to protect the network
device unicast and multicast lists, remove extraneous
grabs of the TX lock in cases where the code only needs
address list protection.
Signed-off-by: David S. Miller <davem@davemloft.net>
diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c
index b6b2a12..5402b3b 100644
--- a/net/core/dev_mcast.c
+++ b/net/core/dev_mcast.c
@@ -72,8 +72,7 @@
{
int err;
- netif_tx_lock_bh(dev);
- netif_addr_lock(dev);
+ netif_addr_lock_bh(dev);
err = __dev_addr_delete(&dev->mc_list, &dev->mc_count,
addr, alen, glbl);
if (!err) {
@@ -84,8 +83,7 @@
__dev_set_rx_mode(dev);
}
- netif_addr_unlock(dev);
- netif_tx_unlock_bh(dev);
+ netif_addr_unlock_bh(dev);
return err;
}
@@ -97,13 +95,11 @@
{
int err;
- netif_tx_lock_bh(dev);
- netif_addr_lock(dev);
+ netif_addr_lock_bh(dev);
err = __dev_addr_add(&dev->mc_list, &dev->mc_count, addr, alen, glbl);
if (!err)
__dev_set_rx_mode(dev);
- netif_addr_unlock(dev);
- netif_tx_unlock_bh(dev);
+ netif_addr_unlock_bh(dev);
return err;
}
@@ -123,14 +119,12 @@
{
int err = 0;
- netif_tx_lock_bh(to);
- netif_addr_lock(to);
+ netif_addr_lock_bh(to);
err = __dev_addr_sync(&to->mc_list, &to->mc_count,
&from->mc_list, &from->mc_count);
if (!err)
__dev_set_rx_mode(to);
- netif_addr_unlock(to);
- netif_tx_unlock_bh(to);
+ netif_addr_unlock_bh(to);
return err;
}
@@ -149,9 +143,7 @@
*/
void dev_mc_unsync(struct net_device *to, struct net_device *from)
{
- netif_tx_lock_bh(from);
- netif_addr_lock(from);
- netif_tx_lock_bh(to);
+ netif_addr_lock_bh(from);
netif_addr_lock(to);
__dev_addr_unsync(&to->mc_list, &to->mc_count,
@@ -159,9 +151,7 @@
__dev_set_rx_mode(to);
netif_addr_unlock(to);
- netif_tx_unlock_bh(to);
- netif_addr_unlock(from);
- netif_tx_unlock_bh(from);
+ netif_addr_unlock_bh(from);
}
EXPORT_SYMBOL(dev_mc_unsync);
@@ -174,8 +164,7 @@
if (v == SEQ_START_TOKEN)
return 0;
- netif_tx_lock_bh(dev);
- netif_addr_lock(dev);
+ netif_addr_lock_bh(dev);
for (m = dev->mc_list; m; m = m->next) {
int i;
@@ -187,8 +176,7 @@
seq_putc(seq, '\n');
}
- netif_addr_unlock(dev);
- netif_tx_unlock_bh(dev);
+ netif_addr_unlock_bh(dev);
return 0;
}