svn commit: r232634 - releng/8.3/sys/netinet6

[Hiroki Sato]

Author: hrs
Date: Wed Mar  7 01:30:42 2012
New Revision: 232634
URL: http://svn.freebsd.org/changeset/base/232634

Log:
  MFS r232560:
  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
  Approved by:	re (kib)

Modified:
  releng/8.3/sys/netinet6/ip6_output.c
Directory Properties:
  releng/8.3/sys/   (props changed)

Modified: releng/8.3/sys/netinet6/ip6_output.c
==============================================================================
--- releng/8.3/sys/netinet6/ip6_output.c	Wed Mar  7 01:26:24 2012	(r232633)
+++ releng/8.3/sys/netinet6/ip6_output.c	Wed Mar  7 01:30:42 2012	(r232634)
@@ -2310,6 +2310,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);