patch-2.1.37 linux/drivers/net/strip.c

• Lines: 18
• Date: Mon May 12 10:35:41 1997
• Orig file: v2.1.36/linux/drivers/net/strip.c
• Orig date: Thu Feb 27 10:57:31 1997

diff -u --recursive --new-file v2.1.36/linux/drivers/net/strip.c linux/drivers/net/strip.c
@@ -891,7 +891,7 @@
      */
     strip_info->idle_timer.expires  = jiffies + HZ;
     add_timer(&strip_info->idle_timer);
-    if (!clear_bit(0, (void *)&strip_info->dev.tbusy))
+    if (!test_and_clear_bit(0, (void *)&strip_info->dev.tbusy))
         printk(KERN_ERR "%s: trying to unlock already unlocked device!\n",
             strip_info->dev.name);
 }
@@ -1745,7 +1745,7 @@
         printk(KERN_ERR "%s: xmit call when iface is down\n", dev->name);
         return(1);
     }
-    if (set_bit(0, (void *) &strip_info->dev.tbusy)) return(1);
+    if (test_and_set_bit(0, (void *) &strip_info->dev.tbusy)) return(1);
     del_timer(&strip_info->idle_timer);
 
     /* See if someone has been ifconfigging */