diff options
| author | jfv <jfv@FreeBSD.org> | 2010-11-01 20:19:25 +0000 |
|---|---|---|
| committer | jfv <jfv@FreeBSD.org> | 2010-11-01 20:19:25 +0000 |
| commit | a4ab528826d1ac9cc9de0ba3fead29d68b978e3e (patch) | |
| tree | cbc2856488d5cba69f4f2bc4f0921e4e8502f757 /sys/dev/e1000/if_em.c | |
| parent | e0a2a85d3a72725ab12bf363f472b29193ad6aaa (diff) | |
| download | FreeBSD-src-a4ab528826d1ac9cc9de0ba3fead29d68b978e3e.zip FreeBSD-src-a4ab528826d1ac9cc9de0ba3fead29d68b978e3e.tar.gz | |
Sync the lem code up with the vlan and other fixes in em.
Delete a unneeded test from the beginning of em_xmit.
CRITICAL: shared code fix for 82574, a mutex might not be
released, this can cause hangs.
Diffstat (limited to 'sys/dev/e1000/if_em.c')
| -rw-r--r-- | sys/dev/e1000/if_em.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 1ce3956..c41e144 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -1766,19 +1766,6 @@ em_xmit(struct tx_ring *txr, struct mbuf **m_headp) ip_off = poff = 0; /* - ** When doing checksum offload, it is critical to - ** make sure the first mbuf has more than header, - ** because that routine expects data to be present. - */ - if ((m_head->m_pkthdr.csum_flags & CSUM_OFFLOAD) && - (m_head->m_len < ETHER_HDR_LEN + sizeof(struct ip))) { - m_head = m_pullup(m_head, ETHER_HDR_LEN + sizeof(struct ip)); - *m_headp = m_head; - if (m_head == NULL) - return (ENOBUFS); - } - - /* * Intel recommends entire IP/TCP header length reside in a single * buffer. If multiple descriptors are used to describe the IP and * TCP header, each descriptor should describe one or more |
