patch-2.4.22 linux-2.4.22/net/atm/svc.c
Next file: linux-2.4.22/net/ax25/ax25_ip.c
Previous file: linux-2.4.22/net/atm/signaling.c
Back to the patch index
Back to the overall index
- Lines: 85
- Date:
2003-08-25 04:44:44.000000000 -0700
- Orig file:
linux-2.4.21/net/atm/svc.c
- Orig date:
2001-04-12 12:11:39.000000000 -0700
diff -urN linux-2.4.21/net/atm/svc.c linux-2.4.22/net/atm/svc.c
@@ -65,8 +65,8 @@
DPRINTK("svc_disconnect %p\n",vcc);
if (test_bit(ATM_VF_REGIS,&vcc->flags)) {
- sigd_enq(vcc,as_close,NULL,NULL,NULL);
add_wait_queue(&vcc->sleep,&wait);
+ sigd_enq(vcc,as_close,NULL,NULL,NULL);
while (!test_bit(ATM_VF_RELEASED,&vcc->flags) && sigd) {
set_current_state(TASK_UNINTERRUPTIBLE);
schedule();
@@ -125,8 +125,8 @@
if (!test_bit(ATM_VF_HASQOS,&vcc->flags)) return -EBADFD;
vcc->local = *addr;
vcc->reply = WAITING;
- sigd_enq(vcc,as_bind,NULL,NULL,&vcc->local);
add_wait_queue(&vcc->sleep,&wait);
+ sigd_enq(vcc,as_bind,NULL,NULL,&vcc->local);
while (vcc->reply == WAITING && sigd) {
set_current_state(TASK_UNINTERRUPTIBLE);
schedule();
@@ -170,12 +170,13 @@
!vcc->qos.rxtp.traffic_class) return -EINVAL;
vcc->remote = *addr;
vcc->reply = WAITING;
+ add_wait_queue(&vcc->sleep,&wait);
sigd_enq(vcc,as_connect,NULL,NULL,&vcc->remote);
if (flags & O_NONBLOCK) {
+ remove_wait_queue(&vcc->sleep,&wait);
sock->state = SS_CONNECTING;
return -EINPROGRESS;
}
- add_wait_queue(&vcc->sleep,&wait);
error = 0;
while (vcc->reply == WAITING && sigd) {
set_current_state(TASK_INTERRUPTIBLE);
@@ -244,8 +245,8 @@
/* let server handle listen on unbound sockets */
if (test_bit(ATM_VF_SESSION,&vcc->flags)) return -EINVAL;
vcc->reply = WAITING;
- sigd_enq(vcc,as_listen,NULL,NULL,&vcc->local);
add_wait_queue(&vcc->sleep,&wait);
+ sigd_enq(vcc,as_listen,NULL,NULL,&vcc->local);
while (vcc->reply == WAITING && sigd) {
set_current_state(TASK_UNINTERRUPTIBLE);
schedule();
@@ -314,8 +315,8 @@
}
/* wait should be short, so we ignore the non-blocking flag */
new_vcc->reply = WAITING;
- sigd_enq(new_vcc,as_accept,old_vcc,NULL,NULL);
add_wait_queue(&new_vcc->sleep,&wait);
+ sigd_enq(new_vcc,as_accept,old_vcc,NULL,NULL);
while (new_vcc->reply == WAITING && sigd) {
set_current_state(TASK_UNINTERRUPTIBLE);
schedule();
@@ -348,8 +349,8 @@
DECLARE_WAITQUEUE(wait,current);
vcc->reply = WAITING;
- sigd_enq2(vcc,as_modify,NULL,NULL,&vcc->local,qos,0);
add_wait_queue(&vcc->sleep,&wait);
+ sigd_enq2(vcc,as_modify,NULL,NULL,&vcc->local,qos,0);
while (vcc->reply == WAITING && !test_bit(ATM_VF_RELEASED,&vcc->flags)
&& sigd) {
set_current_state(TASK_UNINTERRUPTIBLE);
@@ -442,13 +443,12 @@
* Initialize the ATM SVC protocol family
*/
-static int __init atmsvc_init(void)
+int atmsvc_init(void)
{
- if (sock_register(&svc_family_ops) < 0) {
- printk(KERN_ERR "ATMSVC: can't register");
- return -1;
- }
- return 0;
+ return sock_register(&svc_family_ops);
}
-module_init(atmsvc_init);
+void atmsvc_exit(void)
+{
+ sock_unregister(PF_ATMSVC);
+}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)