lkml.org 
[lkml]   [2021]   [Sep]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v3 08/32] staging: wfx: take advantage of wfx_tx_queue_empty()
    Date
    From: Jérôme Pouiller <jerome.pouiller@silabs.com>

    wfx_tx_queues_check_empty() can be slightly simplified by calling
    wfx_tx_queue_empty().

    Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com>
    ---
    drivers/staging/wfx/queue.c | 21 ++++++++++-----------
    1 file changed, 10 insertions(+), 11 deletions(-)

    diff --git a/drivers/staging/wfx/queue.c b/drivers/staging/wfx/queue.c
    index fa272c120f1c..0ab207237d9f 100644
    --- a/drivers/staging/wfx/queue.c
    +++ b/drivers/staging/wfx/queue.c
    @@ -73,23 +73,22 @@ void wfx_tx_queues_init(struct wfx_vif *wvif)
    }
    }

    -void wfx_tx_queues_check_empty(struct wfx_vif *wvif)
    -{
    - int i;
    -
    - for (i = 0; i < IEEE80211_NUM_ACS; ++i) {
    - WARN_ON(atomic_read(&wvif->tx_queue[i].pending_frames));
    - WARN_ON(!skb_queue_empty_lockless(&wvif->tx_queue[i].normal));
    - WARN_ON(!skb_queue_empty_lockless(&wvif->tx_queue[i].cab));
    - }
    -}
    -
    bool wfx_tx_queue_empty(struct wfx_vif *wvif, struct wfx_queue *queue)
    {
    return skb_queue_empty_lockless(&queue->normal) &&
    skb_queue_empty_lockless(&queue->cab);
    }

    +void wfx_tx_queues_check_empty(struct wfx_vif *wvif)
    +{
    + int i;
    +
    + for (i = 0; i < IEEE80211_NUM_ACS; ++i) {
    + WARN_ON(atomic_read(&wvif->tx_queue[i].pending_frames));
    + WARN_ON(!wfx_tx_queue_empty(wvif, &wvif->tx_queue[i]));
    + }
    +}
    +
    static void __wfx_tx_queue_drop(struct wfx_vif *wvif,
    struct sk_buff_head *skb_queue,
    struct sk_buff_head *dropped)
    --
    2.33.0
    \
     
     \ /
      Last update: 2021-09-13 15:03    [W:4.109 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site