 @@ -1,36 +1,36 @@
-/*	$NetBSD: if_mue.c,v 1.24 2018/12/20 02:52:59 rin Exp $	*/
+/*	$NetBSD: if_mue.c,v 1.25 2018/12/22 16:58:51 rin Exp $	*/
 /*	$OpenBSD: if_mue.c,v 1.3 2018/08/04 16:42:46 jsg Exp $	*/
 /*
  * Copyright (c) 2018 Kevin Lo <kevlo@openbsd.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.
  */
 /* Driver for Microchip LAN7500/LAN7800 chipsets. */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.24 2018/12/20 02:52:59 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_mue.c,v 1.25 2018/12/22 16:58:51 rin Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #include "opt_inet.h"
 #endif
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/mutex.h>
 #include <sys/kernel.h>
 @@ -1320,31 +1320,31 @@ mue_setmulti(struct mue_softc *sc)
 	/* Clear perfect filter and hash tables. */
 	memset(pfiltbl, 0, sizeof(pfiltbl));
 	memset(hashtbl, 0, sizeof(hashtbl));
 	reg = (sc->mue_flags & LAN7500) ? MUE_7500_RFE_CTL : MUE_7800_RFE_CTL;
 	rxfilt = mue_csr_read(sc, reg);
 	rxfilt &= ~(MUE_RFE_CTL_PERFECT | MUE_RFE_CTL_MULTICAST_HASH |
 	    MUE_RFE_CTL_UNICAST | MUE_RFE_CTL_MULTICAST);
 	/* Always accept broadcast frames. */
 	rxfilt |= MUE_RFE_CTL_BROADCAST;
-	if (ifp->if_flags & (IFF_ALLMULTI | IFF_PROMISC)) {
+	if (ifp->if_flags & IFF_PROMISC) {
-allmulti:	ifp->if_flags |= IFF_ALLMULTI;
+		rxfilt |= MUE_RFE_CTL_UNICAST;
-		rxfilt |= MUE_RFE_CTL_MULTICAST;
+allmulti:	rxfilt |= MUE_RFE_CTL_MULTICAST;
 		ifp->if_flags |= IFF_ALLMULTI;
 		if (ifp->if_flags & IFF_PROMISC) {
 			rxfilt |= MUE_RFE_CTL_UNICAST;
 			DPRINTF(sc, "promisc\n");
 		} else {
 			DPRINTF(sc, "allmulti\n");
+		}
 	} else {
 		/* Now program new ones. */
 		pfiltbl[0][0] = MUE_ENADDR_HI(enaddr) | MUE_ADDR_FILTX_VALID;
 		pfiltbl[0][1] = MUE_ENADDR_LO(enaddr);
 		i = 1;
 		ETHER_FIRST_MULTI(step, &sc->mue_ec, enm);
 		while (enm != NULL) {
 			if (memcmp(enm->enm_addrlo, enm->enm_addrhi,
 			    ETHER_ADDR_LEN)) {
 @@ -1359,26 +1359,27 @@ allmulti:	ifp->if_flags |= IFF_ALLMULTI;
 				    MUE_ADDR_FILTX_VALID;
 				pfiltbl[i][1] = MUE_ENADDR_LO(enm->enm_addrlo);
 			} else {
 				/* Otherwise, use hash table. */
 				rxfilt |= MUE_RFE_CTL_MULTICAST_HASH;
 				h = (ether_crc32_be(enm->enm_addrlo,
 				    ETHER_ADDR_LEN) >> 23) & 0x1ff;
 				hashtbl[h / 32] |= 1 << (h % 32);
+			}
 			i++;
 			ETHER_NEXT_MULTI(step, enm);
+		}
 		rxfilt |= MUE_RFE_CTL_PERFECT;
 		ifp->if_flags &= ~IFF_ALLMULTI;
 		if (rxfilt & MUE_RFE_CTL_MULTICAST_HASH) {
 			DPRINTF(sc, "perfect filter and hash tables\n");
 		} else {
 			DPRINTF(sc, "perfect filter\n");
+		}
+	}
 	for (i = 0; i < MUE_NUM_ADDR_FILTX; i++) {
 		hireg = (sc->mue_flags & LAN7500) ?
 		    MUE_7500_ADDR_FILTX(i) : MUE_7800_ADDR_FILTX(i);
 		loreg = hireg + 4;
 		mue_csr_write(sc, hireg, 0);
 		mue_csr_write(sc, loreg, pfiltbl[i][1]);