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

Next file: linux/drivers/sbus/audio/audio.c
Previous file: linux/drivers/misc/TODO-parport
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.56/linux/drivers/net/ppp.c linux/drivers/net/ppp.c
@@ -1711,7 +1711,7 @@
 			current->state	 = TASK_INTERRUPTIBLE;
 			schedule ();
 
-			if (current->signal & ~current->blocked)
+			if (signal_pending(current))
 				return -EINTR;
 			continue;
 		}
@@ -1753,7 +1753,7 @@
 					"ppp_tty_read: sleeping(read_wait)\n");
 
 			interruptible_sleep_on (&ppp->read_wait);
-			if (current->signal & ~current->blocked)
+			if (signal_pending(current))
 				return -EINTR;
 			continue;
 		}
@@ -2104,7 +2104,7 @@
 			return 0;
 		}
 
-		if (current->signal & ~current->blocked) {
+		if (signal_pending(current)) {
 			kfree (new_data);
 			return -EINTR;
 		}

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