diff options
| author | obrien <obrien@FreeBSD.org> | 2003-12-08 07:54:15 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2003-12-08 07:54:15 +0000 |
| commit | a1cabe1bbbad4ba662b0615ee6af81256ccca608 (patch) | |
| tree | a76375ea757ab61d6de7a0c5ec2362d2e15d403f /sys/pci/if_ste.c | |
| parent | 4867d63660a56522f101639e5641133ac86d1636 (diff) | |
| download | FreeBSD-src-a1cabe1bbbad4ba662b0615ee6af81256ccca608.zip FreeBSD-src-a1cabe1bbbad4ba662b0615ee6af81256ccca608.tar.gz | |
Don't use caddr_t in mchash(). Also use C99 spellings over BSD ones.
Requested by: bde,imp
Diffstat (limited to 'sys/pci/if_ste.c')
| -rw-r--r-- | sys/pci/if_ste.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c index 5c08f85..e85fe96 100644 --- a/sys/pci/if_ste.c +++ b/sys/pci/if_ste.c @@ -119,7 +119,7 @@ static void ste_miibus_statchg (device_t); static int ste_eeprom_wait (struct ste_softc *); static int ste_read_eeprom (struct ste_softc *, caddr_t, int, int, int); static void ste_wait (struct ste_softc *); -static u_int32_t ste_mchash (caddr_t); +static u_int8_t ste_calchash (caddr_t); static void ste_setmulti (struct ste_softc *); static int ste_init_rx_list (struct ste_softc *); static void ste_init_tx_list (struct ste_softc *); @@ -552,22 +552,24 @@ ste_read_eeprom(sc, dest, off, cnt, swap) return(err ? 1 : 0); } -static u_int32_t -ste_mchash(addr) - caddr_t addr; +static u_int8_t +ste_calchash(addr) + caddr_t addr; { - u_int32_t crc, carry; - int idx, bit; - u_int8_t data; + u_int32_t crc, carry; + int i, j; + u_int8_t c; /* Compute CRC for the address value. */ crc = 0xFFFFFFFF; /* initial value */ - for (idx = 0; idx < 6; idx++) { - for (data = *addr++, bit = 0; bit < 8; bit++, data >>= 1) { - carry = ((crc & 0x80000000) ? 1 : 0) ^ (data & 0x01); + for (i = 0; i < 6; i++) { + c = *(addr + i); + for (j = 0; j < 8; j++) { + carry = ((crc & 0x80000000) ? 1 : 0) ^ (c & 0x01); crc <<= 1; + c >>= 1; if (carry) crc = (crc ^ 0x04c11db6) | carry; } @@ -603,7 +605,7 @@ ste_setmulti(sc) TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; - h = ste_mchash(LLADDR((struct sockaddr_dl *)ifma->ifma_addr)); + h = ste_calchash(LLADDR((struct sockaddr_dl *)ifma->ifma_addr)); if (h < 32) hashes[0] |= (1 << h); else |
