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

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

diff -u --recursive --new-file v2.1.36/linux/drivers/net/ppp.c linux/drivers/net/ppp.c
@@ -1291,7 +1291,7 @@
  * The total length includes the protocol data.
  * Lock the user information buffer.
  */
-	if (set_bit (0, &ppp->ubuf->locked)) {
+	if (test_and_set_bit (0, &ppp->ubuf->locked)) {
 		if (ppp->flags & SC_DEBUG)
 			printk (KERN_DEBUG
 				"ppp_us_queue: can't get lock\n");
@@ -1698,7 +1698,7 @@
 		if (!ppp || ppp->magic != PPP_MAGIC || !ppp->inuse)
 			return 0;
 
-		if (set_bit (0, &ppp->ubuf->locked) != 0) {
+		if (test_and_set_bit (0, &ppp->ubuf->locked) != 0) {
 			if (ppp->flags & SC_DEBUG)
 				printk (KERN_DEBUG
 				     "ppp_tty_read: sleeping(ubuf)\n");
@@ -2584,7 +2584,7 @@
 		poll_wait(&ppp->write_wait, wait);
 
 		/* Must lock the user buffer area while checking. */
-		if(set_bit(0, &ppp->ubuf->locked) == 0) {
+		if(test_and_set_bit(0, &ppp->ubuf->locked) == 0) {
 			if(ppp->ubuf->head != ppp->ubuf->tail)
 				mask |= POLLIN | POLLRDNORM;
 			clear_bit(0, &ppp->ubuf->locked);
@@ -3130,7 +3130,7 @@
 
 	while (ctl) {
 		ppp = ctl2ppp (ctl);
-		if (!set_bit(0, &ppp->inuse)) {
+		if (!test_and_set_bit(0, &ppp->inuse)) {
 			if (ppp->sc_xfer == pid_value) {
 				ppp->sc_xfer = 0;
 				return (ppp);
@@ -3160,7 +3160,7 @@
 
 	while (ctl) {
 		ppp = ctl2ppp (ctl);
-		if (!set_bit(0, &ppp->inuse))
+		if (!test_and_set_bit(0, &ppp->inuse))
 			return (ppp);
 		ctl = ctl->next;
 		if (++if_num == max_dev)