 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_cpsw.c,v 1.25 2019/05/29 06:17:27 msaitoh Exp $	*/
+/*	$NetBSD: if_cpsw.c,v 1.25.2.1 2020/01/28 11:01:37 martin Exp $	*/
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
  * 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.
 @@ -43,27 +43,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.25 2019/05/29 06:17:27 msaitoh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.25.2.1 2020/01/28 11:01:37 martin Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/intr.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <net/if.h>
 #include <net/if_ether.h>
 @@ -1533,19 +1533,21 @@ cpsw_ale_update_addresses(struct cpsw_so
 	cpsw_ale_entry_init(ale_entry);
 	cpsw_ale_entry_set_bcast_mac(ale_entry);
 	cpsw_ale_entry_set(ale_entry, ALE_ENTRY_TYPE, ALE_TYPE_ADDRESS);
 	cpsw_ale_entry_set(ale_entry, ALE_MCAST_FWD_STATE, ALE_FWSTATE_FWONLY);
 	cpsw_ale_entry_set(ale_entry, ALE_PORT_MASK, ALE_PORT_MASK_ALL);
 	cpsw_ale_write_entry(sc, 1, ale_entry);
 	/* SIOCDELMULTI doesn't specify the particular address
 	   being removed, so we have to remove all and rebuild. */
 	if (purge)
 		cpsw_ale_remove_all_mc_entries(sc);
 	/* Set other multicast addrs desired. */
 	ETHER_LOCK(ec);
 	LIST_FOREACH(ifma, &ec->ec_multiaddrs, enm_list) {
 		cpsw_ale_mc_entry_set(sc, ALE_PORT_MASK_ALL, ifma->enm_addrlo);
+	}
 	ETHER_UNLOCK(ec);
 	return 0;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_cpsw.c,v 1.6.2.1 2019/11/27 13:46:45 martin Exp $	*/
+/*	$NetBSD: if_cpsw.c,v 1.6.2.2 2020/01/28 11:01:37 martin Exp $	*/
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
  * 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.
 @@ -43,27 +43,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.6.2.1 2019/11/27 13:46:45 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: if_cpsw.c,v 1.6.2.2 2020/01/28 11:01:37 martin Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/intr.h>
 #include <sys/kmem.h>
 #include <sys/mutex.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <net/if.h>
 #include <net/if_ether.h>
 @@ -1545,19 +1545,21 @@ cpsw_ale_update_addresses(struct cpsw_so
 	cpsw_ale_entry_init(ale_entry);
 	cpsw_ale_entry_set_bcast_mac(ale_entry);
 	cpsw_ale_entry_set(ale_entry, ALE_ENTRY_TYPE, ALE_TYPE_ADDRESS);
 	cpsw_ale_entry_set(ale_entry, ALE_MCAST_FWD_STATE, ALE_FWSTATE_FWONLY);
 	cpsw_ale_entry_set(ale_entry, ALE_PORT_MASK, ALE_PORT_MASK_ALL);
 	cpsw_ale_write_entry(sc, 1, ale_entry);
 	/* SIOCDELMULTI doesn't specify the particular address
 	   being removed, so we have to remove all and rebuild. */
 	if (purge)
 		cpsw_ale_remove_all_mc_entries(sc);
 	/* Set other multicast addrs desired. */
 	ETHER_LOCK(ec);
 	LIST_FOREACH(ifma, &ec->ec_multiaddrs, enm_list) {
 		cpsw_ale_mc_entry_set(sc, ALE_PORT_MASK_ALL, ifma->enm_addrlo);
+	}
 	ETHER_UNLOCK(ec);
 	return 0;
+}

 @@ -1,35 +1,35 @@
-/*	$NetBSD: if_vmx.c,v 1.45.2.5 2019/12/26 20:19:37 martin Exp $	*/
+/*	$NetBSD: if_vmx.c,v 1.45.2.6 2020/01/28 11:01:37 martin Exp $	*/
 /*	$OpenBSD: if_vmx.c,v 1.16 2014/01/22 06:04:17 brad Exp $	*/
 /*
  * Copyright (c) 2013 Tsubai Masanari
  * Copyright (c) 2013 Bryan Venteicher <bryanv@FreeBSD.org>
+ *
  * 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_vmx.c,v 1.45.2.5 2019/12/26 20:19:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.45.2.6 2020/01/28 11:01:37 martin Exp $");
 #include <sys/param.h>
 #include <sys/cpu.h>
 #include <sys/kernel.h>
 #include <sys/kmem.h>
 #include <sys/bus.h>
 #include <sys/device.h>
 #include <sys/mbuf.h>
 #include <sys/sockio.h>
 #include <sys/pcq.h>
 #include <sys/workqueue.h>
 #include <sys/interrupt.h>
 @@ -3310,63 +3310,61 @@ vmxnet3_set_rxfilter(struct vmxnet3_soft
 	uint8_t *p;
 	ds->mcast_tablelen = 0;
 	ETHER_LOCK(ec);
 	CLR(ec->ec_flags, ETHER_F_ALLMULTI);
 	ETHER_UNLOCK(ec);
 	/*
 	 * Always accept broadcast frames.
 	 * Always accept frames destined to our station address.
 	 */
 	mode = VMXNET3_RXMODE_BCAST | VMXNET3_RXMODE_UCAST;
 	ETHER_LOCK(ec);
 	if (ISSET(ifp->if_flags, IFF_PROMISC) ||
 	    ec->ec_multicnt > VMXNET3_MULTICAST_MAX)
 		goto allmulti;
 	p = sc->vmx_mcast;
 	ETHER_LOCK(ec);
 	ETHER_FIRST_MULTI(step, ec, enm);
 	while (enm != NULL) {
 		if (memcmp(enm->enm_addrlo, enm->enm_addrhi, ETHER_ADDR_LEN)) {
 			ETHER_UNLOCK(ec);
 			/*
 			 * We must listen to a range of multicast addresses.
 			 * For now, just accept all multicasts, rather than
 			 * trying to set only those filter bits needed to match
 			 * the range.  (At this time, the only use of address
 			 * ranges is for IP multicast routing, for which the
 			 * range is big enough to require all bits set.)
 			 */
 			goto allmulti;
+		}
 		memcpy(p, enm->enm_addrlo, ETHER_ADDR_LEN);
 		p += ETHER_ADDR_LEN;
 		ETHER_NEXT_MULTI(step, enm);
+	}
 	ETHER_UNLOCK(ec);
 	if (ec->ec_multicnt > 0) {
 		SET(mode, VMXNET3_RXMODE_MCAST);
 		ds->mcast_tablelen = p - sc->vmx_mcast;
+	}
 	ETHER_UNLOCK(ec);
 	goto setit;
 allmulti:
 	ETHER_LOCK(ec);
 	SET(ec->ec_flags, ETHER_F_ALLMULTI);
 	ETHER_UNLOCK(ec);
 	SET(mode, (VMXNET3_RXMODE_ALLMULTI | VMXNET3_RXMODE_MCAST));
 	if (ifp->if_flags & IFF_PROMISC)
 		SET(mode, VMXNET3_RXMODE_PROMISC);
 setit:
 	vmxnet3_write_cmd(sc, VMXNET3_CMD_SET_FILTER);
 	ds->rxmode = mode;
 	vmxnet3_write_cmd(sc, VMXNET3_CMD_SET_RXMODE);
+}
 int

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_iy.c,v 1.109.2.1 2019/11/14 15:38:02 martin Exp $	*/
+/*	$NetBSD: if_iy.c,v 1.109.2.2 2020/01/28 11:01:37 martin Exp $	*/
 /* #define IYDEBUG */
 /* #define IYMEMDEBUG */
 /*-
  * Copyright (c) 1996,2001 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Ignatios Souvatzis.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -29,27 +29,27 @@
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Supported hardware:
+ *
  * - Intel EtherExpress Pro/10.
  * - possibly other boards using the i82595 chip and no special tweaks.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.109.2.1 2019/11/14 15:38:02 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iy.c,v 1.109.2.2 2020/01/28 11:01:37 martin Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 #include <sys/buf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 @@ -1295,52 +1295,52 @@ iy_mc_setup(struct iy_softc *sc)
 	bus_space_handle_t ioh;
 	int avail, last /*, end*/ , len;
 	int timeout;
 	volatile uint16_t dum;
 	uint8_t temp;
 	ecp = &sc->sc_ethercom;
 	ifp = &ecp->ec_if;
 	iot = sc->sc_iot;
 	ioh = sc->sc_ioh;
 	ETHER_LOCK(ecp);
 	len = 6 * ecp->ec_multicnt;
 	avail = sc->tx_start - sc->tx_end;
 	if (avail <= 0)
 		avail += sc->tx_size;
 	if (ifp->if_flags & IFF_DEBUG)
 		printf("%s: iy_mc_setup called, %d addresses, "
 		    "%d/%d bytes needed/avail\n", ifp->if_xname,
 		    ecp->ec_multicnt, len + I595_XMT_HDRLEN, avail);
 	last = sc->rx_size;
 	bus_space_write_1(iot, ioh, 0, BANK_SEL(2));
 	bus_space_write_1(iot, ioh, RECV_MODES_REG, MATCH_BRDCST);
 	/* XXX VOODOO */
 	temp = bus_space_read_1(iot, ioh, MEDIA_SELECT);
 	bus_space_write_1(iot, ioh, MEDIA_SELECT, temp);
 	/* XXX END OF VOODOO */
 	bus_space_write_1(iot, ioh, 0, BANK_SEL(0));
 	bus_space_write_2(iot, ioh, HOST_ADDR_REG, last);
 	bus_space_write_stream_2(iot, ioh, MEM_PORT_REG, htole16(MC_SETUP_CMD));
 	bus_space_write_2(iot, ioh, MEM_PORT_REG, 0);
 	bus_space_write_2(iot, ioh, MEM_PORT_REG, 0);
 	bus_space_write_stream_2(iot, ioh, MEM_PORT_REG, htole16(len));
 	ETHER_LOCK(ecp);
 	ETHER_FIRST_MULTI(step, ecp, enm);
 	while (enm) {
 		/*
 		 * XXX ALIGNMENT LOSSAGE HERE?
 		 */
 		bus_space_write_multi_stream_2(iot, ioh, MEM_PORT_REG,
 		    (uint16_t *) enm->enm_addrlo, 3);
 		ETHER_NEXT_MULTI(step, enm);
+	}
 	ETHER_UNLOCK(ecp);
 	dum = bus_space_read_2(iot, ioh, MEM_PORT_REG); /* dummy read */
 	__USE(dum);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_de.c,v 1.163 2019/05/29 10:07:29 msaitoh Exp $	*/
+/*	$NetBSD: if_de.c,v 1.163.2.1 2020/01/28 11:01:37 martin Exp $	*/
 /*-
  * Copyright (c) 1994-1997 Matt Thomas (matt@3am-software.com)
  * 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. The name of the author may not be used to endorse or promote products
  *    derived from this software without specific prior written permission
+ *
 @@ -27,27 +27,27 @@
+ *
  */
 /*
  * DEC 21040 PCI Ethernet Controller
+ *
  * Written by Matt Thomas
  * BPF support code stolen directly from if_ec.c
+ *
  *   This driver supports the DEC DE435 or any other PCI
  *   board which support 21040, 21041, or 21140 (mostly).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.163 2019/05/29 10:07:29 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_de.c,v 1.163.2.1 2020/01/28 11:01:37 martin Exp $");
 #define	TULIP_HDR_DATA
 #ifdef __NetBSD__
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 #include <sys/socket.h>
 @@ -3208,65 +3208,64 @@ tulip_addr_filter(tulip_softc_t * const
 	struct ethercom *ec = TULIP_ETHERCOM(sc);
 	struct ether_multistep step;
 	struct ether_multi *enm;
 	sc->tulip_flags
 	    &= ~(TULIP_WANTHASHPERFECT | TULIP_WANTHASHONLY | TULIP_ALLMULTI);
 	sc->tulip_flags |= TULIP_WANTSETUP | TULIP_WANTTXSTART;
 	sc->tulip_cmdmode &= ~TULIP_CMD_RXRUN;
 	sc->tulip_intrmask &= ~TULIP_STS_RXSTOPPED;
 #if defined(IFF_ALLMULTI)
 	sc->tulip_if.if_flags &= ~IFF_ALLMULTI;
 #endif
 	sc->tulip_if.if_start = tulip_ifstart;	/* so the setup packet gets queued */
 	ETHER_LOCK(ec);
 	if (sc->tulip_multicnt > 14) {
 		uint32_t *sp = sc->tulip_setupdata;
 		unsigned hash;
 		/*
 		 * Some early passes of the 21140 have broken implementations
 		 * of hash-perfect mode. When we get too many multicasts for
 		 * perfect filtering with these chips, we need to switch into
 		 * hash-only mode (this is better than all-multicast on network
 		 * with lots of multicast traffic).
 		 */
 		if (sc->tulip_features & TULIP_HAVE_BROKEN_HASH)
 			sc->tulip_flags |= TULIP_WANTHASHONLY;
 		else
 			sc->tulip_flags |= TULIP_WANTHASHPERFECT;
 		/*
 		 * If we have more than 14 multicasts, we have go into hash
 		 * perfect mode (512 bit multicast hash and one perfect
 		 * hardware).
 		 */
 		memset(sc->tulip_setupdata, 0, sizeof(sc->tulip_setupdata));
 		ETHER_LOCK(ec);
 		ETHER_FIRST_MULTI(step, ec, enm);
 		while (enm != NULL) {
 			if (memcmp(enm->enm_addrlo, enm->enm_addrhi, 6) == 0) {
 				hash = tulip_mchash(enm->enm_addrlo);
 #if BYTE_ORDER == BIG_ENDIAN
 				sp[hash >> 4] |= bswap32(1 << (hash & 0xF));
 #else
 				sp[hash >> 4] |= 1 << (hash & 0xF);
 #endif
 			} else {
 				sc->tulip_flags |= TULIP_ALLMULTI;
 				sc->tulip_flags &= ~(TULIP_WANTHASHONLY
 				    | TULIP_WANTHASHPERFECT);
 				break;
+			}
 			ETHER_NEXT_MULTI(step, enm);
+		}
 		ETHER_UNLOCK(ec);
 		/*
 		 * No reason to use a hash if we are going to be
 		 * receiving every multicast.
 		 */
 		if ((sc->tulip_flags & TULIP_ALLMULTI) == 0) {
 			hash = tulip_mchash(etherbroadcastaddr);
 #if BYTE_ORDER == BIG_ENDIAN
 			sp[hash >> 4] |= bswap32(1 << (hash & 0xF));
 #else
 			sp[hash >> 4] |= 1 << (hash & 0xF);
 #endif
 			if (sc->tulip_flags & TULIP_WANTHASHONLY) {
 				hash = tulip_mchash(sc->tulip_enaddr);
 @@ -3278,26 +3277,27 @@ tulip_addr_filter(tulip_softc_t * const
 			} else {
 #if BYTE_ORDER == BIG_ENDIAN
 				sp[39] = ((uint16_t *) sc->tulip_enaddr)[0] << 16;
 				sp[40] = ((uint16_t *) sc->tulip_enaddr)[1] << 16;
 				sp[41] = ((uint16_t *) sc->tulip_enaddr)[2] << 16;
 #else
 				sp[39] = ((uint16_t *) sc->tulip_enaddr)[0];
 				sp[40] = ((uint16_t *) sc->tulip_enaddr)[1];
 				sp[41] = ((uint16_t *) sc->tulip_enaddr)[2];
 #endif
+			}
+		}
+	}
 	ETHER_UNLOCK(ec);
 	if ((sc->tulip_flags & (TULIP_WANTHASHPERFECT | TULIP_WANTHASHONLY))
 	    == 0) {
 		uint32_t *sp = sc->tulip_setupdata;
 		int idx = 0;
 		if ((sc->tulip_flags & TULIP_ALLMULTI) == 0) {
 			/*
 			 * Else can get perfect filtering for 16 addresses.
 			 */
 			ETHER_LOCK(ec);
 			ETHER_FIRST_MULTI(step, ec, enm);
 			for (; enm != NULL; idx++) {
 				if (memcmp(enm->enm_addrlo, enm->enm_addrhi, 6) == 0) {
 #if BYTE_ORDER == BIG_ENDIAN

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ray.c,v 1.94.2.1 2019/10/23 19:43:24 martin Exp $	*/
+/*	$NetBSD: if_ray.c,v 1.94.2.2 2020/01/28 11:01:37 martin Exp $	*/
 /*
  * Copyright (c) 2000 Christian E. Hopps
  * 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.
 @@ -47,27 +47,27 @@
+ *
  *	N.B. Its unclear yet whether the Aviator 2.4 cards interoperate
  *	with other 802.11 FH 2Mbps cards, since this was also untested.
  *	Given the nature of the buggy build 4 firmware there may be problems.
+ *
  *	Authentication added by Steve Weiss <srw@alum.mit.edu> based on
  *	advice from Corey Thomas (author of the Linux RayLink driver).
  *	Authentication is currently limited to adhoc networks, and was
  *	added to support a requirement of the newest Windows drivers for
  *	the RayLink.  Tested with Aviator Pro (firmware 5.63) on Win98.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.94.2.1 2019/10/23 19:43:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ray.c,v 1.94.2.2 2020/01/28 11:01:37 martin Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/mbuf.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 @@ -2814,41 +2814,41 @@ ray_update_params(struct ray_softc *sc)
 static void
 ray_update_mcast(struct ray_softc *sc)
+{
 	bus_size_t ccs;
 	struct ether_multistep step;
 	struct ether_multi *enm;
 	struct ethercom *ec;
 	bus_size_t bufp;
 	int count;
 	ec = &sc->sc_ec;
 	ray_cmd_cancel(sc, SCP_UPD_MCAST);
 	ETHER_LOCK(ec);
 	/* see if we have any ranges */
 	if ((count = sc->sc_ec.ec_multicnt) < 17) {
 		ETHER_LOCK(ec);
 		ETHER_FIRST_MULTI(step, ec, enm);
 		while (enm) {
 			/* see if this is a range */
 			if (memcmp(enm->enm_addrlo, enm->enm_addrhi,
 				ETHER_ADDR_LEN)) {
 				count = 17;
 				break;
+			}
 			ETHER_NEXT_MULTI(step, enm);
+		}
 		ETHER_UNLOCK(ec);
+	}
 	ETHER_UNLOCK(ec);
 	/* track this stuff even when not running */
 	if (count > 16) {
 		sc->sc_if.if_flags |= IFF_ALLMULTI;
 		ray_update_promisc(sc);
 		return;
 	} else if (sc->sc_if.if_flags & IFF_ALLMULTI) {
 		sc->sc_if.if_flags &= ~IFF_ALLMULTI;
 		ray_update_promisc(sc);
+	}
 	if ((sc->sc_if.if_flags & IFF_RUNNING) == 0)
 		return;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_xi.c,v 1.90.2.1 2019/11/06 09:59:38 martin Exp $ */
+/*	$NetBSD: if_xi.c,v 1.90.2.2 2020/01/28 11:01:37 martin Exp $ */
 /*	OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp 	*/
 /*
  * Copyright (c) 2004 Charles M. Hannum.  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.
 @@ -45,27 +45,27 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * A driver for Xircom CreditCard PCMCIA Ethernet adapters.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.90.2.1 2019/11/06 09:59:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.90.2.2 2020/01/28 11:01:37 martin Exp $");
 #include "opt_inet.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/mbuf.h>
 #include <sys/malloc.h>
 #include <sys/socket.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
 @@ -954,57 +954,56 @@ xi_set_address(struct xi_softc *sc)
 	uint8_t indaddr[64];
 	DPRINTF(XID_CONFIG, ("xi_set_address()\n"));
 	enaddr = (const uint8_t *)CLLADDR(ifp->if_sadl);
 	if (sc->sc_chipset >= XI_CHIPSET_MOHAWK)
 		for (i = 0; i < 6; i++)
 			indaddr[i] = enaddr[5 - i];
 	else
 		for (i = 0; i < 6; i++)
 			indaddr[i] = enaddr[i];
 	num = 1;
 	ETHER_LOCK(ec);
 	if (ec->ec_multicnt > 9) {
 		ifp->if_flags |= IFF_ALLMULTI;
 		goto done;
+	}
 	ETHER_LOCK(ec);
 	ETHER_FIRST_MULTI(step, ec, enm);
 	for (; enm; num++) {
 		if (memcmp(enm->enm_addrlo, enm->enm_addrhi,
 		    sizeof(enm->enm_addrlo)) != 0) {
 			/*
 			 * The multicast address is really a range;
 			 * it's easier just to accept all multicasts.
 			 * XXX should we be setting IFF_ALLMULTI here?
 			 */
 			ifp->if_flags |= IFF_ALLMULTI;
 			ETHER_UNLOCK(ec);
 			goto done;
+		}
 		if (sc->sc_chipset >= XI_CHIPSET_MOHAWK)
 			for (i = 0; i < 6; i++)
 				indaddr[num * 6 + i] = enm->enm_addrlo[5 - i];
 		else
 			for (i = 0; i < 6; i++)
 				indaddr[num * 6 + i] = enm->enm_addrlo[i];
 		ETHER_NEXT_MULTI(step, enm);
+	}
 	ETHER_UNLOCK(ec);
 	ifp->if_flags &= ~IFF_ALLMULTI;
 done:
 	ETHER_UNLOCK(ec);
 	if (num < 10)
 		memset(&indaddr[num * 6], 0xff, 6 * (10 - num));
 	for (page = 0; page < 8; page++) {
 #ifdef XIDEBUG
 		if (xidebug & XID_MCAST) {
 			printf("page %d before:", page);
 			for (i = 0; i < 8; i++)
 				printf(" %02x", indaddr[page * 8 + i]);
 			printf("\n");
+		}
 #endif