From 94e45ae5e825e22d2d77559c2e19f8612d2a0445 Mon Sep 17 00:00:00 2001 From: Andrew Thompson Date: Mon, 2 Jan 2006 22:44:54 +0000 Subject: Reorganise bridge_rtupdate slightly to reduce duplication. --- sys/net/if_bridge.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index a61b45ccaf04..2dc8af275b79 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -2141,7 +2141,6 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, if (brt == NULL) return (ENOMEM); - brt->brt_expire = time_uptime + sc->sc_brttimeout; brt->brt_flags = IFBAF_DYNAMIC; memcpy(brt->brt_addr, dst, ETHER_ADDR_LEN); @@ -2152,8 +2151,8 @@ bridge_rtupdate(struct bridge_softc *sc, const uint8_t *dst, } brt->brt_ifp = dst_if; - brt->brt_expire = (flags & IFBAF_STATIC) ? 0 : - time_uptime + sc->sc_brttimeout; + if (flags & IFBAF_DYNAMIC) + brt->brt_expire = time_uptime + sc->sc_brttimeout; if (setflags) brt->brt_flags = flags; -- cgit v1.3