From 4e8c7c009f3a84d1221fc796eaf03f5e9f78caf1 Mon Sep 17 00:00:00 2001
From: Rusty Russell <rusty@rustcorp.com.au>
Date: Sat, 22 Mar 2008 17:18:47 -0700
Subject: [PATCH] --- yaml --- r: 90207 b: refs/heads/master c:
 0098b7273e968fb9989a6e1e4e4c024cd081fe0d h: refs/heads/master i:   90205:
 1b6da321a04bd0386ff3659ffdf13fecc4c94d4f   90203:
 10e2867112e4e7dc7b90b08c6ac659d97d3b344e   90199:
 e26bc40bbe9b2fcffd0ff77e7f1cbf1289942b8c   90191:
 769d1e3d300dbb91a8ee682025ea534751ca5f88   90175:
 d4d0d48ba39bda3e03fd47ec575f325623fa5382 v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/net.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 24c01e5dd640..186c1d7c31b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fc8717baa8f52dd8d1b90df9008300ef3ec794ed
+refs/heads/master: 0098b7273e968fb9989a6e1e4e4c024cd081fe0d
diff --git a/trunk/include/linux/net.h b/trunk/include/linux/net.h
index c414d90e647b..71f7dd559285 100644
--- a/trunk/include/linux/net.h
+++ b/trunk/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)			*/