From owner-svn-src-all@FreeBSD.ORG  Sat Feb 11 05:59:55 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2DDD1106566C;
	Sat, 11 Feb 2012 05:59:55 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 02C388FC17;
	Sat, 11 Feb 2012 05:59:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q1B5xsHv015851;
	Sat, 11 Feb 2012 05:59:54 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q1B5xsae015847;
	Sat, 11 Feb 2012 05:59:54 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201202110559.q1B5xsae015847@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sat, 11 Feb 2012 05:59:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r231504 - in head: lib/libc/net sys/net
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 11 Feb 2012 05:59:55 -0000

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;