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 <spasswolf@web.de>
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 <johannes.berg@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index f8d72f3e4def869f9be3f649265b5c8e7c1e17f9..461cff7b94ad765a1c8f2d70b7bcd15e7c05e4ba 100644 (file)
--- 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);