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>
This commit is contained in:
Stijn Tintel
2017-09-03 09:34:10 +03:00
parent ef255fc57e
commit 046618f5da
8 changed files with 36 additions and 48 deletions

View File

@@ -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 */

View File

@@ -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;

View File

@@ -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;