patch-2.1.68 linux/include/linux/net.h

Next file: linux/include/linux/net_alias.h
Previous file: linux/include/linux/mroute.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.67/linux/include/linux/net.h linux/include/linux/net.h
@@ -18,11 +18,11 @@
 #ifndef _LINUX_NET_H
 #define _LINUX_NET_H
 
-
-#include <linux/wait.h>
 #include <linux/socket.h>
 
-#define NPROTO		16		/* should be enough for now..	*/
+struct poll_table_struct;
+
+#define NPROTO		32		/* should be enough for now..	*/
 
 
 #define SYS_SOCKET	1		/* sys_socket(2)		*/
@@ -93,7 +93,7 @@
 			 int flags);
   int	(*getname)	(struct socket *sock, struct sockaddr *uaddr,
 			 int *usockaddr_len, int peer);
-  unsigned int (*poll)	(struct socket *sock, poll_table *wait);
+  unsigned int (*poll)	(struct socket *sock, struct poll_table_struct *wait);
   int	(*ioctl)	(struct socket *sock, unsigned int cmd,
 			 unsigned long arg);
   int	(*listen)	(struct socket *sock, int len);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov