aboutsummaryrefslogtreecommitdiff
path: root/sys/dev/ixl/ixl_txrx.c
diff options
context:
space:
mode:
authorEric Joyner <erj@FreeBSD.org>2016-05-12 18:18:55 +0000
committerEric Joyner <erj@FreeBSD.org>2016-05-12 18:18:55 +0000
commitac83ea833d494a651c3fa807c90675b724a78c19 (patch)
treed5eab245e3761a8856554d0c9dcc805571cab5ca /sys/dev/ixl/ixl_txrx.c
parent3934bc5561de24ea02938e73890c309e67ccac5f (diff)
downloadsrc-ac83ea833d494a651c3fa807c90675b724a78c19.tar.gz
src-ac83ea833d494a651c3fa807c90675b724a78c19.zip
ixl: Update to 1.4.5-k.
This first update will revert some upstream changes; forthcoming updates will reinstate them. Changes, by author: Anjali Singhai Jain i40e-shared: Add WB_ON_ITR offload support Shannon Nelson i40e-shared: fix phy_types bitmap type Kevin Scott i40e-shared: Store off PHY capabilities Shannon Nelson i40e-shared: fix byteswap of phy_type Jingjing Wu i40e-shared: Fix compile issue related to const string Greg Bowers i40e-shared: Add AQ defines for non-willing Apps (DCB) Greg Bowers i40e-shared: Support for non-willing Apps (DCB) Shannon Nelson i40e-shared: use upper-32 bit macro for address Shannon Nelson i40e-shared: grab the AQ spinlocks before clearing registers Eric Joyner ixl: Properly strip out X722_SUPPORT (temporarily). Eric Joyner ixl: Allow Fort Pond devices to advertise 100M in set_advertise sysctl. Differential Revision: https://reviews.freebsd.org/D6211 Reviewed by: sbruno, kmacy, jeffrey.e.pieper@intel.com MFC after: 2 weeks Sponsored by: Intel Corporation
Notes
Notes: svn path=/head/; revision=299545
Diffstat (limited to 'sys/dev/ixl/ixl_txrx.c')
-rw-r--r--sys/dev/ixl/ixl_txrx.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/dev/ixl/ixl_txrx.c b/sys/dev/ixl/ixl_txrx.c
index ca6e252b3fea..68e867e8f464 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_defrag(*m_headp, M_NOWAIT);
+ m = m_collapse(*m_headp, M_NOWAIT, maxsegs);
if (m == NULL) {
que->mbuf_defrag_failed++;
m_freem(*m_headp);
@@ -390,6 +390,7 @@ ixl_xmit(struct ixl_queue *que, struct mbuf **m_headp)
++txr->total_packets;
wr32(hw, txr->tail, i);
+ ixl_flush(hw);
/* Mark outstanding work */
if (que->busy == 0)
que->busy = 1;