diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-06 23:51:34 +0000 |
| commit | 230e5ab6a084ed50470f101934782dbf54b0d06b (patch) | |
| tree | 5dd821c8d33f450470588e7a543f74bf74306e9e /net/x25 | |
| parent | c9b1c8a64c6444d189856f1e26bdcb8b4cd0113a (diff) | |
Merge with Linux 2.1.67.
Diffstat (limited to 'net/x25')
| -rw-r--r-- | net/x25/af_x25.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index a9a12f092..2970a82b9 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c @@ -653,7 +653,7 @@ static int x25_connect(struct socket *sock, struct sockaddr *uaddr, int addr_len */ while (sk->state == TCP_SYN_SENT) { interruptible_sleep_on(sk->sleep); - if (current->signal & ~current->blocked) { + if (signal_pending(current)) { sti(); return -ERESTARTSYS; } @@ -704,7 +704,7 @@ static int x25_accept(struct socket *sock, struct socket *newsock, int flags) return -EWOULDBLOCK; } interruptible_sleep_on(sk->sleep); - if (current->signal & ~current->blocked) { + if (signal_pending(current)) { sti(); return -ERESTARTSYS; } |