 @@ -1,14 +1,14 @@
-/*	$NetBSD: awi.c,v 1.98 2019/05/28 07:41:48 msaitoh Exp $	*/
+/*	$NetBSD: awi.c,v 1.99 2019/12/05 03:11:40 msaitoh Exp $	*/
 /*-
  * Copyright (c) 1999,2000,2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Bill Sommerfeld
+ *
  * 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.
 @@ -68,27 +68,27 @@
  */
 /*
  * Driver for AMD 802.11 PCnetMobile firmware.
  * Uses am79c930 chip driver to talk to firmware running on the am79c930.
+ *
  * The initial version of the driver was written by
  * Bill Sommerfeld <sommerfeld@NetBSD.org>.
  * Then the driver module completely rewritten to support cards with DS phy
  * and to support adhoc mode by Atsushi Onoe <onoe@NetBSD.org>
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.98 2019/05/28 07:41:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awi.c,v 1.99 2019/12/05 03:11:40 msaitoh Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/proc.h>
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/errno.h>
 #include <sys/endian.h>
 @@ -823,55 +823,50 @@ awi_watchdog(struct ifnet *ifp)
 		} else
 			ifp->if_timer = 1;
+	}
 	/* TODO: rate control */
 	ieee80211_watchdog(&sc->sc_ic);
   out:
 	sc->sc_cansleep = ocansleep;
+}
 static int
 awi_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	struct awi_softc *sc = ifp->if_softc;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error;
 	s = splnet();
 	/* Serialize ioctl, since we may sleep */
 	if ((error = awi_lock(sc)) != 0)
 		goto cantlock;
 	switch (cmd) {
 	case SIOCSIFFLAGS:
 		if ((error = ifioctl_common(ifp, cmd, data)) != 0)
 			break;
 		if (ifp->if_flags & IFF_UP) {
 			if (sc->sc_enabled) {
 				/*
 				 * To avoid rescanning another access point,
 				 * do not call awi_init() here.  Instead,
 				 * only reflect promisc mode settings.
 				 */
 				error = awi_mode_init(sc);
 			} else
 				error = awi_init(ifp);
 		} else if (sc->sc_enabled)
 			awi_stop(ifp, 1);
 		break;
 	case SIOCSIFMEDIA:
 	case SIOCGIFMEDIA:
 		error = ifmedia_ioctl(ifp, ifr, &sc->sc_ic.ic_media, cmd);
 		break;
 	case SIOCADDMULTI:
 	case SIOCDELMULTI:
 		error = ether_ioctl(ifp, cmd, data);
 		if (error == ENETRESET) {
 			/* Do not rescan */
 			if (ifp->if_flags & IFF_RUNNING)
 				error = awi_mode_init(sc);
 			else
 				error = 0;
+		}
 		break;
 	default:
 		error = ieee80211_ioctl(&sc->sc_ic, cmd, data);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: wi.c,v 1.253 2019/05/28 07:41:48 msaitoh Exp $	*/
+/*	$NetBSD: wi.c,v 1.254 2019/12/05 03:11:40 msaitoh Exp $	*/
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Charles M. Hannum.
+ *
  * 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.
 @@ -89,27 +89,27 @@
  * WaveLAN/IEEE cards. Note however that the ISA card isn't really
  * anything of the sort: it's actually a PCMCIA bridge adapter
  * that fits into an ISA slot, into which a PCMCIA WaveLAN card is
  * inserted. Consequently, you need to use the pccard support for
  * both the ISA and PCMCIA adapters.
  */
 /*
  * FreeBSD driver ported to NetBSD by Bill Sommerfeld in the back of the
  * Oslo IETF plenary meeting.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.253 2019/05/28 07:41:48 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wi.c,v 1.254 2019/12/05 03:11:40 msaitoh Exp $");
 #define WI_HERMES_AUTOINC_WAR	/* Work around data write autoinc bug. */
 #define WI_HERMES_STATS_WAR	/* Work around stats counter bug. */
 #undef WI_HISTOGRAM
 #undef WI_RING_DEBUG
 #define STATIC static
 #include <sys/param.h>
 #include <sys/sysctl.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/device.h>
 @@ -1409,27 +1409,26 @@ wi_ioctl_drain(struct wi_softc *sc)
 	mutex_exit(&sc->sc_ioctl_mtx);
 	wi_ioctl_exit(sc);
 	mutex_destroy(&sc->sc_ioctl_mtx);
 	cv_destroy(&sc->sc_ioctl_cv);
+}
 STATIC int
 wi_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	struct wi_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifreq *ifr = (struct ifreq *)data;
 	int s, error = 0;
 	if (!device_is_active(sc->sc_dev))
 		return ENXIO;
 	s = splnet();
 	if ((error = wi_ioctl_enter(sc)) != 0) {
 		splx(s);
 		return error;
+	}
 	switch (cmd) {
 @@ -1443,30 +1442,26 @@ wi_ioctl(struct ifnet *ifp, u_long cmd,
 		 */
 		if (ifp->if_flags & IFF_UP) {
 			if (sc->sc_enabled) {
 				if (ic->ic_opmode != IEEE80211_M_HOSTAP &&
 				    (ifp->if_flags & IFF_PROMISC) != 0)
 					wi_write_val(sc, WI_RID_PROMISC, 1);
 				else
 					wi_write_val(sc, WI_RID_PROMISC, 0);
 			} else
 				error = wi_init(ifp);
 		} else if (sc->sc_enabled)
 			wi_stop(ifp, 1);
 		break;
 	case SIOCSIFMEDIA:
 	case SIOCGIFMEDIA:
 		error = ifmedia_ioctl(ifp, ifr, &ic->ic_media, cmd);
 		break;
 	case SIOCADDMULTI:
 	case SIOCDELMULTI:
 		if ((error = ether_ioctl(ifp, cmd, data)) == ENETRESET) {
 			if (ifp->if_flags & IFF_RUNNING) {
 				/* do not rescan */
 				error = wi_write_multi(sc);
 			} else
 				error = 0;
+		}
 		break;
 	case SIOCGIFGENERIC:
 		error = wi_get_cfg(ifp, cmd, data);
 		break;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_atu.c,v 1.67 2019/12/01 12:47:10 maxv Exp $ */
+/*	$NetBSD: if_atu.c,v 1.68 2019/12/05 03:11:41 msaitoh Exp $ */
 /*	$OpenBSD: if_atu.c,v 1.48 2004/12/30 01:53:21 dlg Exp $ */
 /*
  * Copyright (c) 2003, 2004
  *	Daan Vreeken <Danovitsch@Vitsch.net>.  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.
 @@ -38,27 +38,27 @@
+ *
  * Originally written by Daan Vreeken <Danovitsch @ Vitsch . net>
  *  http://vitsch.net/bsd/atuwi
+ *
  * Contributed to by :
  *  Chris Whitehouse, Alistair Phillips, Peter Pilka, Martijn van Buul,
  *  Suihong Liang, Arjan van Leeuwen, Stuart Walsh
+ *
  * Ported to OpenBSD by Theo de Raadt and David Gwynne.
  * Ported to NetBSD by Jesse Off
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.67 2019/12/01 12:47:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.68 2019/12/05 03:11:41 msaitoh Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/kthread.h>
 #include <sys/queue.h>
 @@ -2128,37 +2128,31 @@ atu_debug_print(struct atu_softc *sc)
 	    tmp));
 	if ((err = atu_get_mib(sc, MIB_MAC_MGMT__CURRENT_ESSID, tmp)))
 		return;
 	DPRINTF(("%s: DEBUG: current ESSID=%s\n", device_xname(sc->atu_dev),
 	    tmp));
+}
 #endif /* ATU_DEBUG */
 static int
 atu_ioctl(struct ifnet *ifp, u_long command, void *data)
+{
 	struct atu_softc	*sc = ifp->if_softc;
 	struct ifreq		*ifr = (struct ifreq *)data;
 	struct ieee80211com	*ic = &sc->sc_ic;
 	int			err = 0, s;
 	s = splnet();
 	switch (command) {
 	case SIOCSIFMEDIA:
 	case SIOCGIFMEDIA:
 		err = ifmedia_ioctl(ifp, ifr, &ic->ic_media, command);
 		break;
 	default:
 		DPRINTFN(15, ("%s: ieee80211_ioctl (%lu)\n",
 		    device_xname(sc->atu_dev), command));
 		err = ieee80211_ioctl(ic, command, data);
 		break;
+	}
 	if (err == ENETRESET) {
 		if ((ifp->if_flags & (IFF_RUNNING|IFF_UP)) ==
 		    (IFF_RUNNING|IFF_UP)) {
 			DPRINTF(("%s: atu_ioctl(): netreset %lu\n",
 			    device_xname(sc->atu_dev), command));
 			ieee80211_new_state(ic, IEEE80211_S_INIT, -1);