From owner-svn-src-stable@freebsd.org  Thu Jan 14 14:19:05 2016
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@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 4DA0FA82731;
 Thu, 14 Jan 2016 14:19:05 +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 163F11FD0;
 Thu, 14 Jan 2016 14:19:05 +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 u0EEJ3dq020007;
 Thu, 14 Jan 2016 14:19:03 GMT (envelope-from arybchik@FreeBSD.org)
Received: (from arybchik@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0EEJ35l020006;
 Thu, 14 Jan 2016 14:19:03 GMT (envelope-from arybchik@FreeBSD.org)
Message-Id: <201601141419.u0EEJ35l020006@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:19:03 +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: r293930 - 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@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 14 Jan 2016 14:19:05 -0000

Author: arybchik
Date: Thu Jan 14 14:19:03 2016
New Revision: 293930
URL: https://svnweb.freebsd.org/changeset/base/293930

Log:
  MFC r291569
  
  sfxge: avoid TSO packets collapses if packet header uses 2 segments
  
  It is really observed in the case of VLAN over sfxge interface.
  Also this change makes total value equal to 35 which is default assumed
  by the kernel for if_hw_tsomaxsegcount.
  
  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:18:10 2016	(r293929)
+++ stable/10/sys/dev/sfxge/sfxge_tx.h	Thu Jan 14 14:19:03 2016	(r293930)
@@ -53,11 +53,13 @@
  * TSO, the mbuf length may be just over 64K, divided into 2K mbuf
  * clusters taking into account that the first may be not 2K cluster
  * boundary aligned.
+ * Packet header may be split into two segments because of, for example,
+ * VLAN header insertion.
  * 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)
+	(2 + howmany(SFXGE_TSO_MAX_SIZE, MCLBYTES) + 1)
 
 /*
  * Buffer mapping flags.