summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2008-03-22 17:18:47 -0700
committerDavid S. Miller <davem@davemloft.net>2008-03-22 17:18:47 -0700
commit0098b7273e968fb9989a6e1e4e4c024cd081fe0d (patch)
tree6169be4b1e74ef7b9cc19d72bd50ec6c77064411
parentfc8717baa8f52dd8d1b90df9008300ef3ec794ed (diff)
downloadlinux-stable-0098b7273e968fb9989a6e1e4e4c024cd081fe0d.tar.gz
linux-stable-0098b7273e968fb9989a6e1e4e4c024cd081fe0d.tar.bz2
linux-stable-0098b7273e968fb9989a6e1e4e4c024cd081fe0d.zip
[NET]: NPROTO is redundant; it's equal to AF_MAX/PF_MAX.
DaveM pointed out NPROTO exposed to userspace, so keep it around, just make sure it stays in sync. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/net.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/net.h b/include/linux/net.h
index c414d90e647b..71f7dd559285 100644
--- a/include/linux/net.h
+++ b/include/linux/net.h
@@ -19,6 +19,7 @@
#define _LINUX_NET_H
#include <linux/wait.h>
+#include <linux/socket.h>
#include <asm/socket.h>
struct poll_table_struct;
@@ -26,7 +27,7 @@ struct pipe_inode_info;
struct inode;
struct net;
-#define NPROTO 34 /* should be enough for now.. */
+#define NPROTO AF_MAX
#define SYS_SOCKET 1 /* sys_socket(2) */
#define SYS_BIND 2 /* sys_bind(2) */