patch-2.3.99-pre6 linux/net/atm/common.c

• Lines: 34
• Date: Fri Apr 14 09:37:20 2000
• Orig file: v2.3.99-pre5/linux/net/atm/common.c
• Orig date: Mon Mar 27 08:08:33 2000

diff -u --recursive --new-file v2.3.99-pre5/linux/net/atm/common.c linux/net/atm/common.c
@@ -114,7 +114,6 @@
 	vcc->atm_options = vcc->aal_options = 0;
 	vcc->timestamp.tv_sec = vcc->timestamp.tv_usec = 0;
 	init_waitqueue_head(&vcc->sleep);
-	init_waitqueue_head(&vcc->wsleep);
 	skb_queue_head_init(&vcc->recvq);
 	skb_queue_head_init(&vcc->listenq);
 	sock->sk = sk;
@@ -412,7 +411,7 @@
 	if (!size) return 0;
 	/* verify_area is done by net/socket.c */
 	eff = (size+3) & ~3; /* align to word boundary */
-	add_wait_queue(&vcc->wsleep,&wait);
+	add_wait_queue(&vcc->sleep,&wait);
 	set_current_state(TASK_INTERRUPTIBLE);
 	error = 0;
 	while (!(skb = vcc->alloc_tx(vcc,eff))) {
@@ -437,7 +436,7 @@
 		}
 	}
 	set_current_state(TASK_RUNNING);
-	remove_wait_queue(&vcc->wsleep,&wait);
+	remove_wait_queue(&vcc->sleep,&wait);
 	if (error) return error;
 	skb->dev = NULL; /* for paths shared with net_device interfaces */
 	ATM_SKB(skb)->iovcnt = 0;
@@ -459,7 +458,6 @@
 
 	vcc = ATM_SD(sock);
 	poll_wait(file,&vcc->sleep,wait);
-	poll_wait(file,&vcc->wsleep,wait);
 	mask = 0;
 	if (skb_peek(&vcc->recvq) || skb_peek(&vcc->listenq))
 		mask |= POLLIN | POLLRDNORM;