From: Derrick Brashear <shadow@dementia.org>
Date: Tue, 20 May 2003 04:57:44 +0000 (+0000)
Subject: linux-use-kernel-net-include-dir-for-net-20030519
X-Git-Tag: openafs-devel-1_3_50~212
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=a9b72c443e4bd074ecabe7ed005354e55c69b53d;p=packages%2Fo%2Fopenafs.git

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

diff --git a/src/afs/afs_conn.c b/src/afs/afs_conn.c
index 7691b2cd9..de261b5a9 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 550a10dc3..184d6e7c6 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 3889647e6..a0b7b973f 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 751423aeb..30aa9bb6d 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 4b3d6790e..938949eae 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 d6b74c9e3..434eea516 100644
--- a/src/libafs/MakefileProto.LINUX.in
+++ b/src/libafs/MakefileProto.LINUX.in
@@ -118,7 +118,7 @@ ${COMPDIRS} ${INSTDIRS} ${DESTDIRS}:
 	$(RM) -f linux 
 	ln -fs ${LINUX_KERNEL_PATH}/include/linux linux 
 	$(RM) -f net 
-	ln -fs ${LINUX_KERNEL_PATH}/include/linux net 
+	ln -fs ${LINUX_KERNEL_PATH}/include/net net 
 	$(RM) -f netinet 
 	ln -fs ${LINUX_KERNEL_PATH}/include/linux netinet 
 	$(RM) -f sys
diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index a68a2b713..23fcf74f9 100644
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -18,12 +18,19 @@
 #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_
 typedef unsigned short                  etap_event_t;
 #endif
 #endif  
+
+
 #include "h/types.h"
 #include "h/param.h"
 #ifndef AFS_LINUX22_ENV
@@ -75,7 +82,11 @@ typedef unsigned short                  etap_event_t;
 #include "h/signalvar.h"
 #endif /* AFS_OBSD_ENV */
 #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) && !defined(AFS_OBSD_ENV)
@@ -95,17 +106,16 @@ 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
 #if !defined(AFS_OBSD_ENV)
 #include "h/proc.h"
 #include "h/file.h"
 #endif
-#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 */