From 69a2082f0a339f341d2590948c4d8e3a6301e87e Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Fri, 5 Oct 2007 23:18:35 +0000 Subject: [PATCH] DEVEL15-sol10-abstraction-20071005 abstract things as needed (cherry picked from commit e4adbbc79b016b3fa4e83ad0e261a4c47aad55a5) --- src/afs/SOLARIS/osi_machdep.h | 23 +++++++++++------------ src/rx/rx_kcommon.h | 4 ++++ src/rx/rx_prototypes.h | 4 ++-- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/afs/SOLARIS/osi_machdep.h b/src/afs/SOLARIS/osi_machdep.h index 2974f3188..fe50f501c 100644 --- a/src/afs/SOLARIS/osi_machdep.h +++ b/src/afs/SOLARIS/osi_machdep.h @@ -105,23 +105,22 @@ extern kmutex_t afs_global_lock; #endif #if defined(AFS_SUN510_ENV) -#include -#include +#include "h/sunddi.h" extern ddi_taskq_t *afs_taskq; extern krwlock_t afsifinfo_lock; +/* this should be in rx/SOLARIS/rx_knet.c accessed via accessor functions, + eventually */ +#include "net/if.h" /* Global interface info struct */ struct afs_ifinfo { - char ifname[LIFNAMSIZ]; - ipaddr_t ipaddr; - ipaddr_t netmask; - uint_t mtu; - uint64_t flags; - int metric; - ipaddr_t dstaddr; + char ifname[LIFNAMSIZ]; + ipaddr_t ipaddr; + ipaddr_t netmask; + uint_t mtu; + uint64_t flags; + int metric; + ipaddr_t dstaddr; }; - -extern struct afs_ifinfo afsifinfo[ADDRSPERSITE]; #endif - #endif /* _OSI_MACHDEP_H_ */ diff --git a/src/rx/rx_kcommon.h b/src/rx/rx_kcommon.h index 4b4d2a302..717f47753 100644 --- a/src/rx/rx_kcommon.h +++ b/src/rx/rx_kcommon.h @@ -158,6 +158,10 @@ extern rxk_portRocks_t rxk_portRocks; extern struct domain inetdomain; #endif /* AFS_XBSD_ENV */ +#if defined(AFS_SUN510_ENV) +extern struct afs_ifinfo afsifinfo[ADDRSPERSITE]; +#endif + #endif /* _RX_KCOMMON_H_ */ #endif diff --git a/src/rx/rx_prototypes.h b/src/rx/rx_prototypes.h index 11aa8a4c3..1e45fbb52 100644 --- a/src/rx/rx_prototypes.h +++ b/src/rx/rx_prototypes.h @@ -380,7 +380,6 @@ extern struct ifnet *rxi_FindIfnet(afs_uint32 addr, afs_uint32 * maskp); #endif extern void osi_StopListener(void); - /* ARCH/rx_kmutex.c */ #if defined(KERNEL) && defined(AFS_LINUX20_ENV) extern void afs_mutex_init(afs_kmutex_t * l); @@ -402,9 +401,10 @@ extern int osi_NetSend(osi_socket asocket, struct sockaddr_in *addr, #endif extern int osi_NetReceive(osi_socket so, struct sockaddr_in *addr, struct iovec *dvec, int nvecs, int *lengthp); -#if defined(AFS_SUN510_ENV) +#if defined(KERNEL) && defined(AFS_SUN510_ENV) extern void osi_StartNetIfPoller(void); extern void osi_NetIfPoller(void); +extern struct afs_ifinfo afsifinfo[ADDRSPERSITE]; #endif extern void osi_StopListener(void); extern int rxi_FindIfMTU(afs_uint32 addr); -- 2.39.5