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

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


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

drivers/staging/wfx/data_tx.c

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

drivers/staging/wfx/queue.c

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

		}

	}

drivers/staging/wfx/queue.h

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