aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-5.15
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2022-06-27 09:02:15 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2022-07-03 20:25:38 +0200
commit90a63504230ed31303bf7978658ba5db74f54f84 (patch)
tree5efc89ac095831b39f8f35120065a35f8e7512d1 /target/linux/ramips/patches-5.15
parent06d0cc2fb365485dd1ddd32937afd5091fa4b8a8 (diff)
downloadupstream-90a63504230ed31303bf7978658ba5db74f54f84.tar.gz
upstream-90a63504230ed31303bf7978658ba5db74f54f84.tar.bz2
upstream-90a63504230ed31303bf7978658ba5db74f54f84.zip
kernel: bump 5.15 to 5.15.50
Patches automatically rebased. Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
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
-rw-r--r--target/linux/ramips/patches-5.15/840-serial-add-ugly-custom-baud-rate-hack.patch2
2 files changed, 3 insertions, 3 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 267d3d5dd6..f6ac8360ee 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
-@@ -3293,6 +3293,7 @@ static const struct net_device_ops mtk_n
+@@ -3290,6 +3290,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;
-@@ -3388,6 +3389,9 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -3385,6 +3386,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;
diff --git a/target/linux/ramips/patches-5.15/840-serial-add-ugly-custom-baud-rate-hack.patch b/target/linux/ramips/patches-5.15/840-serial-add-ugly-custom-baud-rate-hack.patch
index d7cf2dfd48..7148bb16f3 100644
--- a/target/linux/ramips/patches-5.15/840-serial-add-ugly-custom-baud-rate-hack.patch
+++ b/target/linux/ramips/patches-5.15/840-serial-add-ugly-custom-baud-rate-hack.patch
@@ -10,7 +10,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/tty/serial/serial_core.c
+++ b/drivers/tty/serial/serial_core.c
-@@ -401,6 +401,9 @@ uart_get_baud_rate(struct uart_port *por
+@@ -393,6 +393,9 @@ uart_get_baud_rate(struct uart_port *por
break;
}