From: Rahul Rameshbabu <sergeantsagara@protonmail.com>
To: Kalle Valo <kvalo@kernel.org>
Cc: linux-wireless@vger.kernel.org, b43-dev@lists.infradead.org,
linux-kernel@vger.kernel.org,
Rahul Rameshbabu <sergeantsagara@protonmail.com>
Subject: [PATCH wireless 4/5] wifi: b43: Stop correct queue in DMA worker when QoS is disabled
Date: Sat, 30 Dec 2023 04:51:45 +0000 [thread overview]
Message-ID: <20231230045105.91351-5-sergeantsagara@protonmail.com> (raw)
In-Reply-To: <20231230045105.91351-1-sergeantsagara@protonmail.com>
When QoS is disabled, the queue priority value will not map to the correct
ieee80211 queue since there is only one queue. Stop queue 0 when QoS is
disabled to prevent trying to stop a non-existent queue and failing to stop
the actual queue instantiated.
Fixes: bad691946966 ("b43: avoid packet losses in the dma worker code.")
Signed-off-by: Rahul Rameshbabu <sergeantsagara@protonmail.com>
---
drivers/net/wireless/broadcom/b43/main.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/net/wireless/broadcom/b43/main.c b/drivers/net/wireless/broadcom/b43/main.c
index c81117a22ebf..b6ac1526c0e8 100644
--- a/drivers/net/wireless/broadcom/b43/main.c
+++ b/drivers/net/wireless/broadcom/b43/main.c
@@ -3603,7 +3603,10 @@ static void b43_tx_work(struct work_struct *work)
err = b43_dma_tx(dev, skb);
if (err == -ENOSPC) {
wl->tx_queue_stopped[queue_num] = true;
- ieee80211_stop_queue(wl->hw, queue_num);
+ if (dev->qos_enabled)
+ ieee80211_stop_queue(wl->hw, queue_num);
+ else
+ ieee80211_stop_queue(wl->hw, 0);
skb_queue_head(&wl->tx_queue[queue_num], skb);
break;
}
@@ -3636,11 +3639,12 @@ static void b43_op_tx(struct ieee80211_hw *hw,
B43_WARN_ON(skb_shinfo(skb)->nr_frags);
skb_queue_tail(&wl->tx_queue[skb->queue_mapping], skb);
- if (!wl->tx_queue_stopped[skb->queue_mapping]) {
+ if (!wl->tx_queue_stopped[skb->queue_mapping])
ieee80211_queue_work(wl->hw, &wl->tx_work);
- } else {
+ else if (wl->current_dev->qos_enabled)
ieee80211_stop_queue(wl->hw, skb->queue_mapping);
- }
+ else
+ ieee80211_stop_queue(wl->hw, 0);
}
static void b43_qos_params_upload(struct b43_wldev *dev,
--
2.42.0
next prev parent reply other threads:[~2023-12-30 4:52 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-30 4:51 [PATCH wireless 0/5] wifi: b43: Various QoS-related fixes Rahul Rameshbabu
2023-12-30 4:51 ` [PATCH wireless 1/5] wifi: b43: Correct OpenFW QoS capability warning conditional Rahul Rameshbabu
2023-12-30 13:34 ` Michael Büsch
2023-12-30 17:17 ` Rahul Rameshbabu
2023-12-30 4:51 ` [PATCH wireless 2/5] wifi: b43: Stop/wake correct queue in DMA Tx path when QoS is disabled Rahul Rameshbabu
2023-12-30 7:48 ` Julian Calaby
2023-12-30 13:40 ` Michael Büsch
2023-12-30 17:15 ` Rahul Rameshbabu
2023-12-30 17:41 ` Michael Büsch
2023-12-30 19:37 ` Rahul Rameshbabu
2023-12-30 4:51 ` [PATCH wireless 3/5] wifi: b43: Stop/wake correct queue in PIO " Rahul Rameshbabu
2023-12-30 18:04 ` Larry Finger
2023-12-30 19:43 ` Rahul Rameshbabu
2023-12-30 22:23 ` Larry Finger
2023-12-31 0:02 ` Rahul Rameshbabu
2023-12-31 9:33 ` Michael Büsch
2023-12-31 17:29 ` Rahul Rameshbabu
2023-12-30 4:51 ` Rahul Rameshbabu [this message]
2023-12-30 4:51 ` [PATCH wireless 5/5] wifi: b43: Support advertising lack of QoS capability Rahul Rameshbabu
2023-12-30 13:45 ` Michael Büsch
2023-12-30 17:10 ` Rahul Rameshbabu
2023-12-30 17:43 ` Michael Büsch
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231230045105.91351-5-sergeantsagara@protonmail.com \
--to=sergeantsagara@protonmail.com \
--cc=b43-dev@lists.infradead.org \
--cc=kvalo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®