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

2 files changed, 0 insertions, 6 deletions

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;