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

In the data setup code for doing offloads the

Browse Source 
ip and tcp pointers were not reset after some
pullups. In practice this led to an NFS mount
failure when using UDP reported by Kevin Lo,
thanks Kevin. Fix from yongari, thank you!
This commit is contained in:
jfv 2010-10-28 00:16:54 +00:00
parent e7b4c436b0
commit 4457d701ab
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/e1000/if_em.c
View File

@ -93,7 +93,7 @@ int em_display_debug_stats = 0;
/*********************************************************************
* Driver version:
*********************************************************************/
char em_driver_version[] = "7.1.6";
char em_driver_version[] = "7.1.7";
/*********************************************************************
* PCI Device ID Table
@ -1848,6 +1848,7 @@ em_xmit(struct tx_ring *txr, struct mbuf **m_headp)
*m_headp = NULL;
return (ENOBUFS);
}
ip = (struct ip *)(mtod(m_head, char *) + ip_off);
ip->ip_len = 0;
ip->ip_sum = 0;
/*
@ -1856,6 +1857,7 @@ em_xmit(struct tx_ring *txr, struct mbuf **m_headp)
* what hardware expect to see. This is adherence of
* Microsoft's Large Send specification.
*/
tp = (struct tcphdr *)(mtod(m_head, char *) + poff);
tp->th_sum = in_pseudo(ip->ip_src.s_addr,
ip->ip_dst.s_addr, htons(IPPROTO_TCP));
} else if (m_head->m_pkthdr.csum_flags & CSUM_TCP) {
@ -1865,12 +1867,15 @@ em_xmit(struct tx_ring *txr, struct mbuf **m_headp)
*m_headp = NULL;
return (ENOBUFS);
}
ip = (struct ip *)(mtod(m_head, char *) + ip_off);
tp = (struct tcphdr *)(mtod(m_head, char *) + poff);
} else if (m_head->m_pkthdr.csum_flags & CSUM_UDP) {
m_head = m_pullup(m_head, poff + sizeof(struct udphdr));
if (m_head == NULL) {
*m_headp = NULL;
return (ENOBUFS);
}
ip = (struct ip *)(mtod(m_head, char *) + ip_off);
}
*m_headp = m_head;
}