diff options
author | David S. Miller <davem@davemloft.net> | 2008-07-15 03:15:08 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-15 03:15:08 -0400 |
commit | b9e40857682ecfc5bcd0356a23ff409883ffb982 (patch) | |
tree | d241fd289bed6d16f36f6d26815c1e78e212c89a /drivers/net/sfc | |
parent | e308a5d806c852f56590ffdd3834d0df0cbed8d7 (diff) |
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>
Diffstat (limited to 'drivers/net/sfc')
-rw-r--r-- | drivers/net/sfc/efx.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c index e1257e556e48..7b2015f9e469 100644 --- a/drivers/net/sfc/efx.c +++ b/drivers/net/sfc/efx.c | |||
@@ -696,10 +696,8 @@ static void efx_stop_port(struct efx_nic *efx) | |||
696 | 696 | ||
697 | /* Serialise against efx_set_multicast_list() */ | 697 | /* Serialise against efx_set_multicast_list() */ |
698 | if (efx_dev_registered(efx)) { | 698 | if (efx_dev_registered(efx)) { |
699 | netif_tx_lock_bh(efx->net_dev); | 699 | netif_addr_lock_bh(efx->net_dev); |
700 | netif_addr_lock(efx->net_dev); | 700 | netif_addr_unlock_bh(efx->net_dev); |
701 | netif_addr_unlock(efx->net_dev); | ||
702 | netif_tx_unlock_bh(efx->net_dev); | ||
703 | } | 701 | } |
704 | } | 702 | } |
705 | 703 | ||