aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mediatek/patches-4.9
diff options
context:
space:
mode:
authorStijn Tintel <stijn@linux-ipv6.be>2017-09-03 09:34:10 +0300
committerStijn Tintel <stijn@linux-ipv6.be>2017-09-03 22:06:28 +0300
commit046618f5da1c94f085de8504fcfc26ee858ddde4 (patch)
treec6395dd03fff70ea89459bdf6d096167dab380d0 /target/linux/mediatek/patches-4.9
parentef255fc57ece1415b2a81346dde7d8ee3a32dee7 (diff)
downloadupstream-046618f5da1c94f085de8504fcfc26ee858ddde4.tar.gz
upstream-046618f5da1c94f085de8504fcfc26ee858ddde4.tar.bz2
upstream-046618f5da1c94f085de8504fcfc26ee858ddde4.zip
kernel: update 4.9 to 4.9.47
Refresh patches. Compile-tested on ramips/mt7621 and x86/64. Runtime-tested on ramips/mt7621 and x86/64. Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
Diffstat (limited to 'target/linux/mediatek/patches-4.9')
-rw-r--r--target/linux/mediatek/patches-4.9/0059-eth-fixes.patch12
-rw-r--r--target/linux/mediatek/patches-4.9/0060-eth-debug.patch12
-rw-r--r--target/linux/mediatek/patches-4.9/0061-eth-up_down_lock.patch12
3 files changed, 12 insertions, 24 deletions
diff --git a/target/linux/mediatek/patches-4.9/0059-eth-fixes.patch b/target/linux/mediatek/patches-4.9/0059-eth-fixes.patch
index 4991c52d36..c155961862 100644
--- a/target/linux/mediatek/patches-4.9/0059-eth-fixes.patch
+++ b/target/linux/mediatek/patches-4.9/0059-eth-fixes.patch
@@ -1,7 +1,5 @@
-Index: linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-===================================================================
---- linux-4.9.44.orig/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-+++ linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -24,6 +24,7 @@
#include <linux/tcp.h>
@@ -402,10 +400,8 @@ Index: linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.c
eth->netdev[id]->netdev_ops = &mtk_netdev_ops;
eth->netdev[id]->base_addr = (unsigned long)eth->base;
-Index: linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-===================================================================
---- linux-4.9.44.orig/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-+++ linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
@@ -80,7 +80,6 @@
/* CDMP Ingress Control Register */
diff --git a/target/linux/mediatek/patches-4.9/0060-eth-debug.patch b/target/linux/mediatek/patches-4.9/0060-eth-debug.patch
index fb36ddf380..902a72ed8e 100644
--- a/target/linux/mediatek/patches-4.9/0060-eth-debug.patch
+++ b/target/linux/mediatek/patches-4.9/0060-eth-debug.patch
@@ -1,7 +1,5 @@
-Index: linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-===================================================================
---- linux-4.9.44.orig/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-+++ linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -851,6 +851,7 @@ static void mtk_stop_queue(struct mtk_et
continue;
netif_stop_queue(eth->netdev[i]);
@@ -58,10 +56,8 @@ Index: linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.c
eth->netdev[id]->netdev_ops = &mtk_netdev_ops;
eth->netdev[id]->base_addr = (unsigned long)eth->base;
-Index: linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-===================================================================
---- linux-4.9.44.orig/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-+++ linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
@@ -601,6 +601,8 @@ struct mtk_eth {
struct mii_bus *mii_bus;
struct work_struct pending_work;
diff --git a/target/linux/mediatek/patches-4.9/0061-eth-up_down_lock.patch b/target/linux/mediatek/patches-4.9/0061-eth-up_down_lock.patch
index 20f10a337a..e6f1cf69d6 100644
--- a/target/linux/mediatek/patches-4.9/0061-eth-up_down_lock.patch
+++ b/target/linux/mediatek/patches-4.9/0061-eth-up_down_lock.patch
@@ -1,7 +1,5 @@
-Index: linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-===================================================================
---- linux-4.9.44.orig/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-+++ linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -1904,12 +1904,16 @@ static int mtk_open(struct net_device *d
struct mtk_mac *mac = netdev_priv(dev);
struct mtk_eth *eth = mac->hw;
@@ -62,10 +60,8 @@ Index: linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.c
spin_lock_init(&eth->page_lock);
spin_lock_init(&eth->tx_irq_lock);
spin_lock_init(&eth->rx_irq_lock);
-Index: linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-===================================================================
---- linux-4.9.44.orig/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-+++ linux-4.9.44/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
++++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
@@ -573,6 +573,7 @@ struct mtk_rx_ring {
struct mtk_eth {
struct device *dev;