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

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

diff -u --recursive --new-file v2.1.36/linux/drivers/net/lance.c linux/drivers/net/lance.c
@@ -834,12 +834,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*)&lp->lock) != 0) {
+	if (test_and_set_bit(0, (void*)&lp->lock) != 0) {
 		if (lance_debug > 0)
 			printk("%s: tx queue lock!.\n", dev->name);
 		/* don't clear dev->tbusy flag. */