aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-06-14 15:31:10 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-06-27 22:34:07 +0200
commit4faf889e7e07a743afd58164052ef1531bbb10ec (patch)
tree86dd744ceba6f319adb2f8c9fb78fc1e465b926b /target/linux/ramips
parent81530d69ef582124f9cc657edacdca9727e805f8 (diff)
downloadupstream-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/ramips')
-rw-r--r--target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch b/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch
index 7c19c50a1d..8e9429ed18 100644
--- a/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch
+++ b/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch
@@ -14,7 +14,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -2955,6 +2955,7 @@ static const struct net_device_ops mtk_n
+@@ -2958,6 +2958,7 @@ static const struct net_device_ops mtk_n
static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
{
@@ -22,7 +22,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com>
const __be32 *_id = of_get_property(np, "reg", NULL);
phy_interface_t phy_mode;
struct phylink *phylink;
-@@ -3050,6 +3051,9 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -3053,6 +3054,9 @@ static int mtk_add_mac(struct mtk_eth *e
else
eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH_2K - MTK_RX_ETH_HLEN;