diff options
| author | thompsa <thompsa@FreeBSD.org> | 2006-01-02 22:44:54 +0000 |
|---|---|---|
| committer | thompsa <thompsa@FreeBSD.org> | 2006-01-02 22:44:54 +0000 |
| commit | 8c50d249a21d1fd34601fc9a93cfb9a3d24aba21 (patch) | |
| tree | 100f1577990ab60ac9856a24287f7f2ff396f4cd /sys/net/if_bridge.c | |
| parent | a81b11ae212bc4ccc2fbf53ea67c33b7850ef6f1 (diff) | |
| download | FreeBSD-src-8c50d249a21d1fd34601fc9a93cfb9a3d24aba21.zip FreeBSD-src-8c50d249a21d1fd34601fc9a93cfb9a3d24aba21.tar.gz | |
Reorganise bridge_rtupdate slightly to reduce duplication.
Diffstat (limited to 'sys/net/if_bridge.c')
| -rw-r--r-- | sys/net/if_bridge.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index a61b45c..2dc8af2 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; |
