[src-draft/trunk]: src/sys/dev/usb Backed out changeset 59315a2ccd28

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

details:   https://anonhg.NetBSD.org/src-all/rev/d7d2b2290ccd
branches:  trunk
changeset: 947933:d7d2b2290ccd
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Sun May 03 09:22:32 2020 +1000

description:
Backed out changeset 59315a2ccd28

diffstat:

 sys/dev/usb/if_urtwn.c |  31 +++++++++++++++----------------
 1 files changed, 15 insertions(+), 16 deletions(-)

diffs (62 lines):

diff -r a96dac4a2357 -r d7d2b2290ccd sys/dev/usb/if_urtwn.c
--- a/sys/dev/usb/if_urtwn.c    Sun May 03 09:04:51 2020 +1000
+++ b/sys/dev/usb/if_urtwn.c    Sun May 03 09:22:32 2020 +1000
@@ -386,6 +386,7 @@
        struct usb_attach_arg *uaa = aux;
        char *devinfop;
        const struct urtwn_dev *dev;
+       struct urtwn_rx_data *data;
        usb_device_request_t req;
        // NNN loop below size_t i;
        int error;
@@ -614,6 +615,20 @@
                goto fail;
        }
 
+       /* Queue Rx xfers. */
+       for (size_t j = 0; j < sc->rx_npipe; j++) {
+               mutex_enter(&sc->sc_rx_mtx); 
+               TAILQ_FOREACH(data, &sc->rx_free_list[j], next) {
+                       usbd_setup_xfer(data->xfer, data, data->buf,
+                           URTWN_RXBUFSZ, USBD_SHORT_XFER_OK, USBD_NO_TIMEOUT,
+                           urtwn_rxeof);
+                       error = usbd_transfer(data->xfer);
+                       if (__predict_false(error != USBD_NORMAL_COMPLETION &&
+                           error != USBD_IN_PROGRESS))
+                               goto fail;
+               }
+               mutex_exit(&sc->sc_rx_mtx);
+       }
        return;
 
  fail:
@@ -5499,7 +5514,6 @@
        struct ieee80211com *ic = vap->iv_ic;
        struct ifmediareq imr;
        struct urtwn_softc *sc = ic->ic_softc;
-       struct urtwn_rx_data *data;
        uint32_t reg;
        int error;
 
@@ -5715,21 +5729,6 @@
        /* Set default channel. */
        urtwn_set_chan(sc, ic->ic_curchan, IEEE80211_HTINFO_2NDCHAN_NONE);
 
-       /* Queue Rx xfers. */
-       for (size_t j = 0; j < sc->rx_npipe; j++) {
-               mutex_enter(&sc->sc_rx_mtx); 
-               TAILQ_FOREACH(data, &sc->rx_free_list[j], next) {
-                       usbd_setup_xfer(data->xfer, data, data->buf,
-                           URTWN_RXBUFSZ, USBD_SHORT_XFER_OK, USBD_NO_TIMEOUT,
-                           urtwn_rxeof);
-                       error = usbd_transfer(data->xfer);
-                       if (__predict_false(error != USBD_NORMAL_COMPLETION &&
-                           error != USBD_IN_PROGRESS))
-                               goto fail;
-               }
-               mutex_exit(&sc->sc_rx_mtx);
-       }
-
        /* We're ready to go. */
        ifp->if_flags &= ~IFF_OACTIVE;
        ifp->if_flags |= IFF_RUNNING;