STABLE14-obsd39-20060531

pull up changes for OpenBSD 3.8/3.9 to 1.4.x branch

diff --git a/src/rx/rx_kernel.h b/src/rx/rx_kernel.h
index d147e3b0ad55c825317e3f4f567edb69e0bb273f..3bb6d7d35c4a230b38449ba04f31a9835c9e056f 100644 (file)
--- a/src/rx/rx_kernel.h
+++ b/src/rx/rx_kernel.h
@@ -43,6 +43,7 @@ extern int osi_utoa(char *buf, size_t len, unsigned long val);
 
 #ifndef AFS_DARWIN80_ENV
 #define ifnet_mtu(x) (x)->if_mtu
+#define ifnet_flags(x) (x?(x)->if_flags:0)
 #define AFS_IFNET_T struct ifnet *
 #else
 #define AFS_IFNET_T ifnet_t

diff --git a/src/rx/xdr_rx.c b/src/rx/xdr_rx.c
index dbeb6f5ef7df9dc47d6bb19a93f6da0b0d21fb58..fe79fbd161ae3a11fe0a7d100fc830f7e451d8a3 100644 (file)
--- a/src/rx/xdr_rx.c
+++ b/src/rx/xdr_rx.c
@@ -22,6 +22,7 @@ RCSID
     ("$Header$");
 
 #ifdef KERNEL
+#include "afs/sysincludes.h"
 #ifndef UKERNEL
 #include "h/types.h"
 #include "h/uio.h"
@@ -49,7 +50,6 @@ RCSID
 #include "rx/xdr.h"
 #include "netinet/in.h"
 #else /* !UKERNEL */
-#include "afs/sysincludes.h"
 #include "rpc/types.h"
 #include "rpc/xdr.h"
 #endif /* !UKERNEL */