aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-4.9/120-net-mvneta-add-BQL-support.patch
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2017-09-28 10:08:59 +0300
committerStijn Tintel <stijn@linux-ipv6.be>2017-10-08 16:31:58 +0300
commit239dff6697b56f9589dd83bc0268635cc32c188c (patch)
tree4788b9cc047ce55625116bd8987c1db6025dd115 /target/linux/mvebu/patches-4.9/120-net-mvneta-add-BQL-support.patch
parent9aeb7ce8dc53dc4a83f05b5bb707cb79e7959f66 (diff)
downloadupstream-239dff6697b56f9589dd83bc0268635cc32c188c.tar.gz
upstream-239dff6697b56f9589dd83bc0268635cc32c188c.tar.bz2
upstream-239dff6697b56f9589dd83bc0268635cc32c188c.zip
kernel: update and refresh patches
The lantiq patch 0028-NET-lantiq-various-etop-fixes.patch and sunxi patch 0051-stmmac-form-4-11.patch no longer applied after applying the the "generalize napi_complete_done()" patch. Update them so they apply, and refresh patches while at it. Fixes: 9aeb7ce8dc5 ("generic: net: generalize napi_complete_done") Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/mvebu/patches-4.9/120-net-mvneta-add-BQL-support.patch')
-rw-r--r--target/linux/mvebu/patches-4.9/120-net-mvneta-add-BQL-support.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/mvebu/patches-4.9/120-net-mvneta-add-BQL-support.patch b/target/linux/mvebu/patches-4.9/120-net-mvneta-add-BQL-support.patch
index 0b822f3863..5fedc8e8ab 100644
--- a/target/linux/mvebu/patches-4.9/120-net-mvneta-add-BQL-support.patch
+++ b/target/linux/mvebu/patches-4.9/120-net-mvneta-add-BQL-support.patch
@@ -63,7 +63,7 @@
/* reset txq */
txq->count = 0;
-@@ -2882,6 +2894,8 @@ static int mvneta_txq_init(struct mvneta
+@@ -2880,6 +2892,8 @@ static int mvneta_txq_init(struct mvneta
static void mvneta_txq_deinit(struct mvneta_port *pp,
struct mvneta_tx_queue *txq)
{
@@ -72,7 +72,7 @@
kfree(txq->tx_skb);
if (txq->tso_hdrs)
-@@ -2893,6 +2907,8 @@ static void mvneta_txq_deinit(struct mvn
+@@ -2891,6 +2905,8 @@ static void mvneta_txq_deinit(struct mvn
txq->size * MVNETA_DESC_ALIGNED_SIZE,
txq->descs, txq->descs_phys);