Ksawlii/kernel_samsung_a53x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "wifi: mac80211: use two-phase skb reclamation in ieee80211_do_stop()"

Browse source 
This reverts commit 25eb51c765.
This commit is contained in:
Ksawlii 2024-11-24 00:23:30 +01:00
parent c22bb3d377
commit 6bafde029d
1 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
net/mac80211/iface.c
View file

@ -370,7 +370,6 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
{ {
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
unsigned long flags; unsigned long flags;
struct sk_buff_head freeq;
struct sk_buff *skb, *tmp; struct sk_buff *skb, *tmp;
u32 hw_reconf_flags = 0; u32 hw_reconf_flags = 0;
int i, flushed; int i, flushed;
@ -566,32 +565,18 @@ static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata,
skb_queue_purge(&sdata->skb_queue); skb_queue_purge(&sdata->skb_queue);
} }
/*
* Since ieee80211_free_txskb() may issue __dev_queue_xmit()
* which should be called with interrupts enabled, reclamation
* is done in two phases:
*/
__skb_queue_head_init(&freeq);
/* unlink from local queues... */
spin_lock_irqsave(&local->queue_stop_reason_lock, flags); spin_lock_irqsave(&local->queue_stop_reason_lock, flags);
for (i = 0; i < IEEE80211_MAX_QUEUES; i++) { for (i = 0; i < IEEE80211_MAX_QUEUES; i++) {
skb_queue_walk_safe(&local->pending[i], skb, tmp) { skb_queue_walk_safe(&local->pending[i], skb, tmp) {
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
if (info->control.vif == &sdata->vif) { if (info->control.vif == &sdata->vif) {
__skb_unlink(skb, &local->pending[i]); __skb_unlink(skb, &local->pending[i]);
__skb_queue_tail(&freeq, skb); ieee80211_free_txskb(&local->hw, skb);
} }
} }
} }
spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags);
/* ... and perform actual reclamation with interrupts enabled. */
skb_queue_walk_safe(&freeq, skb, tmp) {
__skb_unlink(skb, &freeq);
ieee80211_free_txskb(&local->hw, skb);
}
if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN)
ieee80211_txq_remove_vlan(local, sdata); ieee80211_txq_remove_vlan(local, sdata);