[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-backports
Subject:    [PATCH 3/4] backports: remove usage of skbuff->xmit_more
From:       Hauke Mehrtens <hauke () hauke-m ! de>
Date:       2014-09-06 23:23:36
Message-ID: 1410045817-4112-4-git-send-email-hauke () hauke-m ! de
[Download RAW message or body]

This is a revet of these two upstream commits:
commit c1ebf46c1f72fe542853fc00f059a7d15259379d
Author: David S. Miller <davem@davemloft.net>
Date:   Fri Aug 22 17:24:49 2014 -0700

    igb: Support netdev_ops->ndo_xmit_flush()

commit 0b725a2ca61bedc33a2a63d0451d528b268cf975
Author: David S. Miller <davem@davemloft.net>
Date:   Mon Aug 25 15:51:53 2014 -0700

    net: Remove ndo_xmit_flush netdev operation, use signalling instead.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../network/0048-no_ndo_xmit_flush/igb.patch               | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 patches/collateral-evolutions/network/0048-no_ndo_xmit_flush/igb.patch


diff --git a/patches/collateral-evolutions/network/0048-no_ndo_xmit_flush/igb.patch \
b/patches/collateral-evolutions/network/0048-no_ndo_xmit_flush/igb.patch new file \
mode 100644 index 0000000..f3ed217
--- /dev/null
+++ b/patches/collateral-evolutions/network/0048-no_ndo_xmit_flush/igb.patch
@@ -0,0 +1,14 @@
+--- a/drivers/net/ethernet/intel/igb/igb_main.c
++++ b/drivers/net/ethernet/intel/igb/igb_main.c
+@@ -4982,7 +4982,10 @@ static void igb_tx_map(struct igb_ring *
+ 	/* Make sure there is space in the ring for the next send. */
+ 	igb_maybe_stop_tx(tx_ring, DESC_NEEDED);
+ 
+-	if (netif_xmit_stopped(txring_txq(tx_ring)) || !skb->xmit_more) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
++	if (netif_xmit_stopped(txring_txq(tx_ring)) || !skb->xmit_more)
++#endif
++	{
+ 		writel(i, tx_ring->tail);
+ 
+ 		/* we need this if more than one processor can write to our tail
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[prev in list] [next in list] [prev in thread] [next in thread]