From: Remi Pommarel Date: Thu, 17 Jul 2025 15:45:29 +0000 (+0200) Subject: Reapply "wifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue()" X-Git-Tag: v6.6.102~175 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dde152043f6d169df4ef395db4904d7819fe9e43;p=thirdparty%2Fkernel%2Fstable.git 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 Link: https://patch.msgid.link/66b8fc39fb0194fa06c9ca7eeb6ffe0118dcb3ec.1752765971.git.repk@triplefau.lt Signed-off-by: Johannes Berg Signed-off-by: Sasha Levin --- diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index e4797eb9c2ba9..7eddcb6f96455 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);