iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: wfx: simplify wfx_tx_queues_empty()

Browse Source 
Thanks to skb_queue_empty_lockless(), it is not necessary to acquire the
spin_lock before to check if the queue is empty.

Reviewed-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200401110405.80282-10-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jérôme Pouiller 2020-04-01 13:03:42 +02:00 committed by Greg Kroah-Hartman
parent f5d331ee86
commit f42483f9ef
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/staging/wfx/queue.c
View File

@ -303,20 +303,14 @@ unsigned int wfx_pending_get_pkt_us_delay(struct wfx_dev *wdev,
return ktime_us_delta(now, tx_priv->xmit_timestamp); return ktime_us_delta(now, tx_priv->xmit_timestamp);
} }
bool wfx_tx_queues_is_empty(struct wfx_dev *wdev) bool wfx_tx_queues_empty(struct wfx_dev *wdev)
{ {
int i; int i;
struct sk_buff_head *queue;
bool ret = true;
for (i = 0; i < IEEE80211_NUM_ACS; i++) { for (i = 0; i < IEEE80211_NUM_ACS; i++)
queue = &wdev->tx_queue[i].queue; if (!skb_queue_empty_lockless(&wdev->tx_queue[i].queue))
spin_lock_bh(&queue->lock); return false;
if (!skb_queue_empty(queue)) return true;
ret = false;
spin_unlock_bh(&queue->lock);
}
return ret;
} }
static bool wfx_handle_tx_data(struct wfx_dev *wdev, struct sk_buff *skb) static bool wfx_handle_tx_data(struct wfx_dev *wdev, struct sk_buff *skb)

2
drivers/staging/wfx/queue.h
View File

@ -40,7 +40,7 @@ void wfx_tx_lock_flush(struct wfx_dev *wdev);
void wfx_tx_queues_init(struct wfx_dev *wdev); void wfx_tx_queues_init(struct wfx_dev *wdev);
void wfx_tx_queues_deinit(struct wfx_dev *wdev); void wfx_tx_queues_deinit(struct wfx_dev *wdev);
void wfx_tx_queues_clear(struct wfx_dev *wdev); void wfx_tx_queues_clear(struct wfx_dev *wdev);
bool wfx_tx_queues_is_empty(struct wfx_dev *wdev); bool wfx_tx_queues_empty(struct wfx_dev *wdev);
void wfx_tx_queues_wait_empty_vif(struct wfx_vif *wvif); void wfx_tx_queues_wait_empty_vif(struct wfx_vif *wvif);
struct hif_msg *wfx_tx_queues_get(struct wfx_dev *wdev); struct hif_msg *wfx_tx_queues_get(struct wfx_dev *wdev);
struct hif_msg *wfx_tx_queues_get_after_dtim(struct wfx_vif *wvif); struct hif_msg *wfx_tx_queues_get_after_dtim(struct wfx_vif *wvif);

4
drivers/staging/wfx/sta.c
View File

@ -325,11 +325,11 @@ static int __wfx_flush(struct wfx_dev *wdev, bool drop)
if (drop) if (drop)
wfx_tx_queues_clear(wdev); wfx_tx_queues_clear(wdev);
if (wait_event_timeout(wdev->tx_queue_stats.wait_link_id_empty, if (wait_event_timeout(wdev->tx_queue_stats.wait_link_id_empty,
wfx_tx_queues_is_empty(wdev), wfx_tx_queues_empty(wdev),
2 * HZ) <= 0) 2 * HZ) <= 0)
return -ETIMEDOUT; return -ETIMEDOUT;
wfx_tx_flush(wdev); wfx_tx_flush(wdev);
if (wfx_tx_queues_is_empty(wdev)) if (wfx_tx_queues_empty(wdev))
return 0; return 0;
dev_warn(wdev->dev, "frames queued while flushing tx queues"); dev_warn(wdev->dev, "frames queued while flushing tx queues");
} }