diff options
author | bz <bz@FreeBSD.org> | 2012-02-11 05:59:54 +0000 |
---|---|---|
committer | bz <bz@FreeBSD.org> | 2012-02-11 05:59:54 +0000 |
commit | f55d6eed8c8bfbbc9c0a4422abfe0567efed9473 (patch) | |
tree | 31c9286c1859204a15bd6941b586633aed97f150 | |
parent | 508a5a2b93601f03c1e67b2967406d34fff08e7d (diff) | |
download | FreeBSD-src-f55d6eed8c8bfbbc9c0a4422abfe0567efed9473.zip FreeBSD-src-f55d6eed8c8bfbbc9c0a4422abfe0567efed9473.tar.gz |
Backout changes from r228571. Remove if_data from struct ifa_msghdr again.
While this breaks carp on HEAD temporary, it restores the upgrade path from
stable, and head before 20111215.
Reviewed by: glebius, brooks
-rw-r--r-- | lib/libc/net/getifaddrs.c | 2 | ||||
-rw-r--r-- | sys/net/if.h | 2 | ||||
-rw-r--r-- | sys/net/rtsock.c | 4 |
3 files changed, 1 insertions, 7 deletions
diff --git a/lib/libc/net/getifaddrs.c b/lib/libc/net/getifaddrs.c index aada929..41ef3f4 100644 --- a/lib/libc/net/getifaddrs.c +++ b/lib/libc/net/getifaddrs.c @@ -76,7 +76,7 @@ __FBSDID("$FreeBSD$"); #define HAVE_IFM_DATA #endif -#if (_BSDI_VERSION >= 199802) || (__FreeBSD_version >= 1000003) +#if _BSDI_VERSION >= 199802 /* ifam_data is very specific to recent versions of bsdi */ #define HAVE_IFAM_DATA #endif diff --git a/sys/net/if.h b/sys/net/if.h index e17dac2..a5c0ade 100644 --- a/sys/net/if.h +++ b/sys/net/if.h @@ -267,8 +267,6 @@ struct ifa_msghdr { int ifam_flags; /* value of ifa_flags */ u_short ifam_index; /* index for associated ifp */ int ifam_metric; /* value of ifa_metric */ - struct if_data ifam_data;/* statistics and other data about if or - * address */ }; /* diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 4da2e1b..b594e9a 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -1606,10 +1606,6 @@ sysctl_iflist(int af, struct walkarg *w) ifam->ifam_flags = ifa->ifa_flags; ifam->ifam_metric = ifa->ifa_metric; ifam->ifam_addrs = info.rti_addrs; - ifam->ifam_data = ifa->if_data; - if (carp_get_vhid_p != NULL) - ifam->ifam_data.ifi_vhid = - (*carp_get_vhid_p)(ifa); error = SYSCTL_OUT(w->w_req, w->w_tmem, len); if (error) goto done; |