Skip to contentSkip to conversation

ath11k: unlock on error path in ath11k_mac_op_add_interface()

PATCH In review Dan Carpenter 2 participants 3 messages Dec 7, 2020 – Dec 9, 2020

Subsystems (2)
Kernel janitors Qualcomm Atheros ATH11K wireless driver
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 ath11k: unlock on error path in ath11k_mac_op_add_interface()

These error paths need to drop the &ar->conf_mutex before returning.

Fixes 690ace20ff79 ("ath11k: peer delete synchronization with firmware")
Signed-off-by Dan Carpenter <[email protected]>
---
 drivers/net/wireless/ath/ath11k/mac.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/ath/ath11k/mac.c +2 -2
index ebed24ec7368..12cc16003e30 100644
@@ -4615,13 +4615,13 @@ static int ath11k_mac_op_add_interface(struct ieee80211_hw *hw,
 		if (ret) {
 			ath11k_warn(ar->ab, "failed to delete peer vdev_id %d addr %pM\n",
 				    arvif->vdev_id, vif->addr);
-			return ret;
+			goto err;
 		}
 
 		ret = ath11k_wait_for_peer_delete_done(ar, arvif->vdev_id,
 						       vif->addr);
 		if (ret)
-			return ret;
+			goto err;
 
 		ar->num_peers--;
 	}
Signature · 1 line
2.29.2
#1 lore raw
Quoted 5 lines · Dan Carpenter

These error paths need to drop the &ar->conf_mutex before returning.

Fixes 690ace20ff79 ("ath11k: peer delete synchronization with firmware")
Signed-off-by Dan Carpenter <[email protected]>
Signed-off-by Kalle Valo <[email protected]>

Patch applied to ath-next branch of ath.git, thanks.

59ec8e2fa5aa ath11k: unlock on error path in ath11k_mac_op_add_interface()

Signature · 3 lines
https://patchwork.kernel.org/project/linux-wireless/patch/X85sVGVP/0XvlrEJ@mwanda/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
#2 lore raw
In reply to Dan Carpenter
Quoted 5 lines · Dan Carpenter

These error paths need to drop the &ar->conf_mutex before returning.

Fixes 690ace20ff79 ("ath11k: peer delete synchronization with firmware")
Signed-off-by Dan Carpenter <[email protected]>
Signed-off-by Kalle Valo <[email protected]>

Patch applied to ath-next branch of ath.git, thanks.

59ec8e2fa5aa ath11k: unlock on error path in ath11k_mac_op_add_interface()

Signature · 9 lines
https://patchwork.kernel.org/project/linux-wireless/patch/X85sVGVP/0XvlrEJ@mwanda/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


-- 
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k