diff options
| author | David S. Miller <davem@nuts.davemloft.net> | 2004-09-16 00:23:46 -0700 |
|---|---|---|
| committer | David S. Miller <davem@nuts.davemloft.net> | 2004-09-16 00:23:46 -0700 |
| commit | be8f04e441e8a97b29fabff85e48bffb2a73f41e (patch) | |
| tree | 75e3eb62363ff41ba5d6d8aee5c09671ba0a2769 /include/linux | |
| parent | 2508d59ba6453aa8ec23074063eb2a39a98c7938 (diff) | |
| parent | 3b1160334fa7c005fbde5af8fa12a991cd7ccbcd (diff) | |
Merge bk://kernel.bkbits.net/acme/socket-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/net.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 0f710b7e4121..2c4572f630a1 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -21,6 +21,7 @@ #include <linux/config.h> #include <linux/wait.h> #include <linux/stringify.h> +#include <asm/socket.h> struct poll_table_struct; struct inode; @@ -61,8 +62,13 @@ typedef enum { #define SOCK_ASYNC_WAITDATA 1 #define SOCK_NOSPACE 2 +#ifndef ARCH_HAS_SOCKET_TYPES /** sock_type - Socket types - * + * + * When adding some new socket type please + * grep ARCH_HAS_SOCKET_TYPE include/asm-* /socket.h, at least MIPS + * overrides this enum for binary compat reasons. + * * @SOCK_STREAM - stream (connection) socket * @SOCK_DGRAM - datagram (conn.less) socket * @SOCK_RAW - raw socket @@ -82,6 +88,8 @@ enum sock_type { #define SOCK_MAX (SOCK_PACKET + 1) +#endif /* ARCH_HAS_SOCKET_TYPES */ + /** * struct socket - general BSD socket * @state - socket state (%SS_CONNECTED, etc) |