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

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

details:   https://anonhg.NetBSD.org/src-all/rev/efd3a541e70d
branches:  trunk
changeset: 948877:efd3a541e70d
user:      Nathanial Sloss <nat%netbsd.org@localhost>
date:      Sun May 03 21:46:42 2020 +1000

description:
Backed out changeset f32a994bd774

diffstat:

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

diffs (73 lines):

diff -r 28fb6a0010d4 -r efd3a541e70d sys/dev/usb/if_urtwn.c
--- a/sys/dev/usb/if_urtwn.c    Sun May 03 20:45:26 2020 +1000
+++ b/sys/dev/usb/if_urtwn.c    Sun May 03 21:46:42 2020 +1000
@@ -599,6 +599,21 @@
                goto fail;
        }
        
+       /* Allocate Tx/Rx buffers. */
+       error = urtwn_alloc_rx_list(sc);
+       if (error != 0) {
+               aprint_error_dev(sc->sc_dev,
+                   "could not allocate Rx buffers\n");
+               goto fail;
+       }
+
+       error = urtwn_alloc_tx_list(sc);
+       if (error != 0) {
+               aprint_error_dev(sc->sc_dev,
+                   "could not allocate Tx buffers\n");
+               goto fail;
+       }
+
        return;
 
  fail:
@@ -882,8 +897,8 @@
        return 0;
 
  fail:
+       urtwn_free_tx_list(sc);
        mutex_exit(&sc->sc_tx_mtx);
-       urtwn_free_tx_list(sc);
        return error;
 }
 
@@ -5697,21 +5712,6 @@
        /* Set default channel. */
        urtwn_set_chan(sc, ic->ic_curchan, IEEE80211_HTINFO_2NDCHAN_NONE);
 
-       /* Allocate Tx/Rx buffers. */
-       error = urtwn_alloc_rx_list(sc);
-       if (error != 0) {
-               aprint_error_dev(sc->sc_dev,
-                   "could not allocate Rx buffers\n");
-               goto fail;
-       }
-
-       error = urtwn_alloc_tx_list(sc);
-       if (error != 0) {
-               aprint_error_dev(sc->sc_dev,
-                   "could not allocate Tx buffers\n");
-               goto fail;
-       }
-
        /* Queue Rx xfers. */
        for (size_t j = 0; j < sc->rx_npipe; j++) {
                mutex_enter(&sc->sc_rx_mtx); 
@@ -5790,7 +5790,6 @@
                        usbd_abort_pipe(sc->tx_pipe[i]);
        }
        mutex_exit(&sc->sc_tx_mtx);
-       urtwn_free_tx_list(sc);
 
        mutex_enter(&sc->sc_rx_mtx);
        /* Stop Rx pipe. */
@@ -5799,7 +5798,6 @@
                        usbd_abort_pipe(sc->rx_pipe[i]);
        }
        mutex_exit(&sc->sc_rx_mtx);
-       urtwn_free_rx_list(sc);
 
        sc->sc_running = false;
        if (disable)