Received-SPF: pass (google.com: domain of linux-wireless+bounces-1339-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Date: Sat, 30 Dec 2023 04:51:40 +0000
To: Kalle Valo <kvalo@kernel.org>
From: Rahul Rameshbabu <sergeantsagara@protonmail.com>
Cc: linux-wireless@vger.kernel.org, b43-dev@lists.infradead.org, linux-kernel@vger.kernel.org, Rahul Rameshbabu <sergeantsagara@protonmail.com>
Subject: [PATCH wireless 3/5] wifi: b43: Stop/wake correct queue in PIO Tx path when QoS is disabled
Message-ID: <20231230045105.91351-4-sergeantsagara@protonmail.com>
In-Reply-To: <20231230045105.91351-1-sergeantsagara@protonmail.com>
References: <20231230045105.91351-1-sergeantsagara@protonmail.com>
Feedback-ID: 26003777:user:proton
Precedence: bulk
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable

When QoS is disabled, the queue priority value will not map to the correct
ieee80211 queue since there is only one queue. Stop/wake queue 0 when QoS
is disabled to prevent trying to stop/wake a non-existent queue and failing
to stop/wake the actual queue instantiated.

Fixes: 5100d5ac81b9 ("b43: Add PIO support for PCMCIA devices")
Signed-off-by: Rahul Rameshbabu <sergeantsagara@protonmail.com>
---
 drivers/net/wireless/broadcom/b43/pio.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/drivers/net/wireless/broadcom/b43/pio.c b/drivers/net/wireless=
/broadcom/b43/pio.c
index 0cf70fdb60a6..7168fe50af5b 100644
--- a/drivers/net/wireless/broadcom/b43/pio.c
+++ b/drivers/net/wireless/broadcom/b43/pio.c
@@ -525,7 +525,11 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *=
skb)
 =09if (total_len > (q->buffer_size - q->buffer_used)) {
 =09=09/* Not enough memory on the queue. */
 =09=09err =3D -EBUSY;
-=09=09ieee80211_stop_queue(dev->wl->hw, skb_get_queue_mapping(skb));
+=09=09if (dev->qos_enabled)
+=09=09=09ieee80211_stop_queue(dev->wl->hw,
+=09=09=09=09=09     skb_get_queue_mapping(skb));
+=09=09else
+=09=09=09ieee80211_stop_queue(dev->wl->hw, 0);
 =09=09q->stopped =3D true;
 =09=09goto out;
 =09}
@@ -552,7 +556,11 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *=
skb)
 =09if (((q->buffer_size - q->buffer_used) < roundup(2 + 2 + 6, 4)) ||
 =09    (q->free_packet_slots =3D=3D 0)) {
 =09=09/* The queue is full. */
-=09=09ieee80211_stop_queue(dev->wl->hw, skb_get_queue_mapping(skb));
+=09=09if (dev->qos_enabled)
+=09=09=09ieee80211_stop_queue(dev->wl->hw,
+=09=09=09=09=09     skb_get_queue_mapping(skb));
+=09=09else
+=09=09=09ieee80211_stop_queue(dev->wl->hw, 0);
 =09=09q->stopped =3D true;
 =09}
=20
@@ -587,7 +595,10 @@ void b43_pio_handle_txstatus(struct b43_wldev *dev,
 =09list_add(&pack->list, &q->packets_list);
=20
 =09if (q->stopped) {
-=09=09ieee80211_wake_queue(dev->wl->hw, q->queue_prio);
+=09=09if (dev->qos_enabled)
+=09=09=09ieee80211_wake_queue(dev->wl->hw, q->queue_prio);
+=09=09else
+=09=09=09ieee80211_wake_queue(dev->wl->hw, 0);
 =09=09q->stopped =3D false;
 =09}
 }
--=20
2.42.0