patch-2.3.3 linux/drivers/net/cosa.c

• Lines: 28
• Date: Sat May 15 15:05:36 1999
• Orig file: v2.3.2/linux/drivers/net/cosa.c
• Orig date: Sun Mar 7 15:47:46 1999

diff -u --recursive --new-file v2.3.2/linux/drivers/net/cosa.c linux/drivers/net/cosa.c
@@ -126,7 +126,8 @@
 	struct semaphore rsem, wsem;
 	char *rxdata;
 	int rxsize;
-	struct wait_queue *txwaitq, *rxwaitq;
+	wait_queue_head_t txwaitq; 
+	wait_queue_head_t rxwaitq;
 	int tx_status, rx_status;
 
 	/* SPPP/HDLC device parts */
@@ -762,7 +763,7 @@
 static ssize_t cosa_read(struct file *file,
 	char *buf, size_t count, loff_t *ppos)
 {
-	struct wait_queue wait = { current, NULL };
+	DECLARE_WAITQUEUE(wait, current);
 	int flags;
 	struct channel_data *chan = (struct channel_data *)file->private_data;
 	struct cosa_data *cosa = chan->cosa;
@@ -833,7 +834,7 @@
 	const char *buf, size_t count, loff_t *ppos)
 {
 	struct channel_data *chan = (struct channel_data *)file->private_data;
-	struct wait_queue wait = { current, NULL };
+	DECLARE_WAITQUEUE(wait, current);
 	struct cosa_data *cosa = chan->cosa;
 	unsigned int flags;
 	char *kbuf;