staging: wfx: improve interface between data_tx.c and queue.c

Currently, wfx_pending_remove() (from queue.c) call wfx_skb_dtor()
(from data_tx.c) that forward the tx status to mac80211.

Moreover, there no purpose to retrieve a frame from the pending queue
without dequeuing it. So, the main purpose of wfx_pending_remove() is to
forward the tx status to mac80211.

Let's make the architecture cleaner:
  - merge wfx_pending_remove() into wfx_pending_get()
  - call wfx_skb_dtor() from data_tx.c

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-27-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 d2e925218edab15f00606b99c93e759a1946e1fd..17209f645e4b8e8471815c73b40fd9e1446c954a 100644 (file)
--- a/drivers/staging/wfx/data_tx.c
+++ b/drivers/staging/wfx/data_tx.c
@@ -586,7 +586,7 @@ void wfx_tx_confirm_cb(struct wfx_vif *wvif, const struct hif_cnf_tx *arg)
                    arg->packet_id == wvif->bss_loss_confirm_id)
                        wfx_cqm_bssloss_sm(wvif, 0, 0, 1);
        }
-       wfx_pending_remove(wvif->wdev, skb);
+       wfx_skb_dtor(wvif->wdev, skb);
 }
 
 static void wfx_notify_buffered_tx(struct wfx_vif *wvif, struct sk_buff *skb)

diff --git a/drivers/staging/wfx/queue.c b/drivers/staging/wfx/queue.c
index cc89bfe1dbb411a431799249a394e85d41284e2c..a1a2f7756a273080897cd7be1e6ddaeeb064d25a 100644 (file)
--- a/drivers/staging/wfx/queue.c
+++ b/drivers/staging/wfx/queue.c
@@ -174,30 +174,22 @@ int wfx_pending_requeue(struct wfx_dev *wdev, struct sk_buff *skb)
        return 0;
 }
 
-int wfx_pending_remove(struct wfx_dev *wdev, struct sk_buff *skb)
-{
-       struct wfx_queue *queue = &wdev->tx_queue[skb_get_queue_mapping(skb)];
-
-       WARN_ON(skb_get_queue_mapping(skb) > 3);
-       WARN_ON(!atomic_read(&queue->pending_frames));
-
-       atomic_dec(&queue->pending_frames);
-       skb_unlink(skb, &wdev->tx_pending);
-       wfx_skb_dtor(wdev, skb);
-
-       return 0;
-}
-
 struct sk_buff *wfx_pending_get(struct wfx_dev *wdev, u32 packet_id)
 {
-       struct sk_buff *skb;
+       struct wfx_queue *queue;
        struct hif_req_tx *req;
+       struct sk_buff *skb;
 
        spin_lock_bh(&wdev->tx_pending.lock);
        skb_queue_walk(&wdev->tx_pending, skb) {
                req = wfx_skb_txreq(skb);
                if (req->packet_id == packet_id) {
                        spin_unlock_bh(&wdev->tx_pending.lock);
+                       queue = &wdev->tx_queue[skb_get_queue_mapping(skb)];
+                       WARN_ON(skb_get_queue_mapping(skb) > 3);
+                       WARN_ON(!atomic_read(&queue->pending_frames));
+                       atomic_dec(&queue->pending_frames);
+                       skb_unlink(skb, &wdev->tx_pending);
                        return skb;
                }
        }

diff --git a/drivers/staging/wfx/queue.h b/drivers/staging/wfx/queue.h
index 4851635d159b3a0f4cec89e8e9554765663d9c2a..9bc1a5200e6446e8bff3caba0284f0bc118830dc 100644 (file)
--- a/drivers/staging/wfx/queue.h
+++ b/drivers/staging/wfx/queue.h
@@ -41,7 +41,6 @@ struct hif_msg *wfx_tx_queues_get(struct wfx_dev *wdev);
 
 
 struct sk_buff *wfx_pending_get(struct wfx_dev *wdev, u32 packet_id);
-int wfx_pending_remove(struct wfx_dev *wdev, struct sk_buff *skb);
 int wfx_pending_requeue(struct wfx_dev *wdev, struct sk_buff *skb);
 unsigned int wfx_pending_get_pkt_us_delay(struct wfx_dev *wdev,
                                          struct sk_buff *skb);