 @@ -1,14 +1,14 @@
-/*	$NetBSD: hme.c,v 1.66.10.1 2009/05/01 01:52:56 snj Exp $	*/
+/*	$NetBSD: hme.c,v 1.66.10.2 2009/05/01 01:54:09 snj Exp $	*/
 /*-
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Paul Kranenburg.
+ *
  * 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.
 @@ -24,27 +24,27 @@
  * 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.
  */
 /*
  * HME Ethernet module driver.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.66.10.1 2009/05/01 01:52:56 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hme.c,v 1.66.10.2 2009/05/01 01:54:09 snj Exp $");
 /* #define HMEDEBUG */
 #include "opt_inet.h"
 #include "bpfilter.h"
 #include "rnd.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <sys/socket.h>
 @@ -101,28 +101,26 @@ void		hme_setladrf(struct hme_softc *);
 static int	hme_mii_readreg(struct device *, int, int);
 static void	hme_mii_writereg(struct device *, int, int, int);
 static void	hme_mii_statchg(struct device *);
 int		hme_mediachange(struct ifnet *);
 struct mbuf	*hme_get(struct hme_softc *, int, uint32_t);
 int		hme_put(struct hme_softc *, int, struct mbuf *);
 void		hme_read(struct hme_softc *, int, uint32_t);
 int		hme_eint(struct hme_softc *, u_int);
 int		hme_rint(struct hme_softc *);
 int		hme_tint(struct hme_softc *);
 static int	ether_cmp(u_char *, u_char *);
 /* Default buffer copy routines */
 void	hme_copytobuf_contig(struct hme_softc *, void *, int, int);
 void	hme_copyfrombuf_contig(struct hme_softc *, void *, int, int);
 void	hme_zerobuf_contig(struct hme_softc *, int, int);
 void
 hme_config(sc)
 	struct hme_softc *sc;
+{
 	struct ifnet *ifp = &sc->sc_ethercom.ec_if;
 	struct mii_data *mii = &sc->sc_mii;
 	struct mii_softc *child;
 @@ -632,42 +630,26 @@ hme_init(sc)
 	/* Start the one second timer. */
 	callout_reset(&sc->sc_tick_ch, hz, hme_tick, sc);
 	ifp->if_flags |= IFF_RUNNING;
 	ifp->if_flags &= ~IFF_OACTIVE;
 	sc->sc_if_flags = ifp->if_flags;
 	ifp->if_timer = 0;
 	hme_start(ifp);
 	return 0;
+}
 /*
  * Compare two Ether/802 addresses for equality, inlined and unrolled for
  * speed.
  */
 static inline int
 ether_cmp(a, b)
 	u_char *a, *b;
 	if (a[5] != b[5] || a[4] != b[4] || a[3] != b[3] ||
 	    a[2] != b[2] || a[1] != b[1] || a[0] != b[0])
 		return (0);
 	return (1);
 /*
  * Routine to copy from mbuf chain to transmit buffer in
  * network buffer memory.
  * Returns the amount of data copied.
  */
 int
 hme_put(sc, ri, m)
 	struct hme_softc *sc;
 	int ri;			/* Ring index */
 	struct mbuf *m;
+{
 	struct mbuf *n;
 	int len, tlen = 0;
 	char *bp;
 @@ -1543,27 +1525,27 @@ hme_setladrf(sc)
 	v &= ~HME_MAC_RXCFG_PMISC;
 	v |= HME_MAC_RXCFG_HENABLE;
 	/*
 	 * Set up multicast address filter by passing all multicast addresses
 	 * through a crc generator, and then using the high order 6 bits as an
 	 * index into the 64 bit logical address filter.  The high order bit
 	 * selects the word, while the rest of the bits select the bit within
 	 * the word.
 	 */
 	ETHER_FIRST_MULTI(step, ec, enm);
 	while (enm != NULL) {
-		if (ether_cmp(enm->enm_addrlo, enm->enm_addrhi)) {
+		if (memcmp(enm->enm_addrlo, enm->enm_addrhi, ETHER_ADDR_LEN)) {
 			/*
 			 * 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.)
 			 */
 			hash[3] = hash[2] = hash[1] = hash[0] = 0xffff;
 			ifp->if_flags |= IFF_ALLMULTI;
 			goto chipit;
+		}