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: 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-4-Jerome.Pouiller@silabs.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/wfx/data_tx.c b/drivers/staging/wfx/data_tx.c
index 7a7c2518f6cf1563a254bcd7d46c560c870193a5..889ebc2f5d836ee7e7c6a0dd1ef56542a29dcbfa 100644 (file)
--- a/drivers/staging/wfx/data_tx.c
+++ b/drivers/staging/wfx/data_tx.c
@@ -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);
 }
 

diff --git a/drivers/staging/wfx/queue.c b/drivers/staging/wfx/queue.c
index 39d9127ce4b9fb2ae07f0beeda5bcadcf4e0fd61..e3aa1e346c70d9378094a972d385bcf41083cacf 100644 (file)
--- a/drivers/staging/wfx/queue.c
+++ b/drivers/staging/wfx/queue.c
@@ -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)
 {

diff --git a/drivers/staging/wfx/queue.h b/drivers/staging/wfx/queue.h
index 90bb060d12047a09e0aa650b0f59a70d7be5d386..88ee2bf56d11ca3c26751849e089ebc2df78f1af 100644 (file)
--- a/drivers/staging/wfx/queue.h
+++ b/drivers/staging/wfx/queue.h
@@ -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);