patch-2.3.1 linux/net/netlink/af_netlink.c

Next file: linux/net/socket.c
Previous file: linux/net/irda/ircomm/irvtd_driver.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.0/linux/net/netlink/af_netlink.c linux/net/netlink/af_netlink.c
@@ -45,7 +45,7 @@
 
 static struct sock *nl_table[MAX_LINKS];
 static atomic_t nl_table_lock[MAX_LINKS];
-static struct wait_queue *nl_table_wait;
+static DECLARE_WAIT_QUEUE_HEAD(nl_table_wait);
 
 #ifdef NL_EMULATE_DEV
 static struct socket *netlink_kernel[MAX_LINKS];
@@ -331,7 +331,7 @@
 	struct sock *sk;
 	int len = skb->len;
 	int protocol = ssk->protocol;
-	struct wait_queue wait = { current, NULL };
+        DECLARE_WAITQUEUE(wait, current);
 
 retry:
 	for (sk = nl_table[protocol]; sk; sk = sk->next) {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)