Module Name: src Committed By: roy Date: Tue Jan 20 21:42:36 UTC 2015
Modified Files: src/sys/netinet6: ip6_output.c Log Message: Fix IPV6_USE_MIN_MTU set by setsockopt(2) being ignored when IPV6_PKTINFO is set as a control with sendmsg(2). To generate a diff of this commit: cvs rdiff -u -r1.161 -r1.162 src/sys/netinet6/ip6_output.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/netinet6/ip6_output.c diff -u src/sys/netinet6/ip6_output.c:1.161 src/sys/netinet6/ip6_output.c:1.162 --- src/sys/netinet6/ip6_output.c:1.161 Tue Jan 20 21:27:36 2015 +++ src/sys/netinet6/ip6_output.c Tue Jan 20 21:42:36 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: ip6_output.c,v 1.161 2015/01/20 21:27:36 roy Exp $ */ +/* $NetBSD: ip6_output.c,v 1.162 2015/01/20 21:42:36 roy Exp $ */ /* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */ /* @@ -62,7 +62,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.161 2015/01/20 21:27:36 roy Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip6_output.c,v 1.162 2015/01/20 21:42:36 roy Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -2214,6 +2214,7 @@ 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),