Sat Oct 12 06:00:52 2019 UTC ()

 Fix a bug that multicast address filter doesn't work correctly.

XXX pullup-[789].


(msaitoh)

diff -r1.26 -r1.27 src/sys/dev/pci/if_et.c

--- src/sys/dev/pci/if_et.c 2019/08/01 13:36:37	1.26
+++ src/sys/dev/pci/if_et.c 2019/10/12 06:00:52	1.27

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_et.c,v 1.26 2019/08/01 13:36:37 msaitoh Exp $	*/
+/*	$NetBSD: if_et.c,v 1.27 2019/10/12 06:00:52 msaitoh Exp $	*/
 /*	$OpenBSD: if_et.c,v 1.12 2008/07/11 09:29:02 kevlo $	*/
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
+ *
  * This code is derived from software contributed to The DragonFly Project
  * by Sepherosa Ziehau <sepherosa@gmail.com>
+ *
  * 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.
 @@ -27,27 +27,27 @@
  * COPYRIGHT HOLDERS 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.
+ *
  * $DragonFly: src/sys/dev/netif/et/if_et.c,v 1.1 2007/10/12 14:12:42 sephe Exp $
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.26 2019/08/01 13:36:37 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_et.c,v 1.27 2019/10/12 06:00:52 msaitoh Exp $");
 #include "opt_inet.h"
 #include "vlan.h"
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/systm.h>
 #include <sys/types.h>
 #include <sys/sockio.h>
 #include <sys/mbuf.h>
 #include <sys/queue.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 @@ -1294,51 +1294,44 @@ et_free_rx_ring(struct et_softc *sc)
 		    rx_ring->rr_dmap->dm_mapsize, BUS_DMASYNC_PREWRITE);
+	}
+}
 void
 et_setmulti(struct et_softc *sc)
+{
 	struct ethercom *ec = &sc->sc_ethercom;
 	struct ifnet *ifp = &ec->ec_if;
 	uint32_t hash[4] = { 0, 0, 0, 0 };
 	uint32_t rxmac_ctrl, pktfilt;
 	struct ether_multi *enm;
 	struct ether_multistep step;
 	uint8_t addr[ETHER_ADDR_LEN];
 	int i, count;
 	pktfilt = CSR_READ_4(sc, ET_PKTFILT);
 	rxmac_ctrl = CSR_READ_4(sc, ET_RXMAC_CTRL);
 	pktfilt &= ~(ET_PKTFILT_BCAST | ET_PKTFILT_MCAST | ET_PKTFILT_UCAST);
 	if (ifp->if_flags & (IFF_PROMISC | IFF_ALLMULTI)) {
 		rxmac_ctrl |= ET_RXMAC_CTRL_NO_PKTFILT;
 		goto back;
+	}
 	bcopy(etherbroadcastaddr, addr, ETHER_ADDR_LEN);
 	count = 0;
 	ETHER_LOCK(ec);
 	ETHER_FIRST_MULTI(step, ec, enm);
 	while (enm != NULL) {
 		uint32_t *hp, h;
-		for (i = 0; i < ETHER_ADDR_LEN; i++) {
+		h = ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN);
 			addr[i] &= enm->enm_addrlo[i];
 		h = ether_crc32_be(addr, ETHER_ADDR_LEN);
 		h = (h & 0x3f800000) >> 23;
 		hp = &hash[0];
 		if (h >= 32 && h < 64) {
 			h -= 32;
 			hp = &hash[1];
 		} else if (h >= 64 && h < 96) {
 			h -= 64;
 			hp = &hash[2];
 		} else if (h >= 96) {
 			h -= 96;
 			hp = &hash[3];
+		}