diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1997-12-16 05:34:03 +0000 |
| commit | 967c65a99059fd459b956c1588ce0ba227912c4e (patch) | |
| tree | 8224d013ff5d255420713d05610c7efebd204d2a /include/linux/net.h | |
| parent | e20c1cc1656a66a2773bca4591a895cbc12696ff (diff) | |
Merge with Linux 2.1.72, part 1.
Diffstat (limited to 'include/linux/net.h')
| -rw-r--r-- | include/linux/net.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 82a4b7570..015f2d8b2 100644 --- a/include/linux/net.h +++ b/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 @@ struct proto_ops { 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); |