diff options
author | John Audia <therealgraysky@proton.me> | 2022-06-14 15:31:10 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-06-27 22:34:07 +0200 |
commit | 4faf889e7e07a743afd58164052ef1531bbb10ec (patch) | |
tree | 86dd744ceba6f319adb2f8c9fb78fc1e465b926b /target/linux/generic/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch | |
parent | 81530d69ef582124f9cc657edacdca9727e805f8 (diff) | |
download | upstream-4faf889e7e07a743afd58164052ef1531bbb10ec.tar.gz upstream-4faf889e7e07a743afd58164052ef1531bbb10ec.tar.bz2 upstream-4faf889e7e07a743afd58164052ef1531bbb10ec.zip |
kernel: bump 5.10 to 5.10.122
All patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit 9edc514e3dafcc36db69046a37daab818cfc1a07)
Diffstat (limited to 'target/linux/generic/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch')
-rw-r--r-- | target/linux/generic/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch b/target/linux/generic/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch index 4fd6f8a36b..9abe293dee 100644 --- a/target/linux/generic/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch +++ b/target/linux/generic/backport-5.10/610-v5.13-32-net-ethernet-mtk_eth_soc-add-support-for-initializin.patch @@ -27,7 +27,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> obj-$(CONFIG_NET_MEDIATEK_STAR_EMAC) += mtk_star_emac.o --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -2279,12 +2279,17 @@ static int mtk_open(struct net_device *d +@@ -2282,12 +2282,17 @@ static int mtk_open(struct net_device *d /* we run 2 netdevs on the same dma ring so we only bring it up once */ if (!refcount_read(ð->dma_refcnt)) { @@ -47,7 +47,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> napi_enable(ð->tx_napi); napi_enable(ð->rx_napi); -@@ -2351,6 +2356,9 @@ static int mtk_stop(struct net_device *d +@@ -2354,6 +2359,9 @@ static int mtk_stop(struct net_device *d mtk_dma_free(eth); @@ -57,7 +57,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> return 0; } -@@ -3079,6 +3087,13 @@ static int mtk_probe(struct platform_dev +@@ -3082,6 +3090,13 @@ static int mtk_probe(struct platform_dev goto err_free_dev; } @@ -71,7 +71,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> for (i = 0; i < MTK_MAX_DEVS; i++) { if (!eth->netdev[i]) continue; -@@ -3153,6 +3168,7 @@ static const struct mtk_soc_data mt7621_ +@@ -3156,6 +3171,7 @@ static const struct mtk_soc_data mt7621_ .hw_features = MTK_HW_FEATURES, .required_clks = MT7621_CLKS_BITMAP, .required_pctl = false, @@ -79,7 +79,7 @@ Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> }; static const struct mtk_soc_data mt7622_data = { -@@ -3161,6 +3177,7 @@ static const struct mtk_soc_data mt7622_ +@@ -3164,6 +3180,7 @@ static const struct mtk_soc_data mt7622_ .hw_features = MTK_HW_FEATURES, .required_clks = MT7622_CLKS_BITMAP, .required_pctl = false, |