svn commit: r314829 - stable/10/sys/netinet6

[Andrey V. Elsukov]

Author: ae
Date: Tue Mar  7 03:53:09 2017
New Revision: 314829
URL: https://svnweb.freebsd.org/changeset/base/314829

Log:
  MFC r314430:
    When IPv6 fragments reassembly is complete, update mbuf's csum_data
    and csum_flags using information from all fragments. This fixes
    dropping of reassembled packets due to wrong checksum when the IPv6
    checksum offloading is enabled on a network card.

Modified:
  stable/10/sys/netinet6/frag6.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/netinet6/frag6.c
==============================================================================
--- stable/10/sys/netinet6/frag6.c	Tue Mar  7 03:35:50 2017	(r314828)
+++ stable/10/sys/netinet6/frag6.c	Tue Mar  7 03:53:09 2017	(r314829)
@@ -533,6 +533,11 @@ insert:
 	af6 = ip6af->ip6af_down;
 	frag6_deq(ip6af);
 	while (af6 != (struct ip6asfrag *)q6) {
+		m->m_pkthdr.csum_flags &=
+		    IP6_REASS_MBUF(af6)->m_pkthdr.csum_flags;
+		m->m_pkthdr.csum_data +=
+		    IP6_REASS_MBUF(af6)->m_pkthdr.csum_data;
+
 		af6dwn = af6->ip6af_down;
 		frag6_deq(af6);
 		while (t->m_next)
@@ -543,6 +548,10 @@ insert:
 		af6 = af6dwn;
 	}
 
+	while (m->m_pkthdr.csum_data & 0xffff0000)
+		m->m_pkthdr.csum_data = (m->m_pkthdr.csum_data & 0xffff) +
+		    (m->m_pkthdr.csum_data >> 16);
+
 	/* adjust offset to point where the original next header starts */
 	offset = ip6af->ip6af_offset - sizeof(struct ip6_frag);
 	free(ip6af, M_FTABLE);