summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorerj <erj@FreeBSD.org>2016-02-19 22:48:20 +0000
committererj <erj@FreeBSD.org>2016-02-19 22:48:20 +0000
commit7a33cbc5f75355b9aacc299db55706229c9da4af (patch)
treee25112dd0c0789eb9d47af03fd95ab6b379fd684
parentd95a4ea06f131ab46a3df83286440dc01b20d85d (diff)
downloadFreeBSD-src-7a33cbc5f75355b9aacc299db55706229c9da4af.zip
FreeBSD-src-7a33cbc5f75355b9aacc299db55706229c9da4af.tar.gz
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
-rw-r--r--sys/dev/ixl/ixl_txrx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/dev/ixl/ixl_txrx.c b/sys/dev/ixl/ixl_txrx.c
index 43a1949..e78af11 100644
--- a/sys/dev/ixl/ixl_txrx.c
+++ b/sys/dev/ixl/ixl_txrx.c
@@ -286,7 +286,7 @@ ixl_xmit(struct ixl_queue *que, struct mbuf **m_headp)
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);
OpenPOWER on IntegriCloud