svn commit: r232560 - stable/8/sys/netinet6
Hiroki Sato
hrs at FreeBSD.org
Mon Mar 5 18:40:54 UTC 2012
Author: hrs
Date: Mon Mar 5 18:40:53 2012
New Revision: 232560
URL: http://svn.freebsd.org/changeset/base/232560
Log:
MFC r225682:
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:
stable/8/sys/netinet6/ip6_output.c
Directory Properties:
stable/8/sys/ (props changed)
Modified: stable/8/sys/netinet6/ip6_output.c
==============================================================================
--- stable/8/sys/netinet6/ip6_output.c Mon Mar 5 18:20:31 2012 (r232559)
+++ stable/8/sys/netinet6/ip6_output.c Mon Mar 5 18:40:53 2012 (r232560)
@@ -2328,6 +2328,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);
More information about the svn-src-all
mailing list