diff options
author | phk <phk@FreeBSD.org> | 2001-02-04 16:08:18 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2001-02-04 16:08:18 +0000 |
commit | 709379c1aeaadc2770d45e2cb1bc6428c65f09d3 (patch) | |
tree | dfeb80ff1352759a12e59878a24ad037eef63ea0 /sys/dev | |
parent | e01468552648a6fc51185ba9e47435b0d00ff96f (diff) | |
download | FreeBSD-src-709379c1aeaadc2770d45e2cb1bc6428c65f09d3.zip FreeBSD-src-709379c1aeaadc2770d45e2cb1bc6428c65f09d3.tar.gz |
Another round of the <sys/queue.h> FOREACH transmogriffer.
Created with: sed(1)
Reviewed by: md5(1)
Diffstat (limited to 'sys/dev')
-rw-r--r-- | sys/dev/awi/awi.c | 12 | ||||
-rw-r--r-- | sys/dev/de/if_de.c | 9 | ||||
-rw-r--r-- | sys/dev/ed/if_ed.c | 3 | ||||
-rw-r--r-- | sys/dev/fe/if_fe.c | 3 | ||||
-rw-r--r-- | sys/dev/ie/if_ie.c | 3 | ||||
-rw-r--r-- | sys/dev/mii/mii.c | 12 | ||||
-rw-r--r-- | sys/dev/pccard/pccard.c | 3 | ||||
-rw-r--r-- | sys/dev/ray/if_ray.c | 3 | ||||
-rw-r--r-- | sys/dev/sf/if_sf.c | 3 | ||||
-rw-r--r-- | sys/dev/sn/if_sn.c | 3 | ||||
-rw-r--r-- | sys/dev/tx/if_tx.c | 3 | ||||
-rw-r--r-- | sys/dev/usb/if_aue.c | 3 | ||||
-rw-r--r-- | sys/dev/wl/if_wl.c | 3 |
13 files changed, 21 insertions, 42 deletions
diff --git a/sys/dev/awi/awi.c b/sys/dev/awi/awi.c index 749e042..77e22a6 100644 --- a/sys/dev/awi/awi.c +++ b/sys/dev/awi/awi.c @@ -791,8 +791,7 @@ awi_init(sc) #ifdef __FreeBSD__ if (ifp->if_amcount != 0) goto set_mib; - for (ifma = LIST_FIRST(&ifp->if_multiaddrs); ifma != NULL; - ifma = LIST_NEXT(ifma, ifma_link)) { + LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; if (n == AWI_GROUP_ADDR_SIZE) @@ -1939,8 +1938,7 @@ awi_recv_beacon(sc, m0, rxts, rssi) return; } - for (bp = TAILQ_FIRST(&sc->sc_scan); bp != NULL; - bp = TAILQ_NEXT(bp, list)) { + TAILQ_FOREACH(bp, &sc->sc_scan, list) { if (memcmp(bp->esrc, wh->i_addr2, ETHER_ADDR_LEN) == 0 && memcmp(bp->bssid, wh->i_addr3, ETHER_ADDR_LEN) == 0) break; @@ -2182,8 +2180,7 @@ awi_recv_auth(sc, m0) if (status != 0) { printf("%s: authentication failed (reason %d)\n", sc->sc_dev.dv_xname, status); - for (bp = TAILQ_FIRST(&sc->sc_scan); bp != NULL; - bp = TAILQ_NEXT(bp, list)) { + TAILQ_FOREACH(bp, &sc->sc_scan, list) { if (memcmp(bp->esrc, sc->sc_bss.esrc, ETHER_ADDR_LEN) == 0) { bp->fails++; @@ -2294,8 +2291,7 @@ awi_recv_asresp(sc, m0) if (status != 0) { printf("%s: association failed (reason %d)\n", sc->sc_dev.dv_xname, status); - for (bp = TAILQ_FIRST(&sc->sc_scan); bp != NULL; - bp = TAILQ_NEXT(bp, list)) { + TAILQ_FOREACH(bp, &sc->sc_scan, list) { if (memcmp(bp->esrc, sc->sc_bss.esrc, ETHER_ADDR_LEN) == 0) { bp->fails++; diff --git a/sys/dev/de/if_de.c b/sys/dev/de/if_de.c index b756bae..714947b 100644 --- a/sys/dev/de/if_de.c +++ b/sys/dev/de/if_de.c @@ -3012,8 +3012,7 @@ tulip_addr_filter( #endif multicnt = 0; - for (ifma = LIST_FIRST(&sc->tulip_if.if_multiaddrs); ifma != NULL; - ifma = LIST_NEXT(ifma, ifma_link)) { + LIST_FOREACH(ifma, &sc->tulip_if.if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family == AF_LINK) multicnt++; @@ -3041,8 +3040,7 @@ tulip_addr_filter( */ bzero(sc->tulip_setupdata, sizeof(sc->tulip_setupdata)); - for (ifma = LIST_FIRST(&sc->tulip_if.if_multiaddrs); ifma != NULL; - ifma = LIST_NEXT(ifma, ifma_link)) { + LIST_FOREACH(ifma, &sc->tulip_if.if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; @@ -3092,8 +3090,7 @@ tulip_addr_filter( /* * Else can get perfect filtering for 16 addresses. */ - for (ifma = LIST_FIRST(&sc->tulip_if.if_multiaddrs); ifma != NULL; - ifma = LIST_NEXT(ifma, ifma_link)) { + LIST_FOREACH(ifma, &sc->tulip_if.if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; addrp = LLADDR((struct sockaddr_dl *)ifma->ifma_addr); diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index 700f193..afa9cd4 100644 --- a/sys/dev/ed/if_ed.c +++ b/sys/dev/ed/if_ed.c @@ -3286,8 +3286,7 @@ ds_getmcaf(sc, mcaf) mcaf[0] = 0; mcaf[1] = 0; - for (ifma = LIST_FIRST(&sc->arpcom.ac_if.if_multiaddrs); ifma; - ifma = LIST_NEXT(ifma, ifma_link)) { + LIST_FOREACH(ifma, &sc->arpcom.ac_if.if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; index = ds_crc(LLADDR((struct sockaddr_dl *)ifma->ifma_addr)) diff --git a/sys/dev/fe/if_fe.c b/sys/dev/fe/if_fe.c index e5a49d0..a670a90 100644 --- a/sys/dev/fe/if_fe.c +++ b/sys/dev/fe/if_fe.c @@ -2120,8 +2120,7 @@ fe_mcaf ( struct fe_softc *sc ) struct ifmultiaddr *ifma; filter = fe_filter_nothing; - for (ifma = LIST_FIRST(&sc->arpcom.ac_if.if_multiaddrs); ifma; - ifma = LIST_NEXT(ifma, ifma_link)) { + LIST_FOREACH(ifma, &sc->arpcom.ac_if.if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; index = fe_hash(LLADDR((struct sockaddr_dl *)ifma->ifma_addr)); diff --git a/sys/dev/ie/if_ie.c b/sys/dev/ie/if_ie.c index 3f7033d..ccc1f54 100644 --- a/sys/dev/ie/if_ie.c +++ b/sys/dev/ie/if_ie.c @@ -2150,8 +2150,7 @@ ie_mc_reset(int unit) * Step through the list of addresses. */ ie->mcast_count = 0; - for (ifma = LIST_FIRST(&ie->arpcom.ac_if.if_multiaddrs); ifma; - ifma = LIST_NEXT(ifma, ifma_link)) { + LIST_FOREACH(ifma, &ie->arpcom.ac_if.if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; diff --git a/sys/dev/mii/mii.c b/sys/dev/mii/mii.c index fe07873..2e77fe5 100644 --- a/sys/dev/mii/mii.c +++ b/sys/dev/mii/mii.c @@ -229,8 +229,7 @@ static void miibus_mediainit(dev) MIIBUS_MEDIAINIT(device_get_parent(dev)); mii = device_get_softc(dev); - for (m = LIST_FIRST(&mii->mii_media.ifm_list); m != NULL; - m = LIST_NEXT(m, ifm_list)) { + LIST_FOREACH(m, &mii->mii_media.ifm_list, ifm_list) { media = m->ifm_media; if (media == (IFM_ETHER|IFM_AUTO)) break; @@ -290,8 +289,7 @@ mii_mediachg(mii) mii->mii_media_status = 0; mii->mii_media_active = IFM_NONE; - for (child = LIST_FIRST(&mii->mii_phys); child != NULL; - child = LIST_NEXT(child, mii_list)) { + LIST_FOREACH(child, &mii->mii_phys, mii_list) { rv = (*child->mii_service)(child, mii, MII_MEDIACHG); if (rv) return (rv); @@ -308,8 +306,7 @@ mii_tick(mii) { struct mii_softc *child; - for (child = LIST_FIRST(&mii->mii_phys); child != NULL; - child = LIST_NEXT(child, mii_list)) + LIST_FOREACH(child, &mii->mii_phys, mii_list) (void) (*child->mii_service)(child, mii, MII_TICK); } @@ -325,7 +322,6 @@ mii_pollstat(mii) mii->mii_media_status = 0; mii->mii_media_active = IFM_NONE; - for (child = LIST_FIRST(&mii->mii_phys); child != NULL; - child = LIST_NEXT(child, mii_list)) + LIST_FOREACH(child, &mii->mii_phys, mii_list) (void) (*child->mii_service)(child, mii, MII_POLLSTAT); } diff --git a/sys/dev/pccard/pccard.c b/sys/dev/pccard/pccard.c index 2b67922..69ba238 100644 --- a/sys/dev/pccard/pccard.c +++ b/sys/dev/pccard/pccard.c @@ -321,8 +321,7 @@ pccard_function_init(struct pccard_function *pf) } bus = device_get_parent(pf->dev); /* Remember which configuration entry we are using. */ - for (cfe = STAILQ_FIRST(&pf->cfe_head); cfe != NULL; - cfe = STAILQ_NEXT(cfe, cfe_list)) { + STAILQ_FOREACH(cfe, &pf->cfe_head, cfe_list) { for (i = 0; i < cfe->num_iospace; i++) cfe->iores[i] = NULL; cfe->irqres = NULL; diff --git a/sys/dev/ray/if_ray.c b/sys/dev/ray/if_ray.c index 2563daf..ea6a5cc 100644 --- a/sys/dev/ray/if_ray.c +++ b/sys/dev/ray/if_ray.c @@ -589,8 +589,7 @@ ray_detach(device_t dev) untimeout(ray_com_ecf_timo, sc, sc->com_timerh); untimeout(ray_tx_timo, sc, sc->tx_timerh); com = TAILQ_FIRST(&sc->sc_comq); - for (com = TAILQ_FIRST(&sc->sc_comq); com != NULL; - com = TAILQ_NEXT(com, c_chain)) { + TAILQ_FOREACH(com, &sc->sc_comq, c_chain) { com->c_flags |= RAY_COM_FDETACHED; com->c_retval = 0; RAY_DPRINTF(sc, RAY_DBG_STOP, "looking at com %p %b", diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c index 29f3fe3..fbaac99 100644 --- a/sys/dev/sf/if_sf.c +++ b/sys/dev/sf/if_sf.c @@ -492,8 +492,7 @@ static int sf_ifmedia_upd(ifp) sc->sf_link = 0; if (mii->mii_instance) { struct mii_softc *miisc; - for (miisc = LIST_FIRST(&mii->mii_phys); miisc != NULL; - miisc = LIST_NEXT(miisc, mii_list)) + LIST_FOREACH(miisc, &mii->mii_phys, mii_list) mii_phy_reset(miisc); } mii_mediachg(mii); diff --git a/sys/dev/sn/if_sn.c b/sys/dev/sn/if_sn.c index e9a856d..bd5e172 100644 --- a/sys/dev/sn/if_sn.c +++ b/sys/dev/sn/if_sn.c @@ -1461,8 +1461,7 @@ sn_getmcf(struct arpcom *ac, u_char *mcf) bzero(mcf, MCFSZ); - for (ifma = LIST_FIRST(&ac->ac_if.if_multiaddrs); ifma; - ifma = LIST_NEXT(ifma, ifma_link)) { + LIST_FOREACH(ifma, &ac->ac_if.if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) return 0; index = smc_crc(LLADDR((struct sockaddr_dl *)ifma->ifma_addr)) & 0x3f; diff --git a/sys/dev/tx/if_tx.c b/sys/dev/tx/if_tx.c index ca2a89d..934b943 100644 --- a/sys/dev/tx/if_tx.c +++ b/sys/dev/tx/if_tx.c @@ -1340,8 +1340,7 @@ epic_init(sc) mii = device_get_softc(sc->miibus); if (mii->mii_instance) { struct mii_softc *miisc; - for (miisc = LIST_FIRST(&mii->mii_phys); miisc != NULL; - miisc = LIST_NEXT(miisc, mii_list)) + LIST_FOREACH(miisc, &mii->mii_phys, mii_list) mii_phy_reset(miisc); } diff --git a/sys/dev/usb/if_aue.c b/sys/dev/usb/if_aue.c index 01f9d2d..50856e6 100644 --- a/sys/dev/usb/if_aue.c +++ b/sys/dev/usb/if_aue.c @@ -1331,8 +1331,7 @@ Static int aue_ifmedia_upd(ifp) sc->aue_link = 0; if (mii->mii_instance) { struct mii_softc *miisc; - for (miisc = LIST_FIRST(&mii->mii_phys); miisc != NULL; - miisc = LIST_NEXT(miisc, mii_list)) + LIST_FOREACH(miisc, &mii->mii_phys, mii_list) mii_phy_reset(miisc); } mii_mediachg(mii); diff --git a/sys/dev/wl/if_wl.c b/sys/dev/wl/if_wl.c index 67a50d7..b52762c8 100644 --- a/sys/dev/wl/if_wl.c +++ b/sys/dev/wl/if_wl.c @@ -2060,8 +2060,7 @@ wlconfig(int unit) outw(PIOP1(base), AC_MCSETUP|AC_CW_EL); /* ac_command */ outw(PIOR1(base), OFFSET_CU + 8); #if defined(__FreeBSD__) && __FreeBSD_version >= 300000 - for (ifma = LIST_FIRST(&sc->wl_if.if_multiaddrs); ifma; - ifma = LIST_NEXT(ifma, ifma_link)) { + LIST_FOREACH(ifma, &sc->wl_if.if_multiaddrs, ifma_link) { if (ifma->ifma_addr->sa_family != AF_LINK) continue; |