aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-5.10
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-05-10 18:32:52 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2022-05-18 00:16:11 +0200
commite90f74feb6a84c470c562ef60f47cee67d3d5af3 (patch)
tree84b8eb208b334eed39058a87f93209acefa5a15a /target/linux/ramips/patches-5.10
parent95c315f2001213b80c868f021df806adea236cb2 (diff)
downloadupstream-e90f74feb6a84c470c562ef60f47cee67d3d5af3.tar.gz
upstream-e90f74feb6a84c470c562ef60f47cee67d3d5af3.tar.bz2
upstream-e90f74feb6a84c470c562ef60f47cee67d3d5af3.zip
kernel: bump 5.10 to 5.10.116
Removed upstreamed: generic/backport-5.10/900-regulator-consumer-Add-missing-stubs-to-regulator-co.patch All other patches automatically rebased. Compile-tested: lantiq/xrx200, armvirt/64 Run-tested: lantiq/xrx200, armvirt/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/ramips/patches-5.10')
-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 65b61e7720..7c19c50a1d 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
-@@ -2949,6 +2949,7 @@ static const struct net_device_ops mtk_n
+@@ -2955,6 +2955,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;
-@@ -3044,6 +3045,9 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -3050,6 +3051,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;