From owner-svn-src-all@FreeBSD.ORG  Sun Jan  8 17:11:54 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 42FC1106566B;
	Sun,  8 Jan 2012 17:11:54 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 2D9378FC08;
	Sun,  8 Jan 2012 17:11:54 +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 q08HBsYQ099299;
	Sun, 8 Jan 2012 17:11:54 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q08HBrsB099297;
	Sun, 8 Jan 2012 17:11:53 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201201081711.q08HBrsB099297@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Sun, 8 Jan 2012 17:11:53 +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: r229814 - head/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: Sun, 08 Jan 2012 17:11:54 -0000

Author: glebius
Date: Sun Jan  8 17:11:53 2012
New Revision: 229814
URL: http://svn.freebsd.org/changeset/base/229814

Log:
  Copy ifa->if_data to ifam->ifam_data. This was forgotten in r228571.
  
  Submitted by:	bz

Modified:
  head/sys/net/rtsock.c

Modified: head/sys/net/rtsock.c
==============================================================================
--- head/sys/net/rtsock.c	Sun Jan  8 16:47:37 2012	(r229813)
+++ head/sys/net/rtsock.c	Sun Jan  8 17:11:53 2012	(r229814)
@@ -1606,6 +1606,7 @@ 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);