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

Next file: linux/drivers/net/ni65.c
Previous file: linux/drivers/net/myri_sbus.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.36/linux/drivers/net/ni52.c linux/drivers/net/ni52.c
@@ -1171,12 +1171,12 @@
 		return 0;
 	}
 
-	if (set_bit(0, (void*)&dev->tbusy)) {
+	if (test_and_set_bit(0, (void*)&dev->tbusy)) {
 		printk("%s: Transmitter access conflict.\n", dev->name);
 		return 1;
 	}
 #if(NUM_XMIT_BUFFS > 1)
-	else if(set_bit(0,(void *) &p->lock)) {
+	else if(test_and_set_bit(0,(void *) &p->lock)) {
 		printk("%s: Queue was locked\n",dev->name);
 		return 1;
 	}

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov