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

[ Upstream commit 754fe848b3b297fc85ec24cd959bad22b6df8cb8 ]

This reverts commit 0937cb5f345c ("Revert "wifi: mac80211: Update
skb's control block key in ieee80211_tx_dequeue()"").

This commit broke TX with 802.11 encapsulation HW offloading, now that
this is fixed, reapply it.

Fixes: bb42f2d13ffc ("mac80211: Move reorder-sensitive TX handlers to after TXQ dequeue")
Signed-off-by: Remi Pommarel <repk@triplefau.lt>
Link: https://patch.msgid.link/66b8fc39fb0194fa06c9ca7eeb6ffe0118dcb3ec.1752765971.git.repk@triplefau.lt
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 73304a5cf6fc557b422ecfd3c36a8c490462c30c..8aaa59a27bc4cce9b6cca7e7dfeaba1a266e689c 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -3883,6 +3883,7 @@ 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);