From: Johannes Berg Date: Fri, 11 Apr 2025 14:13:34 +0000 (+0200) Subject: Revert "wifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue()" X-Git-Tag: v5.4.293~88 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d00e4cf33aa74bbe91c25abec56c61032f96d95d;p=thirdparty%2Fkernel%2Fstable.git Revert "wifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue()" [ Upstream commit 0937cb5f345c79d702b4d0d744e2a2529b551cb2 ] This reverts commit a104042e2bf6528199adb6ca901efe7b60c2c27f. Since the original bug seems to have been around for years, but a new issue was report with the fix, revert the fix for now. We have a couple of weeks to figure it out for this release, if needed. Reported-by: Bert Karwatzki Closes: https://lore.kernel.org/linux-wireless/20250410215527.3001-1-spasswolf@web.de Fixes: a104042e2bf6 ("wifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue()") Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index f8d72f3e4def8..461cff7b94ad7 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3661,7 +3661,6 @@ begin: * The key can be removed while the packet was queued, so need to call * this here to get the current key. */ - info->control.hw_key = NULL; r = ieee80211_tx_h_select_key(&tx); if (r != TX_CONTINUE) { ieee80211_free_txskb(&local->hw, skb);