ifnet-flags-20060118

#define ifnet_flags to fix build on bsd

diff --git a/src/rx/UKERNEL/rx_kcommon.h b/src/rx/UKERNEL/rx_kcommon.h
index a30260f3310371f3f1ce8edd700ad6ad5890645c..4f29d240076d9bfa7f42ebcc9db36d113db951c7 100644 (file)
--- a/src/rx/UKERNEL/rx_kcommon.h
+++ b/src/rx/UKERNEL/rx_kcommon.h
@@ -36,6 +36,8 @@ typedef char *rxk_portRocks_t[MAXRXPORTS];
 extern rxk_ports_t rxk_ports;
 extern rxk_portRocks_t rxk_portRocks;
 
+#ifndef ifnet_flags
 #define ifnet_flags(x) (x?(x)->if_flags:0)
+#endif
 
 #endif /* _RX_KCOMMON_H_ */

diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c
index ab27366879deef37cf65980104b39fe0a77f78e5..f3a5f0b4edbf7db7cb47fcaa28594138faf32705 100644 (file)
--- a/src/rx/rx_kcommon.c
+++ b/src/rx/rx_kcommon.c
@@ -399,11 +399,7 @@ rxi_InitPeerParams(register struct rx_peer *pp)
        pp->ifMTU = RX_REMOTE_PACKET_SIZE;
     }
 #else /* AFS_USERSPACE_IP_ADDR */
-#ifdef AFS_DARWIN80_ENV
-    ifnet_t ifn;
-#else
-    struct ifnet *ifn;
-#endif
+    AFS_IFNET_T ifn;
 
 #if !defined(AFS_SGI62_ENV)
     if (numMyNetAddrs == 0)

diff --git a/src/rx/rx_kernel.h b/src/rx/rx_kernel.h
index d147e3b0ad55c825317e3f4f567edb69e0bb273f..79d7e753ae607a0d2c94eabda363d0483c5a4baf 100644 (file)
--- a/src/rx/rx_kernel.h
+++ b/src/rx/rx_kernel.h
@@ -48,6 +48,10 @@ extern int osi_utoa(char *buf, size_t len, unsigned long val);
 #define AFS_IFNET_T ifnet_t
 #endif
 
+#ifndef ifnet_flags
+#define ifnet_flags(x) (x?(x)->if_flags:0)
+#endif
+
 #include "afs/longc_procs.h"
 
 #endif /* __RX_KERNEL_INCL_ */