diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-28 03:58:46 +0000 |
| commit | b63ad0882a16a5d28003e57f2b0b81dee3fb322b (patch) | |
| tree | 0a343ce219e2b8b38a5d702d66032c57b83d9720 /net/atm | |
| parent | a9d7bff9a84dba79609a0002e5321b74c4d64c64 (diff) | |
Merge with 2.4.0-test11.
Diffstat (limited to 'net/atm')
| -rw-r--r-- | net/atm/pvc.c | 2 | ||||
| -rw-r--r-- | net/atm/signaling.c | 1 | ||||
| -rw-r--r-- | net/atm/svc.c | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/net/atm/pvc.c b/net/atm/pvc.c index ff28ed551..c47d6ca5c 100644 --- a/net/atm/pvc.c +++ b/net/atm/pvc.c @@ -130,7 +130,7 @@ static int __init atmpvc_init(void) error = sock_register(&pvc_family_ops); if (error < 0) { printk(KERN_ERR "ATMPVC: can't register (%d)",error); - return; + return error; } #ifdef CONFIG_ATM_CLIP atm_clip_init(); diff --git a/net/atm/signaling.c b/net/atm/signaling.c index dc7998fd1..0b3d64941 100644 --- a/net/atm/signaling.c +++ b/net/atm/signaling.c @@ -50,6 +50,7 @@ static void sigd_put_skb(struct sk_buff *skb) } schedule(); } + current->state = TASK_RUNNING; remove_wait_queue(&sigd_sleep,&wait); #else if (!sigd) { diff --git a/net/atm/svc.c b/net/atm/svc.c index 7984cb22a..e53826b98 100644 --- a/net/atm/svc.c +++ b/net/atm/svc.c @@ -205,7 +205,6 @@ static int svc_connect(struct socket *sock,struct sockaddr *sockaddr, set_current_state(TASK_UNINTERRUPTIBLE); schedule(); } - remove_wait_queue(&vcc->sleep,&wait); clear_bit(ATM_VF_REGIS,&vcc->flags); clear_bit(ATM_VF_RELEASED,&vcc->flags); clear_bit(ATM_VF_CLOSE,&vcc->flags); |