Commit e987331e authored by Ping-Ke Shih's avatar Ping-Ke Shih Committed by Zicheng Qu
Browse files

wifi: mac80211: export ieee80211_purge_tx_queue() for drivers 

mainline inclusion
from mainline-v6.12-rc1
commit 53bc1b73b67836ac9867f93dee7a443986b4a94f
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IBEAOM
CVE: CVE-2024-56609

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=53bc1b73b67836ac9867f93dee7a443986b4a94f



--------------------------------

Drivers need to purge TX SKB when stopping. Using skb_queue_purge() can't
report TX status to mac80211, causing ieee80211_free_ack_frame() warns
"Have pending ack frames!". Export ieee80211_purge_tx_queue() for drivers
to not have to reimplement it.

Signed-off-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/20240822014255.10211-1-pkshih@realtek.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarZicheng Qu <quzicheng@huawei.com>
parent b19a11b5

include/net/mac80211.h

+13 −0
Original line number Diff line number Diff line
@@ -3039,6 +3039,19 @@ ieee80211_get_alt_retry_rate(const struct ieee80211_hw *hw, 
 */

void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb);



/**

 * ieee80211_purge_tx_queue - purge TX skb queue

 * @hw: the hardware

 * @skbs: the skbs

 *

 * Free a set of transmit skbs. Use this function when device is going to stop

 * but some transmit skbs without TX status are still queued.

 * This function does not take the list lock and the caller must hold the

 * relevant locks to use it.

 */

void ieee80211_purge_tx_queue(struct ieee80211_hw *hw,

			      struct sk_buff_head *skbs);



/**

 * DOC: Hardware crypto acceleration

 *

net/mac80211/ieee80211_i.h

+0 −2
Original line number Diff line number Diff line
@@ -2057,8 +2057,6 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb, 
				  u32 info_flags,

				  u32 ctrl_flags,

				  u64 *cookie);

void ieee80211_purge_tx_queue(struct ieee80211_hw *hw,

			      struct sk_buff_head *skbs);

struct sk_buff *

ieee80211_build_data_template(struct ieee80211_sub_if_data *sdata,

			      struct sk_buff *skb, u32 info_flags);

net/mac80211/status.c

+1 −0
Original line number Diff line number Diff line
@@ -1270,3 +1270,4 @@ void ieee80211_purge_tx_queue(struct ieee80211_hw *hw, 
	while ((skb = __skb_dequeue(skbs)))

		ieee80211_free_txskb(hw, skb);

}

EXPORT_SYMBOL(ieee80211_purge_tx_queue);