aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-06-22 11:58:33 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-06-27 22:34:07 +0200
commitf2f03545d4d9f4df44300b95edfd340db1474501 (patch)
tree47c9aa7ac35b02f91510dee8872a00a7b6156a78 /target/linux/ramips
parent50db012243c107e69210341ba07ba6091e32106c (diff)
downloadupstream-f2f03545d4d9f4df44300b95edfd340db1474501.tar.gz
upstream-f2f03545d4d9f4df44300b95edfd340db1474501.tar.bz2
upstream-f2f03545d4d9f4df44300b95edfd340db1474501.zip
kernel: bump 5.10 to 5.10.124
All patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 9e5d743422edc4036cda7d96b96ba62705f382de)
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 8e9429ed18..f86daff7d6 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
-@@ -2958,6 +2958,7 @@ static const struct net_device_ops mtk_n
+@@ -2975,6 +2975,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;
-@@ -3053,6 +3054,9 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -3070,6 +3071,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;