summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Pommarel <repk@triplefau.lt>2025-07-17 17:45:29 +0200
committerJohannes Berg <johannes.berg@intel.com>2025-07-18 14:29:30 +0200
commit754fe848b3b297fc85ec24cd959bad22b6df8cb8 (patch)
treef0ad8f87c2aeb13613031e48a10c176aa79f0a4f
parent4037c468d1b3c508d69e6df0ef47fdee3d440e39 (diff)
Reapply "wifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue()"
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>
-rw-r--r--net/mac80211/tx.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 73ea4d5bf266..00671ae45b2f 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -3884,6 +3884,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);