diff options
| author | davidcs <davidcs@FreeBSD.org> | 2014-02-14 02:48:14 +0000 |
|---|---|---|
| committer | davidcs <davidcs@FreeBSD.org> | 2014-02-14 02:48:14 +0000 |
| commit | be70101ca8ddfb1dcfb9a915b3a47e6521fcdec1 (patch) | |
| tree | ae928f3427c5bb261b428af996aad4619c28ef82 /sys/dev/qlxgb | |
| parent | 183f607e237c5367d344c0656c13ae412f828cb8 (diff) | |
| download | FreeBSD-src-be70101ca8ddfb1dcfb9a915b3a47e6521fcdec1.zip FreeBSD-src-be70101ca8ddfb1dcfb9a915b3a47e6521fcdec1.tar.gz | |
MFC 261861
check for defrag only when bus_dmamap_load_mbuf_sg() returns EFBIG. Comment in
qla_hw_send is moot.
Diffstat (limited to 'sys/dev/qlxgb')
| -rw-r--r-- | sys/dev/qlxgb/qla_hw.c | 1 | ||||
| -rw-r--r-- | sys/dev/qlxgb/qla_os.c | 5 |
2 files changed, 1 insertions, 5 deletions
diff --git a/sys/dev/qlxgb/qla_hw.c b/sys/dev/qlxgb/qla_hw.c index ea20b63..e9c635d 100644 --- a/sys/dev/qlxgb/qla_hw.c +++ b/sys/dev/qlxgb/qla_hw.c @@ -998,7 +998,6 @@ qla_hw_send(qla_host_t *ha, bus_dma_segment_t *segs, int nsegs, if (hdr_len == 0) { if ((nsegs > Q8_TX_MAX_SEGMENTS) || (mp->m_pkthdr.len > ha->max_frame_size)){ - /* TBD: copy into private buffer and send it */ device_printf(dev, "%s: (nsegs[%d, %d, 0x%b] > Q8_TX_MAX_SEGMENTS)\n", __func__, nsegs, mp->m_pkthdr.len, diff --git a/sys/dev/qlxgb/qla_os.c b/sys/dev/qlxgb/qla_os.c index a9472bf..6c57e3d 100644 --- a/sys/dev/qlxgb/qla_os.c +++ b/sys/dev/qlxgb/qla_os.c @@ -1063,10 +1063,7 @@ qla_send(qla_host_t *ha, struct mbuf **m_headp) ret = bus_dmamap_load_mbuf_sg(ha->tx_tag, map, m_head, segs, &nsegs, BUS_DMA_NOWAIT); - if ((ret == EFBIG) || - ((nsegs > Q8_TX_MAX_SEGMENTS) && - (((m_head->m_pkthdr.csum_flags & CSUM_TSO) == 0) || - (m_head->m_pkthdr.len <= ha->max_frame_size)))) { + if (ret == EFBIG) { struct mbuf *m; |
