summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-09-06 23:44:29 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2014-09-07 01:03:08 +0200
commit011cc648536b0d9da11a1a7cce794fc1c405e880 (patch)
treeba314bac85cf68272f5e9240af0d133e5768105f
parentf5bb5aabe1569a398e70b1adb22f62f2c6642de5 (diff)
backports: remove usage of skbuff->xmit_more
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>
-rw-r--r--patches/collateral-evolutions/network/0048-no_ndo_xmit_flush/igb.patch14
1 files changed, 14 insertions, 0 deletions
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 00000000..f3ed217c
--- /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