diff options
| author | marcel <marcel@FreeBSD.org> | 2014-08-03 16:45:07 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2014-08-03 16:45:07 +0000 |
| commit | 2399792c1722d8038876b8e9561d850e5c8719cc (patch) | |
| tree | d05b63eff3678395d7f6d0238db875bfbdbf836d /sys/dev/nfe | |
| parent | 62b88726fd24f139b03b3856e3ff929588e919ad (diff) | |
| download | FreeBSD-src-2399792c1722d8038876b8e9561d850e5c8719cc.zip FreeBSD-src-2399792c1722d8038876b8e9561d850e5c8719cc.tar.gz | |
Fix multicast, broken by the conversion of the nfe(4) driver to the
driver API.
Submitted by: Mikhail <mp@lenta.ru>
Diffstat (limited to 'sys/dev/nfe')
| -rw-r--r-- | sys/dev/nfe/if_nfe.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sys/dev/nfe/if_nfe.c b/sys/dev/nfe/if_nfe.c index 58a0e1d..85821b1 100644 --- a/sys/dev/nfe/if_nfe.c +++ b/sys/dev/nfe/if_nfe.c @@ -2582,7 +2582,6 @@ nfe_setmulti(struct nfe_softc *sc) bcopy(etherbroadcastaddr, addr, ETHER_ADDR_LEN); bcopy(etherbroadcastaddr, mask, ETHER_ADDR_LEN); - if_maddr_rlock(ifp); mc_count = if_multiaddr_count(ifp, -1); mta = malloc(sizeof(uint8_t) * ETHER_ADDR_LEN * mc_count, M_DEVBUF, M_NOWAIT); @@ -2594,24 +2593,24 @@ nfe_setmulti(struct nfe_softc *sc) bzero(addr, ETHER_ADDR_LEN); bzero(mask, ETHER_ADDR_LEN); - free(mta, M_DEVBUF); - if_maddr_runlock(ifp); goto done; }; - if_setupmultiaddr(ifp, mta, &mcnt, mc_count); + if_multiaddr_array(ifp, mta, &mcnt, mc_count); for (i = 0; i < mcnt; i++) { uint8_t *addrp; + int j; addrp = mta + (i * ETHER_ADDR_LEN); - for (i = 0; i < ETHER_ADDR_LEN; i++) { - u_int8_t mcaddr = addrp[i]; - addr[i] &= mcaddr; - mask[i] &= ~mcaddr; + for (j = 0; j < ETHER_ADDR_LEN; j++) { + u_int8_t mcaddr = addrp[j]; + addr[j] &= mcaddr; + mask[j] &= ~mcaddr; } } - if_maddr_runlock(ifp); + + free(mta, M_DEVBUF); for (i = 0; i < ETHER_ADDR_LEN; i++) { mask[i] |= addr[i]; |
