diff options
| author | Stijn Tintel <stijn@linux-ipv6.be> | 2017-09-28 10:08:59 +0300 |
|---|---|---|
| committer | Stijn Tintel <stijn@linux-ipv6.be> | 2017-10-08 16:31:58 +0300 |
| commit | 239dff6697b56f9589dd83bc0268635cc32c188c (patch) | |
| tree | 4788b9cc047ce55625116bd8987c1db6025dd115 /target/linux/mvebu/patches-4.9/420-net-mvneta-disable-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch | |
| parent | 9aeb7ce8dc53dc4a83f05b5bb707cb79e7959f66 (diff) | |
| download | upstream-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/420-net-mvneta-disable-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch')
| -rw-r--r-- | target/linux/mvebu/patches-4.9/420-net-mvneta-disable-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/mvebu/patches-4.9/420-net-mvneta-disable-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch b/target/linux/mvebu/patches-4.9/420-net-mvneta-disable-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch index c0abab57da..2558720261 100644 --- a/target/linux/mvebu/patches-4.9/420-net-mvneta-disable-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch +++ b/target/linux/mvebu/patches-4.9/420-net-mvneta-disable-MVNETA_CAUSE_PSC_SYNC_CHANGE-inte.patch @@ -26,7 +26,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> } /* Release Tx descriptors */ -@@ -2948,8 +2950,7 @@ static void mvneta_start_dev(struct mvne +@@ -2946,8 +2948,7 @@ static void mvneta_start_dev(struct mvne mvreg_write(pp, MVNETA_INTR_MISC_MASK, MVNETA_CAUSE_PHY_STATUS_CHANGE | @@ -36,7 +36,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> phylink_start(pp->phylink); netif_tx_start_all_queues(pp->dev); -@@ -3440,8 +3441,7 @@ static int mvneta_cpu_online(unsigned in +@@ -3438,8 +3439,7 @@ static int mvneta_cpu_online(unsigned in on_each_cpu(mvneta_percpu_unmask_interrupt, pp, true); mvreg_write(pp, MVNETA_INTR_MISC_MASK, MVNETA_CAUSE_PHY_STATUS_CHANGE | @@ -46,7 +46,7 @@ Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> netif_tx_start_all_queues(pp->dev); spin_unlock(&pp->lock); return 0; -@@ -3482,8 +3482,7 @@ static int mvneta_cpu_dead(unsigned int +@@ -3480,8 +3480,7 @@ static int mvneta_cpu_dead(unsigned int on_each_cpu(mvneta_percpu_unmask_interrupt, pp, true); mvreg_write(pp, MVNETA_INTR_MISC_MASK, MVNETA_CAUSE_PHY_STATUS_CHANGE | |