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)

diff --git a/src/afs/afs_conn.c b/src/afs/afs_conn.c
index 7965d58c12711cab29dd619c7d77ea10907cb04a..7a7dccd4de2a623e606c571473a3efe3d83ea2b8 100644 (file)
--- 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 785891dac33765f7dbdd4802fb16020167aaaa81..fb10afa69b6f3ffe7ef3635923890bb42b2c086b 100644 (file)
--- 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 c6c13358e66a23e53d5ccec5d41e5392b40baf8f..951c6b7f8aba548b329d6fb44fe6e5e4c8b0ab03 100644 (file)
--- 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 d33bf199e43b6a537e449894b345d772929d8cdc..4fc259bbae3cd614e5b6b8c29dfebcf4a00855ce 100644 (file)
--- 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 89d1e35cd64f4b2b026792bfbb88eb07fa5ed742..9c4a19c32f8be60665275a477f64e5949e195ea4 100644 (file)
--- 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 dbd2e2326b15e9692c57f51e6281075d7276b31d..efde6935f90401a5179838280a8773d2ec3e9b38 100644 (file)
--- 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 0eacd8aaec83d5f03544807d8c3d9bd7e0cd3c6b..557ca6e4decb5ee5467bc22366b9de06ea3a44f0 100644 (file)
--- 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 */