From 7e7e31821f2ac6a5e428a52b53e11d20135e8c7c Mon Sep 17 00:00:00 2001
From: rd235 <rd235@d37a7db1-d92d-0410-89df-f68f52f87b57>
Date: Sun, 1 Feb 2009 13:12:11 +0000
Subject: [PATCH] af_ipn: redefinition of AF_IPN avoided

git-svn-id: https://vde.svn.sourceforge.net/svnroot/vde/trunk@345 d37a7db1-d92d-0410-89df-f68f52f87b57
---
 ipn/af_ipn.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ipn/af_ipn.h b/ipn/af_ipn.h
index 0228c34..e2270f1 100644
--- a/ipn/af_ipn.h
+++ b/ipn/af_ipn.h
@@ -1,5 +1,6 @@
 #ifndef __LINUX_NET_AFIPN_H
 #define __LINUX_NET_AFIPN_H
+#include <linux/socket.h>
 
 #ifdef IPN_STEALING
 /* AF_NETBEUI seems to be unused */
@@ -8,7 +9,9 @@
 #define ipn_handle_frame_hook br_handle_frame_hook
 #else
 #ifndef AF_IPN
-#define AF_IPN 34
+/* waiting for the official assigment of our AF */
+/* #define AF_IPN ??? */
+#define AF_IPN AF_NETBEUI
 #define PF_IPN AF_IPN
 #endif
 #define AF_IPN_STOLEN AF_NETBEUI
@@ -72,7 +75,6 @@ struct numnode_oob {
 #define kmem_cache_create(A,B,C,D,E) kmem_cache_create((A),(B),(C),(D),(E),(E))
 #endif
 
-#include <linux/socket.h>
 #include <linux/mutex.h>
 #include <linux/un.h>
 #include <net/sock.h>
-- 
2.11.4.GIT