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

staging: wfx: take advantage of ieee80211_{stop/start}_queues 



Instead of maintaining stop status for each queue, we can just maintain
a global status for all queues.

In add, wfx_tx_queues_{lock/unlock} are only used when no more
tx_policies are available. Therefore, the counter of recursive locks
("tx_locked_cnt") is useless.

So, wfx_tx_queues_{lock/unlock} can be replaced by
ieee80211_{stop/start}_queues.

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-4-Jerome.Pouiller@silabs.com


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

drivers/staging/wfx/data_tx.c

+4 −8
Original line number Diff line number Diff line
@@ -189,10 +189,8 @@ static int wfx_tx_policy_get(struct wfx_vif *wvif, 
		idx = entry - cache->cache;

	}

	wfx_tx_policy_use(cache, &cache->cache[idx]);

	if (list_empty(&cache->free)) {

		/* Lock TX queues. */

		wfx_tx_queues_lock(wvif->wdev);

	}

	if (list_empty(&cache->free))

		ieee80211_stop_queues(wvif->wdev->hw);

	spin_unlock_bh(&cache->lock);

	return idx;

}
@@ -207,10 +205,8 @@ static void wfx_tx_policy_put(struct wfx_vif *wvif, int idx) 
	spin_lock_bh(&cache->lock);

	locked = list_empty(&cache->free);

	usage = wfx_tx_policy_release(cache, &cache->cache[idx]);

	if (locked && !usage) {

		/* Unlock TX queues. */

		wfx_tx_queues_unlock(wvif->wdev);

	}

	if (locked && !usage)

		ieee80211_wake_queues(wvif->wdev->hw);

	spin_unlock_bh(&cache->lock);

}

drivers/staging/wfx/queue.c

+0 −29
Original line number Diff line number Diff line
@@ -55,35 +55,6 @@ void wfx_tx_lock_flush(struct wfx_dev *wdev) 
	wfx_tx_flush(wdev);

}



void wfx_tx_queues_lock(struct wfx_dev *wdev)

{

	int i;

	struct wfx_queue *queue;



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

		queue = &wdev->tx_queue[i];

		spin_lock_bh(&queue->queue.lock);

		if (queue->tx_locked_cnt++ == 0)

			ieee80211_stop_queue(wdev->hw, queue->queue_id);

		spin_unlock_bh(&queue->queue.lock);

	}

}



void wfx_tx_queues_unlock(struct wfx_dev *wdev)

{

	int i;

	struct wfx_queue *queue;



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

		queue = &wdev->tx_queue[i];

		spin_lock_bh(&queue->queue.lock);

		WARN(!queue->tx_locked_cnt, "queue already unlocked");

		if (--queue->tx_locked_cnt == 0)

			ieee80211_wake_queue(wdev->hw, queue->queue_id);

		spin_unlock_bh(&queue->queue.lock);

	}

}



/* If successful, LOCKS the TX queue! */

void wfx_tx_queues_wait_empty_vif(struct wfx_vif *wvif)

{

drivers/staging/wfx/queue.h

+0 −3
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ struct wfx_vif; 


struct wfx_queue {

	struct sk_buff_head	queue;

	int			tx_locked_cnt;

	int			link_map_cache[WFX_LINK_ID_MAX];

	u8			queue_id;

};
@@ -41,8 +40,6 @@ 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_lock(struct wfx_dev *wdev);

void wfx_tx_queues_unlock(struct wfx_dev *wdev);

void wfx_tx_queues_clear(struct wfx_dev *wdev);

bool wfx_tx_queues_is_empty(struct wfx_dev *wdev);

void wfx_tx_queues_wait_empty_vif(struct wfx_vif *wvif);

CRA Git | Maintained and supported by SUSTech CRA and CCSE