[src-draft/trunk]: src/sys/dev/usb usbwifi queues deal with pipes not streams.

[Nathanial Sloss <nat%netbsd.org@localhost>]

details:   https://anonhg.NetBSD.org/src-all/rev/d5dff83c5571
branches:  trunk
changeset: 365121:d5dff83c5571
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Fri Apr 08 14:20:40 2022 +1000

description:
usbwifi queues deal with pipes not streams.

diffstat:

 sys/dev/usb/usbwifi.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (48 lines):

diff -r 7228574ea835 -r d5dff83c5571 sys/dev/usb/usbwifi.c
--- a/sys/dev/usb/usbwifi.c     Sat Mar 19 09:04:13 2022 +0100
+++ b/sys/dev/usb/usbwifi.c     Fri Apr 08 14:20:40 2022 +1000
@@ -891,7 +891,7 @@
 usbwifi_start(struct usbwifi *uw)
 {
        KASSERT(mutex_owned(&uw->uw_pri->uwp_txlock));
-       for (unsigned prio = 0; prio < uw->uw_ic.ic_txstream; prio++)
+       for (unsigned prio = 0; prio < uw->uw_txpipes; prio++)
                usbwifi_tx_prio_start(uw, prio);
 }
 
@@ -1032,7 +1032,7 @@
        ieee80211_stat_add(&uw->uw_ic.ic_ierrors, 1);
        aprint_error_dev(uw->uw_dev, "watchdog timeout\n");
 
-       for (prio = 0; prio < uw->uw_ic.ic_txstream; prio++) {
+       for (prio = 0; prio < uw->uw_txpipes; prio++) {
                if (cd->uwcd_tx_chains[prio].uwscd_tx_cnt == 0)
                        continue;
                DPRINTF("prio %ju: uwcd_tx_cnt=%ju non zero, "
@@ -1047,7 +1047,7 @@
        }
 
        found = false;
-       for (prio = 0; prio < uw->uw_ic.ic_txstream; prio++) {
+       for (prio = 0; prio < uw->uw_txpipes; prio++) {
                if (!IFQ_IS_EMPTY(&uwp->uwp_sendq[prio])) {
                        found = true;
                        break;
@@ -1204,7 +1204,7 @@
         * Which one to use is controlled by uw_ac2idx, mapping a WME
         * quality of service to a pipe index.
         */
-       for (int i = 0; i < uw->uw_ic.ic_txstream; i++) {
+       for (int i = 0; i < uw->uw_txpipes; i++) {
                uwp->uwp_sendq[i].ifq_maxlen = ifqmaxlen;
                IFQ_LOCK_INIT(&uwp->uwp_sendq[i]);
        }
@@ -1270,7 +1270,7 @@
        mutex_destroy(&uwp->uwp_txlock);
 
        /* sendq destroy */
-       for (int i = 0; i < uw->uw_ic.ic_txstream; i++) {
+       for (int i = 0; i < uw->uw_txpipes; i++) {
                IFQ_PURGE(&uwp->uwp_sendq[i]);
                IFQ_LOCK_DESTROY(&uwp->uwp_sendq[i]);
        }