diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-08-26 15:29:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-26 10:37:20 -0700 |
| commit | 5770a3fb5f8544d40ae03b010318345cdd05d662 (patch) | |
| tree | 53429cf5e31d10f2f604c6a338148a8ebf419741 /include/linux/net.h | |
| parent | b22dfb735a019a721117e713968c1ddf60ee6142 (diff) | |
| download | linux-5770a3fb5f8544d40ae03b010318345cdd05d662.tar.gz linux-5770a3fb5f8544d40ae03b010318345cdd05d662.tar.bz2 linux-5770a3fb5f8544d40ae03b010318345cdd05d662.zip | |
Fix userspace export of <linux/net.h>
Including <linux/fcntl.h> in the user-visible part of this header has
caused build regressions with headers from 2.6.27-rc. Move it down to
the #ifdef __KERNEL__ part, which is the only place it's needed. Move
some other kernel-only things down there too, while we're at it.
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/net.h')
| -rw-r--r-- | include/linux/net.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/include/linux/net.h b/include/linux/net.h index 4a9a30f2d68f..6dc14a240042 100644 --- a/include/linux/net.h +++ b/include/linux/net.h @@ -18,16 +18,9 @@ #ifndef _LINUX_NET_H #define _LINUX_NET_H -#include <linux/wait.h> #include <linux/socket.h> -#include <linux/fcntl.h> /* For O_CLOEXEC and O_NONBLOCK */ #include <asm/socket.h> -struct poll_table_struct; -struct pipe_inode_info; -struct inode; -struct net; - #define NPROTO AF_MAX #define SYS_SOCKET 1 /* sys_socket(2) */ @@ -62,6 +55,13 @@ typedef enum { #ifdef __KERNEL__ #include <linux/stringify.h> #include <linux/random.h> +#include <linux/wait.h> +#include <linux/fcntl.h> /* For O_CLOEXEC and O_NONBLOCK */ + +struct poll_table_struct; +struct pipe_inode_info; +struct inode; +struct net; #define SOCK_ASYNC_NOSPACE 0 #define SOCK_ASYNC_WAITDATA 1 |