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

• Lines: 15
• Date: Mon May 12 10:35:40 1997
• Orig file: v2.1.36/linux/drivers/net/ariadne.c
• Orig date: Wed Apr 23 19:01:18 1997

diff -u --recursive --new-file v2.1.36/linux/drivers/net/ariadne.c linux/drivers/net/ariadne.c
@@ -593,12 +593,12 @@
 
     /* Block a timer-based transmit from overlapping.  This could better be
 	done with atomic_swap(1, dev->tbusy), but set_bit() works as well. */
-    if (set_bit(0, (void*)&dev->tbusy) != 0) {
+    if (test_and_set_bit(0, (void*)&dev->tbusy) != 0) {
 	printk("%s: Transmitter access conflict.\n", dev->name);
 	return(1);
     }
 
-    if (set_bit(0, (void*)&priv->lock) != 0) {
+    if (test_and_set_bit(0, (void*)&priv->lock) != 0) {
 	if (ariadne_debug > 0)
 	    printk("%s: tx queue lock!.\n", dev->name);
 	/* don't clear dev->tbusy flag. */