Commit 0937cb5f authored by Johannes Berg's avatar Johannes Berg
Browse files

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



This reverts commit a104042e.

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: default avatarBert Karwatzki <spasswolf@web.de>
Closes: https://lore.kernel.org/linux-wireless/20250410215527.3001-1-spasswolf@web.de


Fixes: a104042e ("wifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue()")
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 575fe08c

net/mac80211/tx.c

+0 −1
Original line number Diff line number Diff line
@@ -3894,7 +3894,6 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw, 
	 * 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);