 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_mos.c,v 1.5 2020/03/15 23:04:50 thorpej Exp $	*/
+/*	$NetBSD: if_mos.c,v 1.6 2020/03/31 23:26:32 nisimura Exp $	*/
 /*	$OpenBSD: if_mos.c,v 1.40 2019/07/07 06:40:10 kevlo Exp $	*/
 /*
  * Copyright (c) 2008 Johann Christian Rode <jcrode@gmx.net>
+ *
  * 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
 @@ -62,27 +62,27 @@
  * 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.
  */
 /*
  * Moschip MCS7730/MCS7830/MCS7832 USB to Ethernet controller
  * The datasheet is available at the following URL:
  * http://www.moschip.com/data/products/MCS7830/Data%20Sheet_7830.pdf
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mos.c,v 1.5 2020/03/15 23:04:50 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mos.c,v 1.6 2020/03/31 23:26:32 nisimura Exp $");
 #include <sys/param.h>
 #include <dev/usb/usbnet.h>
 #include <dev/usb/if_mosreg.h>
 #define MOS_PAUSE_REWRITES	3
 #define MOS_TIMEOUT		1000
 #define MOS_RX_LIST_CNT		1
 #define MOS_TX_LIST_CNT		1
 @@ -444,77 +444,76 @@ mos_uno_mii_statchg(struct ifnet *ifp)
+		}
 		usbnet_set_link(un, true);
+	}
 	/* re-enable TX, RX */
 	val |= (MOS_CTL_TX_ENB | MOS_CTL_RX_ENB);
 	err = mos_reg_write_1(un, MOS_CTL, val);
 	if (err)
 		aprint_error_dev(un->un_dev, "media change failed\n");
+}
 static void
-mos_setiff_locked(struct usbnet *un)
+mos_rcvfilt_locked(struct usbnet *un)
+{
 	struct ifnet		*ifp = usbnet_ifp(un);
 	struct ethercom		*ec = usbnet_ec(un);
 	struct ether_multi	*enm;
 	struct ether_multistep	step;
-	u_int32_t		h = 0;
+	u_int32_t h = 0;
-	u_int8_t		rxmode, hashtbl[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
+	u_int8_t rxmode, mchash[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
 	if (usbnet_isdying(un))
 		return;
 	rxmode = mos_reg_read_1(un, MOS_CTL);
 	rxmode &= ~(MOS_CTL_ALLMULTI | MOS_CTL_RX_PROMISC);
 	ETHER_LOCK(ec);
 	if (ifp->if_flags & IFF_PROMISC) {
 allmulti:
 		ec->ec_flags |= ETHER_F_ALLMULTI;
-		rxmode |= MOS_CTL_ALLMULTI;
+		ETHER_UNLOCK(ec);
-		if (ifp->if_flags & IFF_PROMISC)
+		/* run promisc. mode */
-			rxmode |= MOS_CTL_RX_PROMISC;
+		rxmode |= MOS_CTL_ALLMULTI; /* ??? */
-	} else {
+		rxmode |= MOS_CTL_RX_PROMISC;
-		/* now program new ones */
+		goto update;
 		ec->ec_flags &= ~ETHER_F_ALLMULTI;
 	ec->ec_flags &= ~ETHER_F_ALLMULTI;
-		ETHER_FIRST_MULTI(step, ec, enm);
+	ETHER_FIRST_MULTI(step, ec, enm);
-		while (enm != NULL) {
+	while (enm != NULL) {
-			if (memcmp(enm->enm_addrlo, enm->enm_addrhi,
+		if (memcmp(enm->enm_addrlo, enm->enm_addrhi, ETHER_ADDR_LEN)) {
-			    ETHER_ADDR_LEN)) {
+			ec->ec_flags |= ETHER_F_ALLMULTI;
-				memset(hashtbl, 0, sizeof(hashtbl));
+			ETHER_UNLOCK(ec);
-				goto allmulti;
+			memset(mchash, 0, sizeof(mchash)); /* correct ??? */
 			/* accept all mulicast frame */
-			h = ether_crc32_be(enm->enm_addrlo,
+			rxmode |= MOS_CTL_ALLMULTI;
-			    ETHER_ADDR_LEN) >> 26;
+			goto update;
 			hashtbl[h / 8] |= 1 << (h % 8);
 			ETHER_NEXT_MULTI(step, enm);
+		}
 		h = ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN);
 		/* 3(31:29) and 3(28:26) sampling to have uint8_t[8] */
 		mchash[h >> 29] |= 1 << ((h >> 26) % 8);
 		ETHER_NEXT_MULTI(step, enm);
+	}
 	ETHER_UNLOCK(ec);
 	/* MOS receive filter is always on */
  update:
 	/*
 	 * The datasheet claims broadcast frames were always accepted
 	 * regardless of filter settings. But the hardware seems to
 	 * filter broadcast frames, so pass them explicitly.
 	 */
-	h = ether_crc32_be(etherbroadcastaddr, ETHER_ADDR_LEN) >> 26;
+	mchash[7] |= 0x80;
-	hashtbl[h / 8] |= 1 << (h % 8);
+	mos_write_mcast(un, mchash);
 	mos_write_mcast(un, hashtbl);
 	mos_reg_write_1(un, MOS_CTL, rxmode);
+}
 static void
 mos_reset(struct usbnet *un)
+{
 	u_int8_t ctl;
 	if (usbnet_isdying(un))
 		return;
 	ctl = mos_reg_read_1(un, MOS_CTL);
 	ctl &= ~(MOS_CTL_RX_PROMISC | MOS_CTL_ALLMULTI | MOS_CTL_TX_ENB |
 @@ -735,27 +734,27 @@ mos_init_locked(struct ifnet *ifp)
 	/* Reset the ethernet interface. */
 	mos_reset(un);
 	/* Write MAC address. */
 	mos_writemac(un);
 	/* Read and set transmitter IPG values */
 	ipgs[0] = mos_reg_read_1(un, MOS_IPG0);
 	ipgs[1] = mos_reg_read_1(un, MOS_IPG1);
 	mos_reg_write_1(un, MOS_IPG0, ipgs[0]);
 	mos_reg_write_1(un, MOS_IPG1, ipgs[1]);
 	/* Program promiscuous mode and multicast filters. */
-	mos_setiff_locked(un);
+	mos_rcvfilt_locked(un);
 	/* Enable receiver and transmitter, bridge controls speed/duplex mode */
 	rxmode = mos_reg_read_1(un, MOS_CTL);
 	rxmode |= MOS_CTL_RX_ENB | MOS_CTL_TX_ENB | MOS_CTL_BS_ENB;
 	rxmode &= ~(MOS_CTL_SLEEP);
 	mos_reg_write_1(un, MOS_CTL, rxmode);
 	return usbnet_init_rx_tx(un);
+}
 static int
 mos_uno_init(struct ifnet *ifp)
+{
 @@ -771,27 +770,27 @@ mos_uno_init(struct ifnet *ifp)
+}
 static int
 mos_uno_ioctl(struct ifnet *ifp, u_long cmd, void *data)
+{
 	struct usbnet * const un = ifp->if_softc;
 	usbnet_lock_core(un);
 	usbnet_busy(un);
 	switch (cmd) {
 	case SIOCADDMULTI:
 	case SIOCDELMULTI:
-		mos_setiff_locked(un);
+		mos_rcvfilt_locked(un);
 		break;
 	default:
 		break;
+	}
 	usbnet_unbusy(un);
 	usbnet_unlock_core(un);
 	return 0;
+}
 void
 mos_uno_stop(struct ifnet *ifp, int disable)