summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authoryongari <yongari@FreeBSD.org>2014-05-16 05:05:53 +0000
committeryongari <yongari@FreeBSD.org>2014-05-16 05:05:53 +0000
commit9c37e888605a9aae80118829cfbba1c1c5793a36 (patch)
treede8fff4db0adfa9f28128a9a1f4832f113cb7613 /sys
parent979d09322879c661433d370b8f8f44881d70ea2f (diff)
downloadFreeBSD-src-9c37e888605a9aae80118829cfbba1c1c5793a36.zip
FreeBSD-src-9c37e888605a9aae80118829cfbba1c1c5793a36.tar.gz
MFC r265942:
Fix checksum computation. Previously it didn't include carry.
Diffstat (limited to 'sys')
-rw-r--r--sys/netinet/ip_input.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 26b9dfa..dea8bee 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1085,8 +1085,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);
OpenPOWER on IntegriCloud