Author: yongari
Date: Wed Jan 14 04:47:04 2009
New Revision: 187207
URL: http://svn.freebsd.org/changeset/base/187207
Log:
Correct frame length argument of in_cksum_skip. While I'm here
remove intermediate variable csum.
Reported by: Kim Culhan < w8hdkim <> gmail DOT com >
Tested by: Kim Culhan < w8hdkim <> gmail DOT com >
Modified:
head/sys/dev/msk/if_msk.c
Modified: head/sys/dev/msk/if_msk.c
==============================================================================
--- head/sys/dev/msk/if_msk.c Wed Jan 14 01:35:08 2009 (r187206)
+++ head/sys/dev/msk/if_msk.c Wed Jan 14 04:47:04 2009 (r187207)
@@ -2608,17 +2608,14 @@ msk_encap(struct msk_if_softc *sc_if, st
*/
if (m->m_pkthdr.len < MSK_MIN_FRAMELEN &&
(m->m_pkthdr.csum_flags & CSUM_TCP) != 0) {
- uint16_t csum;
-
m = m_pullup(m, offset + sizeof(struct tcphdr));
if (m == NULL) {
*m_head = NULL;
return (ENOBUFS);
}
- csum = in_cksum_skip(m, ntohs(ip->ip_len) + offset -
- (ip->ip_hl << 2), offset);
*(uint16_t *)(m->m_data + offset +
- m->m_pkthdr.csum_data) = csum;
+ m->m_pkthdr.csum_data) = in_cksum_skip(m,
+ m->m_pkthdr.len, offset);
m->m_pkthdr.csum_flags &= ~CSUM_TCP;
}
if ((m->m_pkthdr.csum_flags & CSUM_TSO) != 0) {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
