Author: bz
Date: Sat Feb 11 05:59:54 2012
New Revision: 231504
URL: http://svn.freebsd.org/changeset/base/231504
Log:
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
Modified:
head/lib/libc/net/getifaddrs.c
head/sys/net/if.h
head/sys/net/rtsock.c
Modified: head/lib/libc/net/getifaddrs.c
==============================================================================
--- head/lib/libc/net/getifaddrs.c Sat Feb 11 04:12:12 2012 (r231503)
+++ head/lib/libc/net/getifaddrs.c Sat Feb 11 05:59:54 2012 (r231504)
@@ -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
Modified: head/sys/net/if.h
==============================================================================
--- head/sys/net/if.h Sat Feb 11 04:12:12 2012 (r231503)
+++ head/sys/net/if.h Sat Feb 11 05:59:54 2012 (r231504)
@@ -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 */
};
/*
Modified: head/sys/net/rtsock.c
==============================================================================
--- head/sys/net/rtsock.c Sat Feb 11 04:12:12 2012 (r231503)
+++ head/sys/net/rtsock.c Sat Feb 11 05:59:54 2012 (r231504)
@@ -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;