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

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

diff -u --recursive --new-file v2.1.36/linux/drivers/net/ni65.c linux/drivers/net/ni65.c
@@ -804,7 +804,7 @@
 		return;
 	}
 
-	if(set_bit(0,(int *) &dev->interrupt)) {
+	if(test_and_set_bit(0,(int *) &dev->interrupt)) {
 		printk("ni65: oops .. interrupt while proceeding interrupt\n");
 		return;
 	}
@@ -1087,11 +1087,11 @@
 		dev->trans_start = jiffies;
 	}
 
-	if (set_bit(0, (void*)&dev->tbusy) != 0) {
+	if (test_and_set_bit(0, (void*)&dev->tbusy) != 0) {
 		 printk(KERN_ERR "%s: Transmitter access conflict.\n", dev->name);
 		 return 1;
 	}
-	if (set_bit(0, (void*)&p->lock)) {
+	if (test_and_set_bit(0, (void*)&p->lock)) {
 		printk(KERN_ERR "%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