From owner-svn-src-all@freebsd.org  Fri Feb 19 22:48:21 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 EBDE8AA9AA3;
 Fri, 19 Feb 2016 22:48:21 +0000 (UTC) (envelope-from erj@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 BB7A31022;
 Fri, 19 Feb 2016 22:48:21 +0000 (UTC) (envelope-from erj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1JMmK0o066569;
 Fri, 19 Feb 2016 22:48:20 GMT (envelope-from erj@FreeBSD.org)
Received: (from erj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1JMmK4W066568;
 Fri, 19 Feb 2016 22:48:20 GMT (envelope-from erj@FreeBSD.org)
Message-Id: <201602192248.u1JMmK4W066568@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: erj set sender to erj@FreeBSD.org
 using -f
From: Eric Joyner <erj@FreeBSD.org>
Date: Fri, 19 Feb 2016 22:48:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295831 - head/sys/dev/ixl
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 19 Feb 2016 22:48:22 -0000

Author: erj
Date: Fri Feb 19 22:48:20 2016
New Revision: 295831
URL: https://svnweb.freebsd.org/changeset/base/295831

Log:
  ixl(4)/ixlv(4): Revert m_collapse() in ixl_xmit() to m_defrag().
  
  The m_collapse() call would fail when transmitting medium-sized packets
  when the interface mtu was set to 9000, so revert back to m_defrag(),
  which does not fail.
  
  Differential Revision:	https://reviews.freebsd.org/D5207
  Tested by:	jeffrey.e.pieper@intel.com
  Sponsored by:	Intel Corporation

Modified:
  head/sys/dev/ixl/ixl_txrx.c

Modified: head/sys/dev/ixl/ixl_txrx.c
==============================================================================
--- head/sys/dev/ixl/ixl_txrx.c	Fri Feb 19 22:46:52 2016	(r295830)
+++ head/sys/dev/ixl/ixl_txrx.c	Fri Feb 19 22:48:20 2016	(r295831)
@@ -286,7 +286,7 @@ ixl_xmit(struct ixl_queue *que, struct m
 	if (error == EFBIG) {
 		struct mbuf *m;
 
-		m = m_collapse(*m_headp, M_NOWAIT, maxsegs);
+		m = m_defrag(*m_headp, M_NOWAIT);
 		if (m == NULL) {
 			que->mbuf_defrag_failed++;
 			m_freem(*m_headp);