 @@ -1,37 +1,37 @@
-/*	$NetBSD: if_urndis.c,v 1.46 2022/03/03 05:56:28 riastradh Exp $ */
+/*	$NetBSD: if_urndis.c,v 1.47 2022/03/03 05:56:58 riastradh Exp $ */
 /*	$OpenBSD: if_urndis.c,v 1.31 2011/07/03 15:47:17 matthew Exp $ */
 /*
  * Copyright (c) 2010 Jonathan Armani <armani@openbsd.org>
  * Copyright (c) 2010 Fabien Romano <fabien@openbsd.org>
  * Copyright (c) 2010 Michael Knudsen <mk@openbsd.org>
  * All rights reserved.
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.46 2022/03/03 05:56:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.47 2022/03/03 05:56:58 riastradh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/kmem.h>
 #include <dev/usb/usbnet.h>
 #include <dev/usb/usbdevs.h>
 #include <dev/usb/usbcdc.h>
 #include <dev/ic/rndisreg.h>
 @@ -62,28 +62,26 @@ struct urndis_softc {
 #define URNDIS_RESPONSE_LEN 0x400
 #if 0
 static void urndis_watchdog(struct ifnet *);
 #endif
 static int urndis_uno_init(struct ifnet *);
 static void urndis_uno_rx_loop(struct usbnet *, struct usbnet_chain *,
 			       uint32_t);
 static unsigned urndis_uno_tx_prepare(struct usbnet *, struct mbuf *,
 				      struct usbnet_chain *);
 static int urndis_init_un(struct ifnet *, struct usbnet *);
 static uint32_t urndis_ctrl_handle_init(struct usbnet *,
     const struct rndis_comp_hdr *);
 static uint32_t urndis_ctrl_handle_query(struct usbnet *,
     const struct rndis_comp_hdr *, void **, size_t *);
 static uint32_t urndis_ctrl_handle_reset(struct usbnet *,
     const struct rndis_comp_hdr *);
 static uint32_t urndis_ctrl_handle_status(struct usbnet *,
     const struct rndis_comp_hdr *);
 static uint32_t urndis_ctrl_set(struct usbnet *, uint32_t, void *,
     size_t);
 static int urndis_match(device_t, cfdata_t, void *);
 @@ -845,48 +843,34 @@ urndis_watchdog(struct ifnet *ifp)
 	struct urndis_softc	*sc = usbnet_softc(un);
 	if (un->un_dying)
 		return;
 	if_statinc(ifp, if_oerrors);
 	printf("%s: watchdog timeout\n", DEVNAME(un));
 	urndis_ctrl_keepalive(un);
+}
 #endif
 static int
 urndis_init_un(struct ifnet *ifp, struct usbnet *un)
 	int 			 err;
 	err = urndis_ctrl_init(un);
 	if (err != RNDIS_STATUS_SUCCESS)
 		return EIO;
 	return err;
 static int
 urndis_uno_init(struct ifnet *ifp)
+{
 	struct usbnet *un = ifp->if_softc;
 	int error;
 	KASSERT(IFNET_LOCKED(ifp));
-	error = urndis_init_un(ifp, un);
+	if (urndis_ctrl_init(un) != RNDIS_STATUS_SUCCESS)
-	if (error)
+		return EIO;
 		return EIO;	/* XXX */
 	return 0;
+}
 static int
 urndis_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct usbif_attach_arg		*uiaa = aux;
 	usb_interface_descriptor_t	*id;
 	if (!uiaa->uiaa_iface)
 		return UMATCH_NONE;
 @@ -1034,28 +1018,31 @@ urndis_attach(device_t parent, device_t
 	if (un->un_ed[USBNET_ENDPT_RX] == 0)
 		aprint_error("%s: could not find data bulk in\n", DEVNAME(un));
 	if (un->un_ed[USBNET_ENDPT_TX] == 0)
 		aprint_error("%s: could not find data bulk out\n",DEVNAME(un));
 	if (un->un_ed[USBNET_ENDPT_RX] == 0 || un->un_ed[USBNET_ENDPT_TX] == 0)
 		return;
 #if 0
 	ifp->if_watchdog = urndis_watchdog;
 #endif
 	usbnet_attach(un);
-	struct ifnet *ifp = usbnet_ifp(un);
+	if (urndis_ctrl_init(un) != RNDIS_STATUS_SUCCESS) {
-	urndis_init_un(ifp, un);
+		aprint_error("%s: unable to initialize hardware\n",
 		    DEVNAME(un));
 		return;
+	}
 	if (urndis_ctrl_query(un, OID_802_3_PERMANENT_ADDRESS, NULL, 0,
 	    &buf, &bufsz) != RNDIS_STATUS_SUCCESS) {
 		aprint_error("%s: unable to get hardware address\n",
 		    DEVNAME(un));
 		return;
+	}
 	if (bufsz == ETHER_ADDR_LEN) {
 		memcpy(un->un_eaddr, buf, ETHER_ADDR_LEN);
 		kmem_free(buf, bufsz);
 	} else {
 		aprint_error("%s: invalid address\n", DEVNAME(un));