From owner-svn-src-user@FreeBSD.ORG  Fri Feb  8 03:37:51 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id EFBFFD40;
 Fri,  8 Feb 2013 03:37:51 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id D8FDA1AC;
 Fri,  8 Feb 2013 03:37:51 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r183bpqR024263;
 Fri, 8 Feb 2013 03:37:51 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r183bpsq024261;
 Fri, 8 Feb 2013 03:37:51 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201302080337.r183bpsq024261@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Fri, 8 Feb 2013 03:37:51 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r246528 - user/ae/inet6/sys/netinet6
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
 <mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 08 Feb 2013 03:37:52 -0000

Author: ae
Date: Fri Feb  8 03:37:51 2013
New Revision: 246528
URL: http://svnweb.freebsd.org/changeset/base/246528

Log:
  Reduce the size of ip6aux structure, just disable for now all unused
  and unimplemented fields. Replace the in6_ifaddr pointer to the in6_addr
  structure and add zone id field.

Modified:
  user/ae/inet6/sys/netinet6/ip6_var.h

Modified: user/ae/inet6/sys/netinet6/ip6_var.h
==============================================================================
--- user/ae/inet6/sys/netinet6/ip6_var.h	Fri Feb  8 01:30:08 2013	(r246527)
+++ user/ae/inet6/sys/netinet6/ip6_var.h	Fri Feb  8 03:37:51 2013	(r246528)
@@ -255,6 +255,7 @@ struct	ip6stat {
  * XXX do not make it a kitchen sink!
  */
 struct ip6aux {
+#if 0
 	u_int32_t ip6a_flags;
 #define IP6A_SWAP	0x01		/* swapped home/care-of on packet */
 #define IP6A_HASEEN	0x02		/* HA was present */
@@ -266,11 +267,12 @@ struct ip6aux {
 	struct in6_addr ip6a_home;	/* home address of the peer */
 	u_int16_t	ip6a_bruid;	/* BR unique identifier */
 
-	/* ip6.ip6_dst */
-	struct in6_ifaddr *ip6a_dstia6;	/* my ifaddr that matches ip6_dst */
-
 	/* rtalert */
 	u_int16_t ip6a_rtalert;		/* rtalert option value */
+#endif
+	/* ip6.ip6_dst */
+	struct in6_addr ip6a_dst;	/* address that matches ip6_dst */
+	uint32_t	ip6a_dstzone;	/* zone id */
 
 	/*
 	 * decapsulation history will be here.