diff options
| author | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-03-13 12:08:38 -0400 |
|---|---|---|
| committer | Quentin Young <qlyoung@cumulusnetworks.com> | 2018-03-13 12:08:38 -0400 |
| commit | 1f35b46a2f35d59b86ed3ee557aa1c9fcf2fcac9 (patch) | |
| tree | 27de606b3510b126766ac7a0ac9eb8ddf4573ab0 /pimd/pim_msdp.h | |
| parent | d47ae3db4cf14c72d8468d61113ac88e19235791 (diff) | |
| parent | c1a003878246ccc84ab5986558ca959f4545f738 (diff) | |
Merge branch 'master' into docuser
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_msdp.h')
| -rw-r--r-- | pimd/pim_msdp.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/pimd/pim_msdp.h b/pimd/pim_msdp.h index 0627ee5f47..8363d50991 100644 --- a/pimd/pim_msdp.h +++ b/pimd/pim_msdp.h @@ -119,12 +119,8 @@ struct pim_msdp_peer { /* protocol timers */ #define PIM_MSDP_PEER_HOLD_TIME 75 struct thread *hold_timer; // 5.4 - /* $FRR indent$ */ -/* clang-format off */ #define PIM_MSDP_PEER_KA_TIME 60 struct thread *ka_timer; // 5.5 - /* $FRR indent$ */ - /* clang-format off */ #define PIM_MSDP_PEER_CONNECT_RETRY_TIME 30 struct thread *cr_timer; // 5.6 @@ -139,8 +135,6 @@ struct pim_msdp_peer { uint32_t conn_attempts; uint32_t est_flaps; uint32_t sa_cnt; /* number of SAs attributed to this peer */ - /* $FRR indent$ */ - /* clang-format off */ #define PIM_MSDP_PEER_LAST_RESET_STR 20 char last_reset[PIM_MSDP_PEER_LAST_RESET_STR]; |