d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct frame length argument of in_cksum_skip. While I'm here

Browse Source 
remove intermediate variable csum.

Reported by:	Kim Culhan < w8hdkim <> gmail DOT com >
Tested by:	Kim Culhan < w8hdkim <> gmail DOT com >
This commit is contained in:
Pyun YongHyeon 2009-01-14 04:47:04 +00:00
parent 6fd63a5dbf
commit f9ad2b2f3c
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/msk/if_msk.c
View File

@ -2608,17 +2608,14 @@ msk_encap(struct msk_if_softc *sc_if, struct mbuf **m_head)
*/ */
if (m->m_pkthdr.len < MSK_MIN_FRAMELEN && if (m->m_pkthdr.len < MSK_MIN_FRAMELEN &&
(m->m_pkthdr.csum_flags & CSUM_TCP) != 0) { (m->m_pkthdr.csum_flags & CSUM_TCP) != 0) {
uint16_t csum;
m = m_pullup(m, offset + sizeof(struct tcphdr)); m = m_pullup(m, offset + sizeof(struct tcphdr));
if (m == NULL) { if (m == NULL) {
*m_head = NULL; *m_head = NULL;
return (ENOBUFS); return (ENOBUFS);
} }
csum = in_cksum_skip(m, ntohs(ip->ip_len) + offset -
(ip->ip_hl << 2), offset);
*(uint16_t *)(m->m_data + 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; m->m_pkthdr.csum_flags &= ~CSUM_TCP;
} }
if ((m->m_pkthdr.csum_flags & CSUM_TSO) != 0) { if ((m->m_pkthdr.csum_flags & CSUM_TSO) != 0) {