diff options
Diffstat (limited to 'sys/pci/if_rl.c')
| -rw-r--r-- | sys/pci/if_rl.c | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c index e315a0c..f7b6db4 100644 --- a/sys/pci/if_rl.c +++ b/sys/pci/if_rl.c @@ -207,7 +207,7 @@ static int rl_miibus_readreg (device_t, int, int); static int rl_miibus_writereg (device_t, int, int, int); static void rl_miibus_statchg (device_t); -static u_int8_t rl_calchash (caddr_t); +static u_int32_t rl_mchash (caddr_t); static void rl_setmulti (struct rl_softc *); static void rl_reset (struct rl_softc *); static int rl_list_tx_init (struct rl_softc *); @@ -735,23 +735,21 @@ rl_miibus_statchg(dev) /* * Calculate CRC of a multicast group address, return the upper 6 bits. */ -static u_int8_t -rl_calchash(addr) - caddr_t addr; +static u_int32_t +rl_mchash(addr) + caddr_t addr; { - u_int32_t crc, carry; - int i, j; - u_int8_t c; + u_int32_t crc, carry; + int idx, bit; + u_int8_t data; /* Compute CRC for the address value. */ crc = 0xFFFFFFFF; /* initial value */ - for (i = 0; i < 6; i++) { - c = *(addr + i); - for (j = 0; j < 8; j++) { - carry = ((crc & 0x80000000) ? 1 : 0) ^ (c & 0x01); + for (idx = 0; idx < 6; idx++) { + for (data = *addr++, bit = 0; bit < 8; bit++, data >>=1 ) { + carry = ((crc & 0x80000000) ? 1 : 0) ^ (data & 0x01); crc <<= 1; - c >>= 1; if (carry) crc = (crc ^ 0x04c11db6) | carry; } @@ -795,7 +793,7 @@ rl_setmulti(sc) TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; - h = rl_calchash(LLADDR((struct sockaddr_dl *)ifma->ifma_addr)); + h = rl_mchash(LLADDR((struct sockaddr_dl *)ifma->ifma_addr)); if (h < 32) hashes[0] |= (1 << h); else |
