svn commit: r295831 - head/sys/dev/ixl

[Eric Joyner]

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 at 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);