diff options
| author | Andre Oppermann <andre@FreeBSD.org> | 2006-09-29 13:54:04 +0000 |
|---|---|---|
| committer | Andre Oppermann <andre@FreeBSD.org> | 2006-09-29 13:54:04 +0000 |
| commit | bb2690b33020b948f271b5b45785b9984cf7e2a1 (patch) | |
| tree | fdd5dace40734988721ea46e7daf6683d7411599 /sys/dev/em | |
| parent | 7a6e967aa0f927f0e7854385e8153a722f64dba7 (diff) | |
Notes
Diffstat (limited to 'sys/dev/em')
| -rw-r--r-- | sys/dev/em/if_em.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c index e9ff547641f10..08c92c1d43219 100644 --- a/sys/dev/em/if_em.c +++ b/sys/dev/em/if_em.c @@ -834,7 +834,7 @@ em_ioctl(struct ifnet *ifp, u_long command, caddr_t data) ifp->if_mtu = ifr->ifr_mtu; adapter->hw.max_frame_size = - ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN; + ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN; em_init_locked(adapter); EM_UNLOCK(adapter); break; @@ -1476,8 +1476,8 @@ em_encap(struct adapter *adapter, struct mbuf **m_headp) /* * TSO workaround: - * If an mbuf is only header we need - * to pull 4 bytes of data into it. + * If an mbuf contains only the IP and TCP header we have + * to pull 4 bytes of data into it. */ if (do_tso && (m_head->m_len <= M_TSO_LEN)) { m_head = m_pullup(m_head, M_TSO_LEN + 4); @@ -1688,7 +1688,9 @@ em_encap(struct adapter *adapter, struct mbuf **m_headp) */ bus_dmamap_sync(adapter->txdma.dma_tag, adapter->txdma.dma_map, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); - if (adapter->hw.mac_type == em_82547 && adapter->link_duplex == HALF_DUPLEX) + + if (adapter->hw.mac_type == em_82547 && + adapter->link_duplex == HALF_DUPLEX) em_82547_move_tail_locked(adapter); else { E1000_WRITE_REG(&adapter->hw, TDT, i); |