From: Ben Kaduk Date: Thu, 26 May 2011 05:11:14 +0000 (-0400) Subject: FBSD: VIMAGE support X-Git-Tag: upstream/1.6.0.pre6^2~3 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=0adfb78e70d6afb3eb55ca0c73017a35023f279f;p=packages%2Fo%2Fopenafs.git FBSD: VIMAGE support Starting in FreeBSD 8.0, there is support for multiple virtual network stacks (generally to be exposed to separate jail(8) environments). It is enabled as a kernel configuration option, so our builds against GENERIC have not failed, but we fail to build when options VIMAGE is present. Fix our variable references accordingly. Submitted-by: Hiroki Sato of freebsd.org Reviewed-on: http://gerrit.openafs.org/4721 Reviewed-by: Derrick Brashear Tested-by: BuildBot (cherry picked from commit 9703b023cc0f5088eab5135acf7417e90ebbb2cd) Change-Id: I058ed4fd637f205701e5aab4d88d65386097f9c0 Reviewed-on: http://gerrit.openafs.org/4724 Tested-by: BuildBot Reviewed-by: Derrick Brashear --- diff --git a/src/afs/afs_server.c b/src/afs/afs_server.c index 840ed7d8e..049829627 100644 --- a/src/afs/afs_server.c +++ b/src/afs/afs_server.c @@ -1556,7 +1556,11 @@ afs_SetServerPrefs(struct srvAddr *sa) #elif defined(AFS_FBSD_ENV) { struct in_ifaddr *ifa; +#if defined(AFS_FBSD80_ENV) + TAILQ_FOREACH(ifa, &V_in_ifaddrhead, ia_link) { +#else TAILQ_FOREACH(ifa, &in_ifaddrhead, ia_link) { +#endif afsi_SetServerIPRank(sa, ifa); }} #elif defined(AFS_OBSD_ENV) diff --git a/src/rx/rx_kcommon.c b/src/rx/rx_kcommon.c index a30341c9f..94f8bb6d5 100644 --- a/src/rx/rx_kcommon.c +++ b/src/rx/rx_kcommon.c @@ -669,7 +669,11 @@ rxi_GetIFInfo(void) } #else #if defined(AFS_DARWIN_ENV) || defined(AFS_FBSD_ENV) +#if defined(AFS_FBSD80_ENV) + TAILQ_FOREACH(ifn, &V_ifnet, if_link) { +#else TAILQ_FOREACH(ifn, &ifnet, if_link) { +#endif if (i >= ADDRSPERSITE) break; #elif defined(AFS_OBSD_ENV) || defined(AFS_NBSD_ENV)