mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 14:50:15 +04:00
John Audia
b00d26376e
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.81
Removed upstreamed:
ramips/patches-6.12/100-mips-ralink-update-CPU-clock-index.patch[1]
airoha/patches-6.12/135-v7.1-net-airoha-Add-missing-cleanup-bits-in-airoha_qdma_c.patch[2]
Manually rebased:
airoha/patches-6.12/048-01-v6.15-net-airoha-Move-airoha_eth-driver-in-a-dedicated-fol.patch
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.81&id=e8fd60338545f4bc9c23d3d4686c88324aa76fb8
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.81&id=cce5027f9dc3a333ccbcd59a2c3ab2906bd08d30
Signed-off-by: John Audia <therealgraysky@proton.me>
Link: https://github.com/openwrt/openwrt/pull/22913
[Modify airoha move patch]
(cherry picked from commit 8d827ccc93)
Link: https://github.com/openwrt/openwrt/pull/23162
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From c59783780c8ad66f6076a9a7c74df3e006e29519 Mon Sep 17 00:00:00 2001
|
|
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
|
|
Date: Sat, 24 May 2025 09:29:11 +0200
|
|
Subject: [PATCH] net: airoha: Fix an error handling path in
|
|
airoha_alloc_gdm_port()
|
|
|
|
If register_netdev() fails, the error handling path of the probe will not
|
|
free the memory allocated by the previous airoha_metadata_dst_alloc() call
|
|
because port->dev->reg_state will not be NETREG_REGISTERED.
|
|
|
|
So, an explicit airoha_metadata_dst_free() call is needed in this case to
|
|
avoid a memory leak.
|
|
|
|
Fixes: af3cf757d5c9 ("net: airoha: Move DSA tag in DMA descriptor")
|
|
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
|
|
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Link: https://patch.msgid.link/1b94b91345017429ed653e2f05d25620dc2823f9.1746715755.git.christophe.jaillet@wanadoo.fr
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 10 +++++++++-
|
|
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -2896,7 +2896,15 @@ static int airoha_alloc_gdm_port(struct
|
|
if (err)
|
|
return err;
|
|
|
|
- return register_netdev(dev);
|
|
+ err = register_netdev(dev);
|
|
+ if (err)
|
|
+ goto free_metadata_dst;
|
|
+
|
|
+ return 0;
|
|
+
|
|
+free_metadata_dst:
|
|
+ airoha_metadata_dst_free(port);
|
|
+ return err;
|
|
}
|
|
|
|
static int airoha_probe(struct platform_device *pdev)
|