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>
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
From 3ef07434c7dbfba302df477bb6c70e082965f232 Mon Sep 17 00:00:00 2001
|
|
From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
|
|
Date: Sat, 5 Jul 2025 10:34:32 +0200
|
|
Subject: [PATCH] net: airoha: Fix an error handling path in airoha_probe()
|
|
|
|
If an error occurs after a successful airoha_hw_init() call,
|
|
airoha_ppe_deinit() needs to be called as already done in the remove
|
|
function.
|
|
|
|
Fixes: 00a7678310fe ("net: airoha: Introduce flowtable offload support")
|
|
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
|
|
Reviewed-by: Simon Horman <horms@kernel.org>
|
|
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Link: https://patch.msgid.link/1c940851b4fa3c3ed2a142910c821493a136f121.1746715755.git.christophe.jaillet@wanadoo.fr
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/airoha/airoha_eth.c | 1 +
|
|
1 file changed, 1 insertion(+)
|
|
|
|
--- a/drivers/net/ethernet/airoha/airoha_eth.c
|
|
+++ b/drivers/net/ethernet/airoha/airoha_eth.c
|
|
@@ -3060,6 +3060,7 @@ static int airoha_probe(struct platform_
|
|
error_napi_stop:
|
|
for (i = 0; i < ARRAY_SIZE(eth->qdma); i++)
|
|
airoha_qdma_stop_napi(ð->qdma[i]);
|
|
+ airoha_ppe_deinit(eth);
|
|
error_hw_cleanup:
|
|
for (i = 0; i < ARRAY_SIZE(eth->qdma); i++)
|
|
airoha_hw_cleanup(ð->qdma[i]);
|