2 files changed, 30 insertions, 21 deletions

diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c
index 155160052c8..913a5640659 100644
--- a/drivers/net/hamradio/6pack.c
+++ b/drivers/net/hamradio/6pack.c
@@ -398,13 +398,14 @@ static DEFINE_RWLOCK(disc_data_lock);
                                                                                 
 static struct sixpack *sp_get(struct tty_struct *tty)
 {
+        unsigned long flags;
         struct sixpack *sp;
 
-        read_lock(&disc_data_lock);
+        read_lock_irqsave(&disc_data_lock, flags);
         sp = tty->disc_data;
         if (sp)
                 atomic_inc(&sp->refcnt);
-        read_unlock(&disc_data_lock);
+        read_unlock_irqrestore(&disc_data_lock, flags);
 
         return sp;
 }
@@ -688,12 +689,13 @@ out:
  */
 static void sixpack_close(struct tty_struct *tty)
 {
+        unsigned long flags;
         struct sixpack *sp;
 
-        write_lock(&disc_data_lock);
+        write_lock_irqsave(&disc_data_lock, flags);
         sp = tty->disc_data;
         tty->disc_data = NULL;
-        write_unlock(&disc_data_lock);
+        write_unlock_irqrestore(&disc_data_lock, flags);
         if (!sp)
                 return;
 
diff --git a/drivers/net/hamradio/mkiss.c b/drivers/net/hamradio/mkiss.c
index fda2fc83e9a..a7286500c18 100644
--- a/drivers/net/hamradio/mkiss.c
+++ b/drivers/net/hamradio/mkiss.c
@@ -244,15 +244,16 @@ static int kiss_esc_crc(unsigned char *s, unsigned char *d, unsigned short crc,
 /* Send one completely decapsulated AX.25 packet to the AX.25 layer. */
 static void ax_bump(struct mkiss *ax)
 {
+        unsigned long flags;
         struct sk_buff *skb;
         int count;
 
-        spin_lock_bh(&ax->buflock);
+        spin_lock_irqsave(&ax->buflock, flags);
         if (ax->rbuff[0] > 0x0f) {
                 if (ax->rbuff[0] & 0x80) {
                         if (check_crc_16(ax->rbuff, ax->rcount) < 0) {
                                 ax->dev->stats.rx_errors++;
-                                spin_unlock_bh(&ax->buflock);
+                                spin_unlock_irqrestore(&ax->buflock, flags);
 
                                 return;
                         }
@@ -267,7 +268,7 @@ static void ax_bump(struct mkiss *ax)
                 } else if (ax->rbuff[0] & 0x20)  {
                         if (check_crc_flex(ax->rbuff, ax->rcount) < 0) {
                                 ax->dev->stats.rx_errors++;
-                                spin_unlock_bh(&ax->buflock);
+                                spin_unlock_irqrestore(&ax->buflock, flags);
                                 return;
                         }
                         if (ax->crcmode != CRC_MODE_FLEX && ax->crcauto) {
@@ -294,7 +295,7 @@ static void ax_bump(struct mkiss *ax)
                 printk(KERN_ERR "mkiss: %s: memory squeeze, dropping packet.\n",
                        ax->dev->name);
                 ax->dev->stats.rx_dropped++;
-                spin_unlock_bh(&ax->buflock);
+                spin_unlock_irqrestore(&ax->buflock, flags);
                 return;
         }
 
@@ -303,11 +304,13 @@ static void ax_bump(struct mkiss *ax)
         netif_rx(skb);
         ax->dev->stats.rx_packets++;
         ax->dev->stats.rx_bytes += count;
-        spin_unlock_bh(&ax->buflock);
+        spin_unlock_irqrestore(&ax->buflock, flags);
 }
 
 static void kiss_unesc(struct mkiss *ax, unsigned char s)
 {
+        unsigned long flags;
+
         switch (s) {
         case END:
                 /* drop keeptest bit = VSV */
@@ -334,18 +337,18 @@ static void kiss_unesc(struct mkiss *ax, unsigned char s)
                 break;
         }
 
-        spin_lock_bh(&ax->buflock);
+        spin_lock_irqsave(&ax->buflock, flags);
         if (!test_bit(AXF_ERROR, &ax->flags)) {
                 if (ax->rcount < ax->buffsize) {
                         ax->rbuff[ax->rcount++] = s;
-                        spin_unlock_bh(&ax->buflock);
+                        spin_unlock_irqrestore(&ax->buflock, flags);
                         return;
                 }
 
                 ax->dev->stats.rx_over_errors++;
                 set_bit(AXF_ERROR, &ax->flags);
         }
-        spin_unlock_bh(&ax->buflock);
+        spin_unlock_irqrestore(&ax->buflock, flags);
 }
 
 static int ax_set_mac_address(struct net_device *dev, void *addr)
@@ -367,6 +370,7 @@ static void ax_changedmtu(struct mkiss *ax)
 {
         struct net_device *dev = ax->dev;
         unsigned char *xbuff, *rbuff, *oxbuff, *orbuff;
+        unsigned long flags;
         int len;
 
         len = dev->mtu * 2;
@@ -392,7 +396,7 @@ static void ax_changedmtu(struct mkiss *ax)
                 return;
         }
 
-        spin_lock_bh(&ax->buflock);
+        spin_lock_irqsave(&ax->buflock, flags);
 
         oxbuff    = ax->xbuff;
         ax->xbuff = xbuff;
@@ -423,7 +427,7 @@ static void ax_changedmtu(struct mkiss *ax)
         ax->mtu      = dev->mtu + 73;
         ax->buffsize = len;
 
-        spin_unlock_bh(&ax->buflock);
+        spin_unlock_irqrestore(&ax->buflock, flags);
 
         kfree(oxbuff);
         kfree(orbuff);
@@ -433,6 +437,7 @@ static void ax_changedmtu(struct mkiss *ax)
 static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)
 {
         struct mkiss *ax = netdev_priv(dev);
+        unsigned long flags;
         unsigned char *p;
         int actual, count;
 
@@ -449,7 +454,7 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)
 
         p = icp;
 
-        spin_lock_bh(&ax->buflock);
+        spin_lock_irqsave(&ax->buflock, flags);
         if ((*p & 0x0f) != 0) {
                 /* Configuration Command (kissparms(1).
                  * Protocol spec says: never append CRC.
@@ -479,7 +484,7 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)
                                 ax->crcauto = (cmd ? 0 : 1);
                                 printk(KERN_INFO "mkiss: %s: crc mode %s %d\n", ax->dev->name, (len) ? "set to" : "is", cmd);
                         }
-                        spin_unlock_bh(&ax->buflock);
+                        spin_unlock_irqrestore(&ax->buflock, flags);
                         netif_start_queue(dev);
 
                         return;
@@ -512,7 +517,7 @@ static void ax_encaps(struct net_device *dev, unsigned char *icp, int len)
                         count = kiss_esc(p, (unsigned char *)ax->xbuff, len);
                 }
         }
-        spin_unlock_bh(&ax->buflock);
+        spin_unlock_irqrestore(&ax->buflock, flags);
 
         set_bit(TTY_DO_WRITE_WAKEUP, &ax->tty->flags);
         actual = ax->tty->ops->write(ax->tty, ax->xbuff, count);
@@ -704,13 +709,14 @@ static DEFINE_RWLOCK(disc_data_lock);
 
 static struct mkiss *mkiss_get(struct tty_struct *tty)
 {
+        unsigned long flags;
         struct mkiss *ax;
 
-        read_lock(&disc_data_lock);
+        read_lock_irqsave(&disc_data_lock, flags);
         ax = tty->disc_data;
         if (ax)
                 atomic_inc(&ax->refcnt);
-        read_unlock(&disc_data_lock);
+        read_unlock_irqrestore(&disc_data_lock, flags);
 
         return ax;
 }
@@ -809,12 +815,13 @@ out:
 
 static void mkiss_close(struct tty_struct *tty)
 {
+        unsigned long flags;
         struct mkiss *ax;
 
-        write_lock(&disc_data_lock);
+        write_lock_irqsave(&disc_data_lock, flags);
         ax = tty->disc_data;
         tty->disc_data = NULL;
-        write_unlock(&disc_data_lock);
+        write_unlock_irqrestore(&disc_data_lock, flags);
 
         if (!ax)
                 return;