GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 23:32:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

netdev: Do not use TX lock to protect address lists.

Browse source 
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>
This commit is contained in:
David S. Miller 2008-07-15 00:15:08 -07:00
parent e308a5d806
commit b9e4085768
9 changed files with 42 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

32
net/core/dev_mcast.c
View file

@ -72,8 +72,7 @@ int dev_mc_delete(struct net_device *dev, void *addr, int alen, int glbl)
{
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 @@ int dev_mc_delete(struct net_device *dev, void *addr, int alen, int glbl)
__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 dev_mc_add(struct net_device *dev, void *addr, int alen, int glbl)
{
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 dev_mc_sync(struct net_device *to, struct net_device *from)
{
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 @@ EXPORT_SYMBOL(dev_mc_sync);
*/
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 @@ void dev_mc_unsync(struct net_device *to, struct net_device *from)
__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 @@ static int dev_mc_seq_show(struct seq_file *seq, void *v)
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 @@ static int dev_mc_seq_show(struct seq_file *seq, void *v)
seq_putc(seq, '\n');
}
netif_addr_unlock(dev);
netif_tx_unlock_bh(dev);
netif_addr_unlock_bh(dev);
return 0;
}