aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ramips/patches-5.15
diff options
context:
space:
mode:
authorRui Salvaterra <rsalvaterra@gmail.com>2022-06-20 10:50:45 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2022-06-27 00:57:16 +0200
commitb55efebb1fe99bae953adb8bd7743a61ffc40fb9 (patch)
treeab4b0ed6496aa7c1af5b18508618e67ad4bfa918 /target/linux/ramips/patches-5.15
parent251a382c28854ea68bd46483a58990eafbf671ca (diff)
downloadupstream-b55efebb1fe99bae953adb8bd7743a61ffc40fb9.tar.gz
upstream-b55efebb1fe99bae953adb8bd7743a61ffc40fb9.tar.bz2
upstream-b55efebb1fe99bae953adb8bd7743a61ffc40fb9.zip
kernel: bump 5.15 to 5.15.47
Deleted (upstreamed): generic/backport-5.15/702-v5.19-32-net-ethernet-mtk_eth_soc-out-of-bounds-read-in-mtk_h.patch [01] [01] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.47&id=b24ca1cf846273361d5bd73a35de95a486a54b6d Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> [Removed 702-v5.19-32-net-ethernet-mtk_eth_soc-out-of-bounds-read-in-mtk_h.patch] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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 954cd57b67..267d3d5dd6 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
-@@ -2968,6 +2968,7 @@ static const struct net_device_ops mtk_n
+@@ -3293,6 +3293,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;
-@@ -3063,6 +3064,9 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -3388,6 +3389,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;