summaryrefslogtreecommitdiff
path: root/drivers/staging/wfx/queue.c
diff options
context:
space:
mode:
authorJérôme Pouiller <jerome.pouiller@silabs.com>2020-07-01 17:06:56 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-07-03 10:33:06 +0200
commitdf6f08d3faec5ce603d531dbe9660f391a50af9d (patch)
tree427fd5c6be39970962bd1c660193d2b17c6b9337 /drivers/staging/wfx/queue.c
parent2a30cb163449b91eb65b7ad971198550c6a16f97 (diff)
staging: wfx: check the vif ID of the Tx confirmations
When the driver has sent a frame on a virtual interface (vif), it expects to receive the confirmation on the same vif. This patch add a check for that. Signed-off-by: Jérôme Pouiller <jerome.pouiller@silabs.com> Link: https://lore.kernel.org/r/20200701150707.222985-3-Jerome.Pouiller@silabs.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wfx/queue.c')
-rw-r--r--drivers/staging/wfx/queue.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/staging/wfx/queue.c b/drivers/staging/wfx/queue.c
index 7ec36598d9a8..6069143369f3 100644
--- a/drivers/staging/wfx/queue.c
+++ b/drivers/staging/wfx/queue.c
@@ -142,14 +142,18 @@ struct sk_buff *wfx_pending_get(struct wfx_vif *wvif, u32 packet_id)
{
struct wfx_queue *queue;
struct hif_req_tx *req;
+ struct hif_msg *hif;
struct sk_buff *skb;
spin_lock_bh(&wvif->wdev->tx_pending.lock);
skb_queue_walk(&wvif->wdev->tx_pending, skb) {
- req = wfx_skb_txreq(skb);
+ hif = (struct hif_msg *)skb->data;
+ req = (struct hif_req_tx *)hif->body;
if (req->packet_id == packet_id) {
spin_unlock_bh(&wvif->wdev->tx_pending.lock);
queue = &wvif->tx_queue[skb_get_queue_mapping(skb)];
+ WARN(hif->interface != wvif->id, "sent frame %08x on vif %d, but get reply on vif %d",
+ req->packet_id, hif->interface, wvif->id);
WARN_ON(skb_get_queue_mapping(skb) > 3);
WARN_ON(!atomic_read(&queue->pending_frames));
atomic_dec(&queue->pending_frames);