Skip to content

Commit dde1520

Browse files
repkgregkh
authored andcommitted
Reapply "wifi: mac80211: Update skb's control block key in ieee80211_tx_dequeue()"
[ Upstream commit 754fe84 ] This reverts commit 0937cb5 ("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: bb42f2d ("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>
1 parent 9c8e9da commit dde1520

1 file changed

Lines changed: 1 addition & 0 deletions

File tree

net/mac80211/tx.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3884,6 +3884,7 @@ struct sk_buff *ieee80211_tx_dequeue(struct ieee80211_hw *hw,
38843884
* The key can be removed while the packet was queued, so need to call
38853885
* this here to get the current key.
38863886
*/
3887+
info->control.hw_key = NULL;
38873888
r = ieee80211_tx_h_select_key(&tx);
38883889
if (r != TX_CONTINUE) {
38893890
ieee80211_free_txskb(&local->hw, skb);

0 commit comments

Comments
 (0)