Revert "wifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue()"

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>

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 34f229a6eab01db5ab2994c03a915925666d73c4..20179db88c4a6c88e49617204b16840b6a36556b 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -3894,7 +3894,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);