Setting the IPV6_MINMTU flag in the call to ip6_output() was moved

from icmp6_reflect() to ip6_send_dispatch() when ip6_send() was
introduced.  Move the comment that explains this flag also to the
place where it is used.
from sashan@

2 files changed, 9 insertions, 8 deletions

diff --git a/sys/netinet6/icmp6.c b/sys/netinet6/icmp6.c
index 3becc223313..bf8567c330c 100644
--- a/sys/netinet6/icmp6.c
+++ b/sys/netinet6/icmp6.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icmp6.c,v 1.217 2017/10/09 08:35:38 mpi Exp $	*/
+/*	$OpenBSD: icmp6.c,v 1.218 2017/10/18 13:16:35 bluhm Exp $	*/
 /*	$KAME: icmp6.c,v 1.217 2001/06/20 15:03:29 jinmei Exp $	*/
 
 /*
@@ -1162,12 +1162,6 @@ icmp6_reflect(struct mbuf *m, size_t off)
 
 	m->m_flags &= ~(M_BCAST|M_MCAST);
 
-	/*
-	 * To avoid a "too big" situation at an intermediate router
-	 * and the path MTU discovery process, specify the IPV6_MINMTU flag.
-	 * Note that only echo and node information replies are affected,
-	 * since the length of ICMP6 errors is limited to the minimum MTU.
-	 */
 #if NPF > 0
 	pf_pkt_addr_changed(m);
 #endif
diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c
index 4e588d83394..3c4b64563ab 100644
--- a/sys/netinet6/ip6_input.c
+++ b/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ip6_input.c,v 1.203 2017/10/09 08:35:38 mpi Exp $	*/
+/*	$OpenBSD: ip6_input.c,v 1.204 2017/10/18 13:16:35 bluhm Exp $	*/
 /*	$KAME: ip6_input.c,v 1.188 2001/03/29 05:34:31 itojun Exp $	*/
 
 /*
@@ -1481,6 +1481,13 @@ ip6_send_dispatch(void *xmq)
 #endif /* IPSEC */
 
 	while ((m = ml_dequeue(&ml)) != NULL) {
+		/*
+		 * To avoid a "too big" situation at an intermediate router and
+		 * the path MTU discovery process, specify the IPV6_MINMTU
+		 * flag.  Note that only echo and node information replies are
+		 * affected, since the length of ICMP6 errors is limited to the
+		 * minimum MTU.
+		 */
 		ip6_output(m, NULL, NULL, IPV6_MINMTU, NULL, NULL);
 	}
 	NET_UNLOCK();