diff options
| author | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:03:41 +0000 |
|---|---|---|
| committer | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:03:41 +0000 |
| commit | 4e262455a252c700f81df75fb8107d112062bba8 (patch) | |
| tree | fbd55c66eebe78ccb60424e560548d1613aa403a /lib/spf_backoff.c | |
| parent | bfd498f0dab9a1937c6036cd35ed020b64a69e8f (diff) | |
| parent | 58e7db106d5907cb129fcc316f02ce0bf34e3885 (diff) | |
Merge branch 'master' of https://github.com/frrouting/frr into evpn-ipv6-tenant-routing
Conflicts:
bgpd/bgp_evpn.c
Diffstat (limited to 'lib/spf_backoff.c')
| -rw-r--r-- | lib/spf_backoff.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/spf_backoff.c b/lib/spf_backoff.c index d7907fafdf..c420c25f04 100644 --- a/lib/spf_backoff.c +++ b/lib/spf_backoff.c @@ -227,7 +227,8 @@ void spf_backoff_show(struct spf_backoff *backoff, struct vty *vty, struct timeval remain = thread_timer_remain(backoff->t_holddown); vty_out(vty, "%s Still runs for %lld msec\n", - prefix, (long long)remain.tv_sec * 1000 + prefix, + (long long)remain.tv_sec * 1000 + remain.tv_usec / 1000); } else { vty_out(vty, "%s Inactive\n", prefix); @@ -239,7 +240,8 @@ void spf_backoff_show(struct spf_backoff *backoff, struct vty *vty, struct timeval remain = thread_timer_remain(backoff->t_timetolearn); vty_out(vty, "%s Still runs for %lld msec\n", - prefix, (long long)remain.tv_sec * 1000 + prefix, + (long long)remain.tv_sec * 1000 + remain.tv_usec / 1000); } else { vty_out(vty, "%s Inactive\n", prefix); |