diff options
| author | Juliusz Chroboczek <jch@pps.jussieu.fr> | 2012-02-14 08:49:57 +0100 |
|---|---|---|
| committer | Paul Jakma <paul@quagga.net> | 2012-03-25 18:06:54 +0200 |
| commit | 36329c02c36703cc2158c1c99b86045fed26d4ae (patch) | |
| tree | 64cebc900d5b528f5a85645f681a38b59e5ad669 /babeld/babel_interface.c | |
| parent | babeld: drive interface_config_write() forward (diff) | |
| download | frr-36329c02c36703cc2158c1c99b86045fed26d4ae.tar.xz frr-36329c02c36703cc2158c1c99b86045fed26d4ae.zip | |
babeld: remove remains of standalone babeld's configuration code.
Standalone babeld has a configuration interface that is not used in
Quagga. This removes a few bits of this code that survived the
port to Quagga.
Diffstat (limited to 'babeld/babel_interface.c')
| -rw-r--r-- | babeld/babel_interface.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/babeld/babel_interface.c b/babeld/babel_interface.c index 24f56f38f..2b5f9569b 100644 --- a/babeld/babel_interface.c +++ b/babeld/babel_interface.c @@ -565,10 +565,6 @@ interface_recalculate(struct interface *ifp) babel_ifp->flags |= BABEL_IF_LQ; } - /* Since the interface was marked as active above, the - idle_hello_interval cannot be the one being used here. */ - babel_ifp->update_interval = babel_ifp->hello_interval * 4; - memset(&mreq, 0, sizeof(mreq)); memcpy(&mreq.ipv6mr_multiaddr, protocol_group, 16); mreq.ipv6mr_interface = ifp->ifindex; @@ -1019,7 +1015,8 @@ babel_interface_allocate (void) babel_ifp->bucket_time = babel_now.tv_sec; babel_ifp->bucket = BUCKET_TOKENS_MAX; babel_ifp->hello_seqno = (random() & 0xFFFF); - babel_ifp->hello_interval = BABELD_DEFAULT_HELLO_INTERVAL; + babel_ifp->hello_interval = BABEL_DEFAULT_HELLO_INTERVAL; + babel_ifp->update_interval = BABEL_DEFAULT_UPDATE_INTERVAL; babel_ifp->channel = BABEL_IF_CHANNEL_INTERFERING; return babel_ifp; |