From 77b2f7c8cf332dc39674d8fbafee222f123a05b6 Mon Sep 17 00:00:00 2001
From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 20 May 2003 05:23:05 +0000
Subject: [PATCH] STABLE12-linux-use-kernel-net-include-dir-for-net-20030519

since we can end up trying to include things which exist in include/net
but not include/linux, try to rationalize.


(cherry picked from commit a9b72c443e4bd074ecabe7ed005354e55c69b53d)
---
 src/afs/afs_conn.c                |  2 ++
 src/afs/afs_server.c              |  2 ++
 src/afs/afs_user.c                |  2 ++
 src/afs/afs_util.c                |  2 ++
 src/afs/afs_volume.c              |  2 ++
 src/libafs/MakefileProto.LINUX.in |  2 +-
 src/rx/rx_kcommon.h               | 14 +++++++++++---
 7 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/afs/afs_conn.c b/src/afs/afs_conn.c
index 7965d58c1..7a7dccd4d 100644
--- a/src/afs/afs_conn.c
+++ b/src/afs/afs_conn.c
@@ -19,7 +19,9 @@ RCSID("$Header$");
 #include "../afs/sysincludes.h"	/* Standard vendor system headers */
 
 #if !defined(UKERNEL)
+#if !defined(AFS_LINUX20_ENV)
 #include <net/if.h>
+#endif
 #include <netinet/in.h>
 
 #ifdef AFS_SGI62_ENV
diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c
index 785891dac..fb10afa69 100644
--- a/src/afs/afs_server.c
+++ b/src/afs/afs_server.c
@@ -38,7 +38,9 @@ RCSID("$Header$");
 #include "../afs/sysincludes.h"	/* Standard vendor system headers */
 
 #if !defined(UKERNEL)
+#if !defined(AFS_LINUX20_ENV)
 #include <net/if.h>
+#endif
 #include <netinet/in.h>
 
 #ifdef AFS_SGI62_ENV
diff --git a/src/afs/afs_user.c b/src/afs/afs_user.c
index c6c13358e..951c6b7f8 100644
--- a/src/afs/afs_user.c
+++ b/src/afs/afs_user.c
@@ -19,7 +19,9 @@ RCSID("$Header$");
 #include "../afs/sysincludes.h"	/* Standard vendor system headers */
 
 #if !defined(UKERNEL)
+#if !defined(AFS_LINUX20_ENV)
 #include <net/if.h>
+#endif
 #include <netinet/in.h>
 
 #ifdef AFS_SGI62_ENV
diff --git a/src/afs/afs_util.c b/src/afs/afs_util.c
index d33bf199e..4fc259bba 100644
--- a/src/afs/afs_util.c
+++ b/src/afs/afs_util.c
@@ -21,7 +21,9 @@ RCSID("$Header$");
 #include "../afs/sysincludes.h"	/* Standard vendor system headers */
 
 #if !defined(UKERNEL)
+#if !defined(AFS_LINUX20_ENV)
 #include <net/if.h>
+#endif
 #include <netinet/in.h>
 
 #ifdef AFS_SGI62_ENV
diff --git a/src/afs/afs_volume.c b/src/afs/afs_volume.c
index 89d1e35cd..9c4a19c32 100644
--- a/src/afs/afs_volume.c
+++ b/src/afs/afs_volume.c
@@ -24,7 +24,9 @@ RCSID("$Header$");
 #include "../afs/sysincludes.h"	/* Standard vendor system headers */
 
 #if !defined(UKERNEL)
+#if !defined(AFS_LINUX20_ENV)
 #include <net/if.h>
+#endif
 #include <netinet/in.h>
 
 #ifdef AFS_SGI62_ENV
diff --git a/src/libafs/MakefileProto.LINUX.in b/src/libafs/MakefileProto.LINUX.in
index dbd2e2326..efde6935f 100644
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -131,7 +131,7 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
 	$(RM) -f linux 
 	ln -s ${LINUX_KERNEL_PATH}/include/linux linux 
 	$(RM) -f net 
-	ln -s ${LINUX_KERNEL_PATH}/include/linux net 
+	ln -s ${LINUX_KERNEL_PATH}/include/net net 
 	$(RM) -f netinet 
 	ln -s ${LINUX_KERNEL_PATH}/include/linux netinet 
 	$(RM) -f sys
diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index 0eacd8aae..557ca6e4d 100644
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -14,6 +14,11 @@
 #ifndef _RX_KCOMMON_H_
 #define _RX_KCOMMON_H_
 
+#ifdef AFS_LINUX22_ENV
+#define _LINUX_CODA_FS_I 1
+#define _CODA_HEADER_ 1
+struct coda_inode_info {};
+#endif
 #ifdef AFS_DARWIN_ENV
 #ifndef _MACH_ETAP_H_
 #define _MACH_ETAP_H_
@@ -60,7 +65,11 @@ typedef unsigned short                  etap_event_t;
 #include "../h/sysctl.h"
 #endif
 #include "../netinet/in.h"
+#ifdef AFS_LINUX22_ENV
+#include "../linux/route.h"
+#else
 #include "../net/route.h"
+#endif
 #include "../netinet/in_systm.h"
 #include "../netinet/ip.h"
 #if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV)
@@ -80,15 +89,14 @@ typedef unsigned short                  etap_event_t;
 #include "../h/user.h"
 #endif
 #ifdef AFS_LINUX22_ENV
-#define _LINUX_CODA_FS_I
-struct coda_inode_info {};
 #include "../h/sched.h"
 #include "../h/netdevice.h"
+#include "../linux/if.h"
 #else
 #include "../h/proc.h"
 #include "../h/file.h"
-#endif
 #include "../net/if.h"
+#endif
 #if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV)
 #include "../netinet/in_var.h"
 #endif /* ! AFS_HPUX110_ENV && ! AFS_LINUX22_ENV */
-- 
2.39.5