aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHiroki Sato <hrs@FreeBSD.org>2012-03-07 01:30:42 +0000
committerHiroki Sato <hrs@FreeBSD.org>2012-03-07 01:30:42 +0000
commitdb8848df2ac7acf36b23c4710333f07774017cdf (patch)
tree7c4291932c67304e3f31ff46485a031777edf4b9
parentaf1793377ca36f3e4fbfc3fa2d4fcad828b69f1b (diff)
downloadsrc-db8848df2ac7acf36b23c4710333f07774017cdf.tar.gz
src-db8848df2ac7acf36b23c4710333f07774017cdf.zip
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)
Notes
Notes: svn path=/releng/8.3/; revision=232634
-rw-r--r--sys/netinet6/ip6_output.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 6565bf0df384..85c78726fd54 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -2310,6 +2310,8 @@ copypktopts(struct ip6_pktopts *dst, struct ip6_pktopts *src, int canwait)
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);