svn commit: r265942 - head/sys/netinet

Pyun YongHyeon yongari at FreeBSD.org
Tue May 13 05:07:03 UTC 2014


Author: yongari
Date: Tue May 13 05:07:03 2014
New Revision: 265942
URL: http://svnweb.freebsd.org/changeset/base/265942

Log:
  Fix checksum computation.  Previously it didn't include carry.
  
  Reviewed by:	tuexen

Modified:
  head/sys/netinet/ip_input.c

Modified: head/sys/netinet/ip_input.c
==============================================================================
--- head/sys/netinet/ip_input.c	Mon May 12 23:35:10 2014	(r265941)
+++ head/sys/netinet/ip_input.c	Tue May 13 05:07:03 2014	(r265942)
@@ -1080,8 +1080,9 @@ found:
 	 * (and not in for{} loop), though it implies we are not going to
 	 * reassemble more than 64k fragments.
 	 */
-	m->m_pkthdr.csum_data =
-	    (m->m_pkthdr.csum_data & 0xffff) + (m->m_pkthdr.csum_data >> 16);
+	while (m->m_pkthdr.csum_data & 0xffff0000)
+		m->m_pkthdr.csum_data = (m->m_pkthdr.csum_data & 0xffff) +
+		    (m->m_pkthdr.csum_data >> 16);
 #ifdef MAC
 	mac_ipq_reassemble(fp, m);
 	mac_ipq_destroy(fp);


More information about the svn-src-all mailing list