diff options
| author | Andrew Thompson <thompsa@FreeBSD.org> | 2007-01-18 02:02:03 +0000 |
|---|---|---|
| committer | Andrew Thompson <thompsa@FreeBSD.org> | 2007-01-18 02:02:03 +0000 |
| commit | 90196992f48c6740233d61c4e54d78405de0caa5 (patch) | |
| tree | 085c0efedaf036145c8594dac1b33f14d1b2505d /sys | |
| parent | 69a6b302a13939c23453d37f0ca2ed3639310f76 (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/net/if_bridge.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 3e70e271c61a..342eb5bc01e0 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -2354,8 +2354,7 @@ bridge_rttrim(struct bridge_softc *sc) if (sc->sc_brtcnt <= sc->sc_brtmax) return; - for (brt = LIST_FIRST(&sc->sc_rtlist); brt != NULL; brt = nbrt) { - nbrt = LIST_NEXT(brt, brt_list); + LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) { if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) { bridge_rtnode_destroy(sc, brt); if (sc->sc_brtcnt <= sc->sc_brtmax) @@ -2395,8 +2394,7 @@ bridge_rtage(struct bridge_softc *sc) BRIDGE_LOCK_ASSERT(sc); - for (brt = LIST_FIRST(&sc->sc_rtlist); brt != NULL; brt = nbrt) { - nbrt = LIST_NEXT(brt, brt_list); + LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) { if ((brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) { if (time_uptime >= brt->brt_expire) bridge_rtnode_destroy(sc, brt); @@ -2416,8 +2414,7 @@ bridge_rtflush(struct bridge_softc *sc, int full) BRIDGE_LOCK_ASSERT(sc); - for (brt = LIST_FIRST(&sc->sc_rtlist); brt != NULL; brt = nbrt) { - nbrt = LIST_NEXT(brt, brt_list); + LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) { if (full || (brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC) bridge_rtnode_destroy(sc, brt); } @@ -2454,8 +2451,7 @@ bridge_rtdelete(struct bridge_softc *sc, struct ifnet *ifp, int full) BRIDGE_LOCK_ASSERT(sc); - for (brt = LIST_FIRST(&sc->sc_rtlist); brt != NULL; brt = nbrt) { - nbrt = LIST_NEXT(brt, brt_list); + LIST_FOREACH_SAFE(brt, &sc->sc_rtlist, brt_list, nbrt) { if (brt->brt_ifp == ifp && (full || (brt->brt_flags & IFBAF_TYPEMASK) == IFBAF_DYNAMIC)) bridge_rtnode_destroy(sc, brt); |