From owner-svn-src-stable-10@FreeBSD.ORG  Tue Mar 31 08:05:30 2015
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 55B36118;
 Tue, 31 Mar 2015 08:05:30 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 402CCA42;
 Tue, 31 Mar 2015 08:05:30 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2V85UpV040590;
 Tue, 31 Mar 2015 08:05:30 GMT (envelope-from arybchik@FreeBSD.org)
Received: (from arybchik@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2V85UWX040589;
 Tue, 31 Mar 2015 08:05:30 GMT (envelope-from arybchik@FreeBSD.org)
Message-Id: <201503310805.t2V85UWX040589@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: arybchik set sender to
 arybchik@FreeBSD.org using -f
From: Andrew Rybchenko <arybchik@FreeBSD.org>
Date: Tue, 31 Mar 2015 08:05:30 +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: r280901 - 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.18-1
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: Tue, 31 Mar 2015 08:05:30 -0000

Author: arybchik
Date: Tue Mar 31 08:05:29 2015
New Revision: 280901
URL: https://svnweb.freebsd.org/changeset/base/280901

Log:
  MFC: r280807
  
  sfxge: fix bug in TSO when a DMA segment has both header and data
  
  Sponsored by:   Solarflare Communications, Inc.

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

Modified: stable/10/sys/dev/sfxge/sfxge_tx.c
==============================================================================
--- stable/10/sys/dev/sfxge/sfxge_tx.c	Tue Mar 31 08:00:20 2015	(r280900)
+++ stable/10/sys/dev/sfxge/sfxge_tx.c	Tue Mar 31 08:05:29 2015	(r280901)
@@ -1024,7 +1024,7 @@ sfxge_tx_queue_tso(struct sfxge_txq *txq
 		KASSERT(n_dma_seg, ("no payload found in TSO packet"));
 		++dma_seg;
 	}
-	tso.in_len = dma_seg->ds_len + (tso.header_len - skipped);
+	tso.in_len = dma_seg->ds_len - (tso.header_len - skipped);
 	tso.dma_addr = dma_seg->ds_addr + (tso.header_len - skipped);
 
 	id = txq->added & txq->ptr_mask;