Commit f42483f9 authored by Jérôme Pouiller's avatar Jérôme Pouiller Committed by Greg Kroah-Hartman
Browse files

staging: wfx: simplify wfx_tx_queues_empty() 



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: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarJérôme Pouiller <jerome.pouiller@silabs.com>
Link: https://lore.kernel.org/r/20200401110405.80282-10-Jerome.Pouiller@silabs.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f5d331ee

drivers/staging/wfx/queue.c

+6 −12
Original line number Diff line number Diff line
@@ -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);

}



bool wfx_tx_queues_is_empty(struct wfx_dev *wdev)

bool wfx_tx_queues_empty(struct wfx_dev *wdev)

{

	int i;

	struct sk_buff_head *queue;

	bool ret = true;



	for (i = 0; i < IEEE80211_NUM_ACS; i++) {

		queue = &wdev->tx_queue[i].queue;

		spin_lock_bh(&queue->lock);

		if (!skb_queue_empty(queue))

			ret = false;

		spin_unlock_bh(&queue->lock);

	}

	return ret;

	for (i = 0; i < IEEE80211_NUM_ACS; i++)

		if (!skb_queue_empty_lockless(&wdev->tx_queue[i].queue))

			return false;

	return true;

}



static bool wfx_handle_tx_data(struct wfx_dev *wdev, struct sk_buff *skb)

drivers/staging/wfx/queue.h

+1 −1
Original line number Diff line number Diff line
@@ -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_deinit(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);

struct hif_msg *wfx_tx_queues_get(struct wfx_dev *wdev);

struct hif_msg *wfx_tx_queues_get_after_dtim(struct wfx_vif *wvif);

drivers/staging/wfx/sta.c

+2 −2
Original line number Diff line number Diff line
@@ -325,11 +325,11 @@ static int __wfx_flush(struct wfx_dev *wdev, bool drop) 
		if (drop)

			wfx_tx_queues_clear(wdev);

		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)

			return -ETIMEDOUT;

		wfx_tx_flush(wdev);

		if (wfx_tx_queues_is_empty(wdev))

		if (wfx_tx_queues_empty(wdev))

			return 0;

		dev_warn(wdev->dev, "frames queued while flushing tx queues");

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE