diff options
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) | |||
| 300 | struct sockaddr_ax25 *sa = addr; | 300 | struct sockaddr_ax25 *sa = addr; |
| 301 | 301 | ||
| 302 | netif_tx_lock_bh(dev); | 302 | netif_tx_lock_bh(dev); |
| 303 | netif_addr_lock(dev); | ||
| 303 | memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN); | 304 | memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN); |
| 305 | netif_addr_unlock(dev); | ||
| 304 | netif_tx_unlock_bh(dev); | 306 | netif_tx_unlock_bh(dev); |
| 305 | 307 | ||
| 306 | return 0; | 308 | 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) | |||
| 356 | struct sockaddr_ax25 *sa = addr; | 356 | struct sockaddr_ax25 *sa = addr; |
| 357 | 357 | ||
| 358 | netif_tx_lock_bh(dev); | 358 | netif_tx_lock_bh(dev); |
| 359 | netif_addr_lock(dev); | ||
| 359 | memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN); | 360 | memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN); |
| 361 | netif_addr_unlock(dev); | ||
| 360 | netif_tx_unlock_bh(dev); | 362 | netif_tx_unlock_bh(dev); |
| 361 | 363 | ||
| 362 | return 0; | 364 | return 0; |