aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-5.15
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-02-06 06:40:12 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2023-02-08 00:21:28 +0100
commit64cf31f6ff5b35bc1bc6e4c87779a3a6c60b7103 (patch)
treeaf571528915d1390cc140499c45508cb7a3247e8 /target/linux/ramips/patches-5.15
parentd53ec2943a7a0615a0beb89d8392ffb30569538b (diff)
downloadupstream-64cf31f6ff5b35bc1bc6e4c87779a3a6c60b7103.tar.gz
upstream-64cf31f6ff5b35bc1bc6e4c87779a3a6c60b7103.tar.bz2
upstream-64cf31f6ff5b35bc1bc6e4c87779a3a6c60b7103.zip
kernel: bump 5.15 to 5.15.92
All other patches automatically rebased. Build system: x86_64 Build-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod Run-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/ramips/patches-5.15')
-rw-r--r--target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch b/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch
index e1335c8ebc..29aba20e97 100644
--- a/target/linux/ramips/patches-5.15/700-net-ethernet-mediatek-support-net-labels.patch
+++ b/target/linux/ramips/patches-5.15/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
-@@ -3998,6 +3998,7 @@ static const struct net_device_ops mtk_n
+@@ -4227,6 +4227,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;
-@@ -4126,6 +4127,9 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -4355,6 +4356,9 @@ static int mtk_add_mac(struct mtk_eth *e
register_netdevice_notifier(&mac->device_notifier);
}