From: Rusty Russell <rusty@rustcorp.com.au>
Date: Sun, 23 Mar 2008 00:18:47 +0000 (-0700)
Subject: [NET]: NPROTO is redundant; it's equal to AF_MAX/PF_MAX.
X-Git-Tag: v2.6.26-rc1~1138^2~393
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=0098b7273e968fb9989a6e1e4e4c024cd081fe0d;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/include/linux/net.h b/include/linux/net.h
index c414d90e647..71f7dd55928 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)			*/