From: Jim Rees <rees@umich.edu>
Date: Wed, 18 Jan 2006 16:03:28 +0000 (+0000)
Subject: ifnet-flags-20060118
X-Git-Tag: openafs-devel-1_5_0~92
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=f59f69ea9f99dec429a966ac22e19647a02b2870;p=packages%2Fo%2Fopenafs.git

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 a30260f33..4f29d2400 100644
--- 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 ab2736687..f3a5f0b4e 100644
--- 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 d147e3b0a..79d7e753a 100644
--- 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_ */