2 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 102c1f0b90da..d12605f0ac7c 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -308,9 +308,9 @@ static int sp_set_mac_address(struct net_device *dev, void *addr)
 {
         struct sockaddr_ax25 *sa = addr;
 
-        spin_lock_irq(&dev->xmit_lock);
+        netif_tx_lock_bh(dev);
         memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN);
-        spin_unlock_irq(&dev->xmit_lock);
+        netif_tx_unlock_bh(dev);
 
         return 0;
 }
@@ -767,9 +767,9 @@ static int sixpack_ioctl(struct tty_struct *tty, struct file *file,
                         break;
                 }
 
-                spin_lock_irq(&dev->xmit_lock);
+                netif_tx_lock_bh(dev);
                 memcpy(dev->dev_addr, &addr, AX25_ADDR_LEN);
-                spin_unlock_irq(&dev->xmit_lock);
+                netif_tx_unlock_bh(dev);
 
                 err = 0;
                 break;
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index d81a8e1eeb8d..3ebbbe56b6e9 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -357,9 +357,9 @@ static int ax_set_mac_address(struct net_device *dev, void *addr)
 {
         struct sockaddr_ax25 *sa = addr;
 
-        spin_lock_irq(&dev->xmit_lock);
+        netif_tx_lock_bh(dev);
         memcpy(dev->dev_addr, &sa->sax25_call, AX25_ADDR_LEN);
-        spin_unlock_irq(&dev->xmit_lock);
+        netif_tx_unlock_bh(dev);
 
         return 0;
 }
@@ -886,9 +886,9 @@ static int mkiss_ioctl(struct tty_struct *tty, struct file *file,
                         break;
                 }
 
-                spin_lock_irq(&dev->xmit_lock);
+                netif_tx_lock_bh(dev);
                 memcpy(dev->dev_addr, addr, AX25_ADDR_LEN);
-                spin_unlock_irq(&dev->xmit_lock);
+                netif_tx_unlock_bh(dev);
 
                 err = 0;
                 break;