 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_url.c,v 1.48.4.11 2016/12/05 10:55:18 skrll Exp $	*/
+/*	$NetBSD: if_url.c,v 1.48.4.12 2017/01/26 12:40:16 skrll Exp $	*/
 /*
  * Copyright (c) 2001, 2002
  *     Shingo WATANABE <nabe@nabechan.org>.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -34,27 +34,27 @@
  * The RTL8150L(Realtek USB to fast ethernet controller) spec can be found at
  *   ftp://ftp.realtek.com.tw/lancard/data_sheet/8150/8150v14.pdf
  *   ftp://152.104.125.40/lancard/data_sheet/8150/8150v14.pdf
  */
 /*
  * TODO:
  *	Interrupt Endpoint support
  *	External PHYs
  *	powerhook() support?
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.48.4.11 2016/12/05 10:55:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_url.c,v 1.48.4.12 2017/01/26 12:40:16 skrll Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/rwlock.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 @@ -182,27 +182,27 @@ void
 url_attach(device_t parent, device_t self, void *aux)
+{
 	struct url_softc *sc = device_private(self);
 	struct usb_attach_arg *uaa = aux;
 	struct usbd_device *dev = uaa->uaa_device;
 	struct usbd_interface *iface;
 	usbd_status err;
 	usb_interface_descriptor_t *id;
 	usb_endpoint_descriptor_t *ed;
 	char *devinfop;
 	struct ifnet *ifp;
 	struct mii_data *mii;
 	u_char eaddr[ETHER_ADDR_LEN];
-	int i, s;
+	int i;
 	sc->sc_dev = self;
 	aprint_naive("\n");
 	aprint_normal("\n");
 	devinfop = usbd_devinfo_alloc(dev, 0);
 	aprint_normal_dev(self, "%s\n", devinfop);
 	usbd_devinfo_free(devinfop);
 	/* Move the device into the configured state. */
 	err = usbd_set_config_no(dev, URL_CONFIG_NO, 1);
 	if (err) {
 @@ -246,37 +246,34 @@ url_attach(device_t parent, device_t sel
 			 UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_OUT)
 			sc->sc_bulkout_no = ed->bEndpointAddress; /* TX */
 		else if ((ed->bmAttributes & UE_XFERTYPE) == UE_INTERRUPT &&
 			 UE_GET_DIR(ed->bEndpointAddress) == UE_DIR_IN)
 			sc->sc_intrin_no = ed->bEndpointAddress; /* Status */
+	}
 	if (sc->sc_bulkin_no == -1 || sc->sc_bulkout_no == -1 ||
 	    sc->sc_intrin_no == -1) {
 		aprint_error_dev(self, "missing endpoint\n");
 		goto bad;
+	}
 	s = splnet();
 	/* reset the adapter */
 	url_reset(sc);
 	/* Get Ethernet Address */
 	err = url_mem(sc, URL_CMD_READMEM, URL_IDR0, (void *)eaddr,
 		      ETHER_ADDR_LEN);
 	if (err) {
 		aprint_error_dev(self, "read MAC address failed\n");
 		splx(s);
 		goto bad;
+	}
 	/* Print Ethernet Address */
 	aprint_normal_dev(self, "Ethernet address %s\n", ether_sprintf(eaddr));
 	/* initialize interface information */
 	ifp = GET_IFP(sc);
 	ifp->if_softc = sc;
 	ifp->if_mtu = ETHERMTU;
 	strncpy(ifp->if_xname, device_xname(self), IFNAMSIZ);
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_start = url_start;
 @@ -311,27 +308,26 @@ url_attach(device_t parent, device_t sel
 		ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_NONE);
 	} else
 		ifmedia_set(&mii->mii_media, IFM_ETHER | IFM_AUTO);
 	/* attach the interface */
 	if_attach(ifp);
 	ether_ifattach(ifp, eaddr);
 	rnd_attach_source(&sc->rnd_source, device_xname(self),
 	    RND_TYPE_NET, RND_FLAG_DEFAULT);
 	callout_init(&sc->sc_stat_ch, 0);
 	sc->sc_attached = 1;
 	splx(s);
 	usbd_add_drv_event(USB_EVENT_DRIVER_ATTACH, dev, sc->sc_dev);
 	return;
  bad:
 	sc->sc_dying = 1;
 	return;
+}
 /* detach */
 int
 url_detach(device_t self, int flags)

 @@ -1,37 +1,37 @@
-/*	$NetBSD: if_urndis.c,v 1.9.4.14 2016/12/29 08:04:08 skrll Exp $ */
+/*	$NetBSD: if_urndis.c,v 1.9.4.15 2017/01/26 12:40:16 skrll 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.9.4.14 2016/12/29 08:04:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urndis.c,v 1.9.4.15 2017/01/26 12:40:16 skrll Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/rwlock.h>
 #include <sys/mbuf.h>
 #include <sys/kmem.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 @@ -1036,29 +1036,29 @@ urndis_watchdog(struct ifnet *ifp)
 	ifp->if_oerrors++;
 	printf("%s: watchdog timeout\n", DEVNAME(sc));
 	urndis_ctrl_keepalive(sc);
+}
 #endif
 static int
 urndis_init(struct ifnet *ifp)
+{
 	struct urndis_softc *sc = ifp->if_softc;
-	mutex_enter(&sc->urndis_lock);
+	mutex_enter(&sc->sc_lock);
 	int ret = urndis_init_locked(ifp);
-	mutex_exit(&sc->urndis_lock);
+	mutex_exit(&sc->sc_lock);
 	return ret;
+}
 static int
 urndis_init_locked(struct ifnet *ifp)
+{
 	struct urndis_softc	*sc;
 	int			 i;
 	int 			 err;
 	usbd_status		 usberr;
 	sc = ifp->if_softc;
 @@ -1120,29 +1120,29 @@ fail4:
 fail3:
 	usbd_close_pipe(sc->sc_bulkout_pipe);
 fail2:
 	usbd_close_pipe(sc->sc_bulkin_pipe);
 fail:
 	return EIO;
+}
 static void
 urndis_stop(struct ifnet *ifp)
+{
 	struct urndis_softc *sc = ifp->if_softc;
-	mutex_enter(&sc->urndis_lock);
+	mutex_enter(&sc->sc_lock);
 	urndis_stop_locked(ifp);
-	mutex_exit(&sc->urndis_lock);
+	mutex_exit(&sc->sc_lock);
+}
 static void
 urndis_stop_locked(struct ifnet *ifp)
+{
 	struct urndis_softc	*sc;
 	usbd_status	 err;
 	sc = ifp->if_softc;
 	ifp->if_timer = 0;
 	ifp->if_flags &= ~(IFF_RUNNING | IFF_OACTIVE);
 @@ -1178,29 +1178,29 @@ urndis_stop_locked(struct ifnet *ifp)
 		if (err)
 			printf("%s: close tx pipe failed: %s\n",
 			    DEVNAME(sc), usbd_errstr(err));
 		sc->sc_bulkout_pipe = NULL;
+	}
+}
 static void
 urndis_start(struct ifnet *ifp)
+{
 	struct urndis_softc *sc = ifp->if_softc;
 	KASSERT(ifp->if_extflags & IFEF_START_MPSAFE);
-	mutex_enter(&sc->urndis_txlock);
+	mutex_enter(&sc->sc_txlock);
 	urndis_start_locked(ifp);
-	mutex_exit(&sc->urndis_txlock);
+	mutex_exit(&sc->sc_txlock);
+}
 static void
 urndis_start_locked(struct ifnet *ifp)
+{
 	struct urndis_softc	*sc;
 	struct mbuf		*m_head = NULL;
 	sc = ifp->if_softc;
 	if (sc->sc_dying || (ifp->if_flags & IFF_OACTIVE))
 		return;
 @@ -1466,29 +1466,29 @@ urndis_attach(device_t parent, device_t
 			    sc->sc_bulkin_no,
 			    sc->sc_bulkout_no));
 			goto found;
+		}
+	}
 	if (sc->sc_bulkin_no == -1)
 		aprint_error("%s: could not find data bulk in\n", DEVNAME(sc));
 	if (sc->sc_bulkout_no == -1 )
 		aprint_error("%s: could not find data bulk out\n",DEVNAME(sc));
 	return;
 found:
-	mutex_init(&sc->urndis_lock, MUTEX_DEFAULT, IPL_NONE);
+	mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_NONE);
-	mutex_init(&sc->urndis_txlock, MUTEX_DEFAULT, IPL_SOFTUSB);
+	mutex_init(&sc->sc_txlock, MUTEX_DEFAULT, IPL_SOFTUSB);
-	mutex_init(&sc->urndis_rxlock, MUTEX_DEFAULT, IPL_SOFTUSB);
+	mutex_init(&sc->sc_rxlock, MUTEX_DEFAULT, IPL_SOFTUSB);
 	ifp = GET_IFP(sc);
 	ifp->if_softc = sc;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
 	ifp->if_extflags = IFEF_START_MPSAFE;
 	ifp->if_start = urndis_start;
 	ifp->if_ioctl = urndis_ioctl;
 	ifp->if_init = urndis_init;
 #if 0
 	ifp->if_watchdog = urndis_watchdog;
 #endif
 	strlcpy(ifp->if_xname, DEVNAME(sc), IFNAMSIZ);
 @@ -1527,29 +1527,29 @@ found:
 		urndis_stop(ifp);
 		goto fail;
+	}
 	if_initialize(ifp);
 	sc->urndis_ipq = if_percpuq_create(&sc->sc_ec.ec_if);
 	ether_ifattach(ifp, eaddr);
 	if_register(ifp);
 	sc->sc_attached = 1;
 	return;
 fail:
-	mutex_destroy(&sc->urndis_lock);
+	mutex_destroy(&sc->sc_lock);
-	mutex_destroy(&sc->urndis_txlock);
+	mutex_destroy(&sc->sc_txlock);
-	mutex_destroy(&sc->urndis_rxlock);
+	mutex_destroy(&sc->sc_rxlock);
+}
 static int
 urndis_detach(device_t self, int flags)
+{
 	struct urndis_softc	*sc;
 	struct ifnet		*ifp;
 	int			 s;
 	sc = device_private(self);
 	DPRINTF(("urndis_detach: %s flags %u\n", DEVNAME(sc),
 	    flags));
 @@ -1558,29 +1558,29 @@ urndis_detach(device_t self, int flags)
 		return 0;
 	s = splusb();
 	ifp = GET_IFP(sc);
 	if (ifp->if_softc != NULL) {
 		ether_ifdetach(ifp);
 		if_detach(ifp);
+	}
 	urndis_stop(ifp);
-	mutex_destroy(&sc->urndis_rxlock);
+	mutex_destroy(&sc->sc_rxlock);
-	mutex_destroy(&sc->urndis_txlock);
+	mutex_destroy(&sc->sc_txlock);
-	mutex_destroy(&sc->urndis_lock);
+	mutex_destroy(&sc->sc_lock);
 	sc->sc_attached = 0;
 	splx(s);
 	return 0;
+}
 static int
 urndis_activate(device_t self, enum devact act)
+{
 	struct urndis_softc *sc;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_urndisreg.h,v 1.1.32.4 2016/12/28 08:55:20 skrll Exp $ */
+/*	$NetBSD: if_urndisreg.h,v 1.1.32.5 2017/01/26 12:40:16 skrll Exp $ */
 /*	$OpenBSD: if_urndisreg.h,v 1.14 2010/07/08 18:22:01 ckuethe 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
 @@ -32,29 +32,29 @@ struct urndis_chain {
 	int			 sc_idx;
 };
 struct urndis_cdata {
 	struct urndis_chain	sc_rx_chain[RNDIS_RX_LIST_CNT];
 	struct urndis_chain	sc_tx_chain[RNDIS_TX_LIST_CNT];
 	int			sc_tx_cnt;
 };
 #define GET_IFP(sc) (&(sc)->sc_ec.ec_if)
 struct urndis_softc {
 	device_t			sc_dev;
-	kmutex_t			urndis_lock;
+	kmutex_t			sc_lock;
-	kmutex_t			urndis_txlock;
+	kmutex_t			sc_txlock;
-	kmutex_t			urndis_rxlock;
+	kmutex_t			sc_rxlock;
 	char				sc_attached;
 	int				sc_dying;
 	struct ethercom			sc_ec;
 	/* RNDIS device info */
 	uint32_t			sc_lim_pktsz;
 	uint32_t			sc_filter;
 	/* USB goo */
 	struct usbd_device *		sc_udev;
 	int				sc_ifaceno_ctl;
 	struct usbd_interface *		sc_iface_ctl;