From owner-svn-src-user@FreeBSD.ORG  Mon Sep 19 15:31:13 2011
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 25F48106566C;
	Mon, 19 Sep 2011 15:31:13 +0000 (UTC) (envelope-from hrs@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 171718FC16;
	Mon, 19 Sep 2011 15:31:13 +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 p8JFVCBZ085609;
	Mon, 19 Sep 2011 15:31:12 GMT (envelope-from hrs@svn.freebsd.org)
Received: (from hrs@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p8JFVCIZ085607;
	Mon, 19 Sep 2011 15:31:12 GMT (envelope-from hrs@svn.freebsd.org)
Message-Id: <201109191531.p8JFVCIZ085607@svn.freebsd.org>
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Mon, 19 Sep 2011 15:31:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r225668 - user/hrs/ipv6/sys/netinet6
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Mon, 19 Sep 2011 15:31:13 -0000

Author: hrs
Date: Mon Sep 19 15:31:12 2011
New Revision: 225668
URL: http://svn.freebsd.org/changeset/base/225668

Log:
  Copy ip6po_minmtu and ip6po_prefer_tempaddr in ip6_copypktopts().  This fixes
  inconsistency when options are specified by both setsockopt() and ancillary
  data types.
  
  PR:	kern/158307

Modified:
  user/hrs/ipv6/sys/netinet6/ip6_output.c

Modified: user/hrs/ipv6/sys/netinet6/ip6_output.c
==============================================================================
--- user/hrs/ipv6/sys/netinet6/ip6_output.c	Mon Sep 19 13:55:19 2011	(r225667)
+++ user/hrs/ipv6/sys/netinet6/ip6_output.c	Mon Sep 19 15:31:12 2011	(r225668)
@@ -2367,6 +2367,8 @@ copypktopts(struct ip6_pktopts *dst, str
 	dst->ip6po_hlim = src->ip6po_hlim;
 	dst->ip6po_tclass = src->ip6po_tclass;
 	dst->ip6po_flags = src->ip6po_flags;
+	dst->ip6po_minmtu = src->ip6po_minmtu;
+	dst->ip6po_prefer_tempaddr = src->ip6po_prefer_tempaddr;
 	if (src->ip6po_pktinfo) {
 		dst->ip6po_pktinfo = malloc(sizeof(*dst->ip6po_pktinfo),
 		    M_IP6OPT, canwait);