aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-03-18 15:05:11 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-03-20 22:44:28 +0100
commit3ca98495897126113912f7ee4537f69459d21332 (patch)
treeeba265d7abe52371910f16444cd1d54b1d9c6e43 /target/linux/ramips
parent72d9d2b923b389f09e2ba43f4aba22c068e6cbb7 (diff)
downloadupstream-3ca98495897126113912f7ee4537f69459d21332.tar.gz
upstream-3ca98495897126113912f7ee4537f69459d21332.tar.bz2
upstream-3ca98495897126113912f7ee4537f69459d21332.zip
kernel: bump 5.10 to 5.10.175
Manually rebased: backport-5.10/611-v5.12-net-ethernet-mediatek-support-setting-MTU.patch Removed upstreamed: bcm47xx/patches-5.10/170-bgmac-fix-initial-chip-reset-to-support-BCM5358.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.175&id=cbf11ff3708ff163387da924f80a47ce7c721e9b Signed-off-by: John Audia <therealgraysky@proton.me>
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 8eeecfc259..0b3dc00e54 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
-@@ -2979,6 +2979,7 @@ static const struct net_device_ops mtk_n
+@@ -2980,6 +2980,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;
-@@ -3074,6 +3075,9 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -3075,6 +3076,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;