From owner-svn-src-stable-10@freebsd.org  Thu Jan 14 14:17:06 2016
Return-Path: <owner-svn-src-stable-10@freebsd.org>
Delivered-To: svn-src-stable-10@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 92D65A825BC;
 Thu, 14 Jan 2016 14:17:06 +0000 (UTC)
 (envelope-from arybchik@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 615601CED;
 Thu, 14 Jan 2016 14:17:06 +0000 (UTC)
 (envelope-from arybchik@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0EEH58l019775;
 Thu, 14 Jan 2016 14:17:05 GMT (envelope-from arybchik@FreeBSD.org)
Received: (from arybchik@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0EEH5il019774;
 Thu, 14 Jan 2016 14:17:05 GMT (envelope-from arybchik@FreeBSD.org)
Message-Id: <201601141417.u0EEH5il019774@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: arybchik set sender to
 arybchik@FreeBSD.org using -f
From: Andrew Rybchenko <arybchik@FreeBSD.org>
Date: Thu, 14 Jan 2016 14:17:05 +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: r293928 - stable/10/sys/dev/sfxge
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-10@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
 <svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>, 
 <mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jan 2016 14:17:06 -0000

Author: arybchik
Date: Thu Jan 14 14:17:05 2016
New Revision: 293928
URL: https://svnweb.freebsd.org/changeset/base/293928

Log:
  MFC r291488
  
  sfxge: avoid TSO packets collapses bacause of not 2K aligned data
  
  Sponsored by:   Solarflare Communications, Inc.

Modified:
  stable/10/sys/dev/sfxge/sfxge_tx.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/sfxge_tx.h
==============================================================================
--- stable/10/sys/dev/sfxge/sfxge_tx.h	Thu Jan 14 14:16:26 2016	(r293927)
+++ stable/10/sys/dev/sfxge/sfxge_tx.h	Thu Jan 14 14:17:05 2016	(r293928)
@@ -51,11 +51,13 @@
 
 /* Maximum number of DMA segments needed to map an mbuf chain.  With
  * TSO, the mbuf length may be just over 64K, divided into 2K mbuf
- * clusters.  (The chain could be longer than this initially, but can
- * be shortened with m_collapse().)
+ * clusters taking into account that the first may be not 2K cluster
+ * boundary aligned.
+ * The chain could be longer than this initially, but can be shortened
+ * with m_collapse().
  */
 #define	SFXGE_TX_MAPPING_MAX_SEG					\
-	(1 + howmany(SFXGE_TSO_MAX_SIZE, MCLBYTES))
+	(1 + howmany(SFXGE_TSO_MAX_SIZE, MCLBYTES) + 1)
 
 /*
  * Buffer mapping flags.