mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-05 18:41:58 +09:00
wifi: b43: Stop/wake correct queue in PIO Tx path when QoS is disabled
[ Upstream commit 77135a38f6c2f950d2306ac3d37cbb407e6243f2 ]
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: 5100d5ac81 ("b43: Add PIO support for PCMCIA devices")
Signed-off-by: Rahul Rameshbabu <sergeantsagara@protonmail.com>
Reviewed-by: Julian Calaby <julian.calaby@gmail.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20231231050300.122806-3-sergeantsagara@protonmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Sasha Levin
parent
c67698325c
commit
b6b6bdfca8
@@ -525,7 +525,7 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb)
|
|||||||
if (total_len > (q->buffer_size - q->buffer_used)) {
|
if (total_len > (q->buffer_size - q->buffer_used)) {
|
||||||
/* Not enough memory on the queue. */
|
/* Not enough memory on the queue. */
|
||||||
err = -EBUSY;
|
err = -EBUSY;
|
||||||
ieee80211_stop_queue(dev->wl->hw, skb_get_queue_mapping(skb));
|
b43_stop_queue(dev, skb_get_queue_mapping(skb));
|
||||||
q->stopped = true;
|
q->stopped = true;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
@@ -552,7 +552,7 @@ int b43_pio_tx(struct b43_wldev *dev, struct sk_buff *skb)
|
|||||||
if (((q->buffer_size - q->buffer_used) < roundup(2 + 2 + 6, 4)) ||
|
if (((q->buffer_size - q->buffer_used) < roundup(2 + 2 + 6, 4)) ||
|
||||||
(q->free_packet_slots == 0)) {
|
(q->free_packet_slots == 0)) {
|
||||||
/* The queue is full. */
|
/* The queue is full. */
|
||||||
ieee80211_stop_queue(dev->wl->hw, skb_get_queue_mapping(skb));
|
b43_stop_queue(dev, skb_get_queue_mapping(skb));
|
||||||
q->stopped = true;
|
q->stopped = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -587,7 +587,7 @@ void b43_pio_handle_txstatus(struct b43_wldev *dev,
|
|||||||
list_add(&pack->list, &q->packets_list);
|
list_add(&pack->list, &q->packets_list);
|
||||||
|
|
||||||
if (q->stopped) {
|
if (q->stopped) {
|
||||||
ieee80211_wake_queue(dev->wl->hw, q->queue_prio);
|
b43_wake_queue(dev, q->queue_prio);
|
||||||
q->stopped = false;
|
q->stopped = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user