svn commit: r261864 - stable/10/sys/dev/qlxgb

[David C Somayajulu]

Author: davidcs
Date: Fri Feb 14 02:48:14 2014
New Revision: 261864
URL: http://svnweb.freebsd.org/changeset/base/261864

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

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

Modified: stable/10/sys/dev/qlxgb/qla_hw.c
==============================================================================
--- stable/10/sys/dev/qlxgb/qla_hw.c	Fri Feb 14 01:47:12 2014	(r261863)
+++ stable/10/sys/dev/qlxgb/qla_hw.c	Fri Feb 14 02:48:14 2014	(r261864)
@@ -998,7 +998,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%b] > Q8_TX_MAX_SEGMENTS)\n",
 				__func__, nsegs, mp->m_pkthdr.len,

Modified: stable/10/sys/dev/qlxgb/qla_os.c
==============================================================================
--- stable/10/sys/dev/qlxgb/qla_os.c	Fri Feb 14 01:47:12 2014	(r261863)
+++ stable/10/sys/dev/qlxgb/qla_os.c	Fri Feb 14 02:48:14 2014	(r261864)
@@ -1063,10 +1063,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;