Author: davidcs
Date: Fri Feb 14 01:46:33 2014
New Revision: 261862
URL: http://svnweb.freebsd.org/changeset/base/261862

Log:
  MFC r261861
    check for defrag only when bus_dmamap_load_mbuf_sg() returns EFBIG. Comment 
in
    qla_hw_send is moot.

Modified:
  stable/9/sys/dev/qlxgb/qla_hw.c
  stable/9/sys/dev/qlxgb/qla_os.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/qlxgb/qla_hw.c
==============================================================================
--- stable/9/sys/dev/qlxgb/qla_hw.c     Fri Feb 14 01:02:06 2014        
(r261861)
+++ stable/9/sys/dev/qlxgb/qla_hw.c     Fri Feb 14 01:46:33 2014        
(r261862)
@@ -941,7 +941,6 @@ qla_hw_send(qla_host_t *ha, bus_dma_segm
        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%x] > 
Q8_TX_MAX_SEGMENTS)\n",
                                __func__, nsegs, mp->m_pkthdr.len,

Modified: stable/9/sys/dev/qlxgb/qla_os.c
==============================================================================
--- stable/9/sys/dev/qlxgb/qla_os.c     Fri Feb 14 01:02:06 2014        
(r261861)
+++ stable/9/sys/dev/qlxgb/qla_os.c     Fri Feb 14 01:46:33 2014        
(r261862)
@@ -1054,10 +1054,7 @@ qla_send(qla_host_t *ha, struct mbuf **m
        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;
 
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to