diff options
| author | David S. Miller <davem@davemloft.net> | 2008-07-15 00:13:44 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-15 00:13:44 -0700 |
| commit | e308a5d806c852f56590ffdd3834d0df0cbed8d7 (patch) | |
| tree | 294ff654e90950f5162737c26f4799b0b710b748 /drivers/net/hamradio | |
| parent | f1f28aa3510ddb84c966bac65611bb866c77a092 (diff) | |
| download | blackbird-op-linux-e308a5d806c852f56590ffdd3834d0df0cbed8d7.tar.gz blackbird-op-linux-e308a5d806c852f56590ffdd3834d0df0cbed8d7.zip | |
netdev: Add netdev->addr_list_lock protection.
Add netif_addr_{lock,unlock}{,_bh}() helpers.
Use them to protect operations that operate on or read
the network device unicast and multicast address lists.
Also use them in cases where the code simply wants to
block calls into the driver's ->set_rx_mode() and
->set_multicast_list() methods.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/hamradio')
| -rw-r--r-- | drivers/net/hamradio/6pack.c | 2 | ||||
| -rw-r--r-- | drivers/net/hamradio/mkiss.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index 06ad9f302b5a..ffc937f5d15d 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c @@ -300,7 +300,9 @@ static int sp_set_mac_address(struct net_device *dev, void *addr) struct sockaddr_ax25 *sa = addr; netif_tx_lock_bh(dev); + netif_addr_lock(dev); memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN); + netif_addr_unlock(dev); netif_tx_unlock_bh(dev); return 0; diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c index 65166035aca0..b8740e6a5cec 100644 --- a/drivers/net/hamradio/mkiss.c +++ b/drivers/net/hamradio/mkiss.c @@ -356,7 +356,9 @@ static int ax_set_mac_address(struct net_device *dev, void *addr) struct sockaddr_ax25 *sa = addr; netif_tx_lock_bh(dev); + netif_addr_lock(dev); memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN); + netif_addr_unlock(dev); netif_tx_unlock_bh(dev); return 0; |
