From owner-svn-src-stable@FreeBSD.ORG  Fri Feb 14 02:48:14 2014
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E14B7C24;
 Fri, 14 Feb 2014 02:48:14 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id CC3F110D2;
 Fri, 14 Feb 2014 02:48:14 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1E2mEgM093298;
 Fri, 14 Feb 2014 02:48:14 GMT (envelope-from davidcs@svn.freebsd.org)
Received: (from davidcs@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1E2mE1V093295;
 Fri, 14 Feb 2014 02:48:14 GMT (envelope-from davidcs@svn.freebsd.org)
Message-Id: <201402140248.s1E2mE1V093295@svn.freebsd.org>
From: David C Somayajulu <davidcs@FreeBSD.org>
Date: Fri, 14 Feb 2014 02:48:14 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r261864 - stable/10/sys/dev/qlxgb
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 14 Feb 2014 02:48:15 -0000

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;