diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2016-11-28 17:35:08 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2016-11-28 17:35:08 +0100 |
| commit | cdf76126497e0346e0cbb6fb27db2d24b3bc872e (patch) | |
| tree | 43a505ff49a17f660e7f1a61fbb47ab1179d91ae /isisd | |
| parent | zebra: add missing license headers to two files (diff) | |
| parent | isisd: fix loss of packets after circuit is brought up (diff) | |
| download | frr-cdf76126497e0346e0cbb6fb27db2d24b3bc872e.tar.xz frr-cdf76126497e0346e0cbb6fb27db2d24b3bc872e.zip | |
Merge remote-tracking branch 'cmaster-next' into cmaster-next-releng
Diffstat (limited to 'isisd')
| -rw-r--r-- | isisd/isis_circuit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c index 7eee46ef4..c5812a658 100644 --- a/isisd/isis_circuit.c +++ b/isisd/isis_circuit.c @@ -719,8 +719,8 @@ isis_circuit_up (struct isis_circuit *circuit) THREAD_READ_ON (master, circuit->t_read, isis_receive, circuit, circuit->fd); #else - THREAD_TIMER_ON (master, circuit->t_read, isis_receive, circuit, - circuit->fd); + THREAD_TIMER_MSEC_ON (master, circuit->t_read, isis_receive, circuit, + listcount (circuit->area->circuit_list) * 100); #endif circuit->lsp_queue = list_new (); |