 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_atu.c,v 1.57 2018/05/01 16:18:13 maya Exp $ */
+/*	$NetBSD: if_atu.c,v 1.58 2018/06/03 10:59:35 maxv 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.57 2018/05/01 16:18:13 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1.58 2018/06/03 10:59:35 maxv 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>
 @@ -98,27 +98,27 @@ __KERNEL_RCSID(0, "$NetBSD: if_atu.c,v 1
 #ifdef ATU_DEBUG
 #define DPRINTF(x)	do { if (atudebug) printf x; } while (0)
 #define DPRINTFN(n,x)	do { if (atudebug>(n)) printf x; } while (0)
 int atudebug = 1;
 #else
 #define DPRINTF(x)
 #define DPRINTFN(n,x)
 #endif
 /*
  * Various supported device vendors/products/radio type.
  */
-struct atu_type atu_devs[] = {
+static const struct atu_type atu_devs[] = {
 	{ USB_VENDOR_3COM,	USB_PRODUCT_3COM_3CRSHEW696,
 	  RadioRFMD,		ATU_NO_QUIRK },
 	{ USB_VENDOR_ABOCOM,	USB_PRODUCT_ABOCOM_BWU613,
 	  RadioRFMD,		ATU_NO_QUIRK },
 	{ USB_VENDOR_ACCTON,	USB_PRODUCT_ACCTON_2664W,
 	  AT76C503_rfmd_acc,	ATU_NO_QUIRK },
 	{ USB_VENDOR_ACERP,	USB_PRODUCT_ACERP_AWL300,
 	  RadioIntersil,	ATU_NO_QUIRK },
 	{ USB_VENDOR_ACERP,	USB_PRODUCT_ACERP_AWL400,
 	  RadioRFMD,		ATU_NO_QUIRK },
 	{ USB_VENDOR_ACTIONTEC,	USB_PRODUCT_ACTIONTEC_UAT1,
 	  RadioRFMD,		ATU_NO_QUIRK },
 	{ USB_VENDOR_ADDTRON,	USB_PRODUCT_ADDTRON_AWU120,
 @@ -1091,27 +1091,27 @@ atu_get_card_config(struct atu_softc *sc
 	return 0;
+}
 /*
  * Probe for an AT76c503 chip.
  */
 int
 atu_match(device_t parent, cfdata_t match, void *aux)
+{
 	struct usb_attach_arg *uaa = aux;
 	int			i;
 	for (i = 0; i < __arraycount(atu_devs); i++) {
-		struct atu_type *t = &atu_devs[i];
+		const struct atu_type *t = &atu_devs[i];
 		if (uaa->uaa_vendor == t->atu_vid &&
 		    uaa->uaa_product == t->atu_pid) {
 			return(UMATCH_VENDOR_PRODUCT);
+		}
+	}
 	return(UMATCH_NONE);
+}
 int
 atu_media_change(struct ifnet *ifp)
+{
 	struct atu_softc	*sc = ifp->if_softc;
 @@ -1270,27 +1270,27 @@ atu_attach(device_t parent, device_t sel
 	if (err) {
 		aprint_error_dev(self, "getting interface handle failed\n");
 		return;
+	}
 	sc->atu_unit = device_unit(self);
 	sc->atu_udev = dev;
 	/*
 	 * look up the radio_type for the device
 	 * basically does the same as atu_match
 	 */
 	for (i = 0; i < __arraycount(atu_devs); i++) {
-		struct atu_type *t = &atu_devs[i];
+		const struct atu_type *t = &atu_devs[i];
 		if (uaa->uaa_vendor == t->atu_vid &&
 		    uaa->uaa_product == t->atu_pid) {
 			sc->atu_radio = t->atu_radio;
 			sc->atu_quirk = t->atu_quirk;
+		}
+	}
 	/*
 	 * Check in the interface descriptor if we're in DFU mode
 	 * If we're in DFU mode, we upload the external firmware
 	 * If we're not, the PC must have rebooted without power-cycling
 	 * the device.. I've tried this out, a reboot only requeres the