aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/sunxi
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/sunxi
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/sunxi')
-rw-r--r--target/linux/sunxi/patches-4.9/0051-stmmac-form-4-11.patch9
1 files changed, 0 insertions, 9 deletions
diff --git a/target/linux/sunxi/patches-4.9/0051-stmmac-form-4-11.patch b/target/linux/sunxi/patches-4.9/0051-stmmac-form-4-11.patch
index f3b4262307..abd1304485 100644
--- a/target/linux/sunxi/patches-4.9/0051-stmmac-form-4-11.patch
+++ b/target/linux/sunxi/patches-4.9/0051-stmmac-form-4-11.patch
@@ -1736,15 +1736,6 @@
* (preallocated during init) then the packet is
* ignored
*/
-@@ -2669,7 +2667,7 @@ static int stmmac_poll(struct napi_struc
-
- work_done = stmmac_rx(priv, budget);
- if (work_done < budget) {
-- napi_complete(napi);
-+ napi_complete_done(napi, work_done);
- stmmac_enable_dma_irq(priv);
- }
- return work_done;
@@ -2762,7 +2760,7 @@ static netdev_features_t stmmac_fix_feat
/* Some GMAC devices have a bugged Jumbo frame support that
* needs to have the Tx COE disabled for oversized frames