Skip to content

Commit 53bc1b7

Browse files
Ping-Ke Shihjmberg-intel
authored andcommitted
wifi: mac80211: export ieee80211_purge_tx_queue() for drivers
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: Ping-Ke Shih <pkshih@realtek.com> Link: https://patch.msgid.link/20240822014255.10211-1-pkshih@realtek.com Signed-off-by: Johannes Berg <johannes.berg@intel.com>
1 parent 373d3f8 commit 53bc1b7

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

include/net/mac80211.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3181,6 +3181,19 @@ ieee80211_get_alt_retry_rate(const struct ieee80211_hw *hw,
31813181
*/
31823182
void ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb);
31833183

3184+
/**
3185+
* ieee80211_purge_tx_queue - purge TX skb queue
3186+
* @hw: the hardware
3187+
* @skbs: the skbs
3188+
*
3189+
* Free a set of transmit skbs. Use this function when device is going to stop
3190+
* but some transmit skbs without TX status are still queued.
3191+
* This function does not take the list lock and the caller must hold the
3192+
* relevant locks to use it.
3193+
*/
3194+
void ieee80211_purge_tx_queue(struct ieee80211_hw *hw,
3195+
struct sk_buff_head *skbs);
3196+
31843197
/**
31853198
* DOC: Hardware crypto acceleration
31863199
*

net/mac80211/ieee80211_i.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2072,8 +2072,6 @@ void __ieee80211_subif_start_xmit(struct sk_buff *skb,
20722072
u32 info_flags,
20732073
u32 ctrl_flags,
20742074
u64 *cookie);
2075-
void ieee80211_purge_tx_queue(struct ieee80211_hw *hw,
2076-
struct sk_buff_head *skbs);
20772075
struct sk_buff *
20782076
ieee80211_build_data_template(struct ieee80211_sub_if_data *sdata,
20792077
struct sk_buff *skb, u32 info_flags);

net/mac80211/status.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,3 +1301,4 @@ void ieee80211_purge_tx_queue(struct ieee80211_hw *hw,
13011301
while ((skb = __skb_dequeue(skbs)))
13021302
ieee80211_free_txskb(hw, skb);
13031303
}
1304+
EXPORT_SYMBOL(ieee80211_purge_tx_queue);

0 commit comments

Comments
 (0)