DEVEL15-linux-2620-rc1-update-20061228

[openafs.git] / src / rx / rx_kcommon.h

diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h
index a68a2b7..94b36f0 100644 (file)
--- a/src/rx/rx_kcommon.h
+++ b/src/rx/rx_kcommon.h
@@ -18,12 +18,22 @@
 #ifndef _RX_KCOMMON_H_
 #define _RX_KCOMMON_H_
 
+#ifdef AFS_LINUX22_ENV
+#ifndef _LINUX_CODA_FS_I
+#define _LINUX_CODA_FS_I 1
+#define _CODA_HEADER_ 1
+struct coda_inode_info {
+};
+#endif
+#endif
 #ifdef AFS_DARWIN_ENV
 #ifndef _MACH_ETAP_H_
 #define _MACH_ETAP_H_
-typedef unsigned short                  etap_event_t;
+typedef unsigned short etap_event_t;
 #endif
-#endif  
+#endif
+
+
 #include "h/types.h"
 #include "h/param.h"
 #ifndef AFS_LINUX22_ENV
@@ -32,8 +42,8 @@ typedef unsigned short                  etap_event_t;
 #include "h/time.h"
 #ifdef AFS_SUN56_ENV
 #include "h/vfs.h"             /* stops SUN56 socketvar.h warnings */
-#include "h/stropts.h" /* stops SUN56 socketvar.h warnings */
-#include "h/stream.h"  /* stops SUN56 socketvar.h errors */
+#include "h/stropts.h"         /* stops SUN56 socketvar.h warnings */
+#include "h/stream.h"          /* stops SUN56 socketvar.h errors */
 #include "h/disp.h"
 #endif
 #include "h/socket.h"
@@ -75,8 +85,14 @@ 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
+#if defined(HAVE_IN_SYSTM_H) || !defined(AFS_LINUX22_ENV)
 #include "netinet/in_systm.h"
+#endif
 #include "netinet/ip.h"
 #if !defined(AFS_HPUX110_ENV) && !defined(AFS_LINUX22_ENV) && !defined(AFS_DARWIN60_ENV) && !defined(AFS_OBSD_ENV)
 #include "netinet/in_pcb.h"
@@ -95,21 +111,21 @@ 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/freezer.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 */
-#if !defined(AFS_LINUX22_ENV) && !defined(AFS_DUX40_ENV) 
+#if !defined(AFS_LINUX22_ENV) && !defined(AFS_DUX40_ENV)
 #include "rpc/types.h"
 #endif
 #include "afs/afs_osi.h"
@@ -121,7 +137,7 @@ struct coda_inode_info {};
 #include "afs/longc_procs.h"
 #include "afs/afs_stats.h"
 #include "h/errno.h"
-#if 0/*def KERNEL*/
+#ifdef KERNEL
 #include "afs/sysincludes.h"
 #include "afsincludes.h"
 #endif