diff options
| author | vivek <vivek@cumulusnetworks.com> | 2018-08-27 22:13:30 +0000 |
|---|---|---|
| committer | vivek <vivek@cumulusnetworks.com> | 2018-08-27 22:13:30 +0000 |
| commit | f190902f523abaa1035cbbb385387bc6c72dd1dc (patch) | |
| tree | 9472de5fb49314eba45868ed7b66376f7329b2fe /pimd/pim_pim.c | |
| parent | 9df2b997b975c7a7807e9e491989d5123d87458f (diff) | |
| parent | 95d8c3ce78cdd800f4c39d196e865c2ec9213f03 (diff) | |
Merge remote-tracking branch 'upstream/master' into evpn-extended-mobility
Conflicts:
zebra/zebra_vxlan.c
Diffstat (limited to 'pimd/pim_pim.c')
| -rw-r--r-- | pimd/pim_pim.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c index b103da2e1b..7113d5405e 100644 --- a/pimd/pim_pim.c +++ b/pimd/pim_pim.c @@ -655,7 +655,7 @@ static int pim_hello_send(struct interface *ifp, uint16_t holdtime) { struct pim_interface *pim_ifp = ifp->info; - if (pim_if_is_loopback(ifp)) + if (if_is_loopback_or_vrf(ifp)) return 0; if (hello_send(ifp, holdtime)) { @@ -757,7 +757,7 @@ void pim_hello_restart_triggered(struct interface *ifp) /* * No need to ever start loopback or vrf device hello's */ - if (pim_if_is_loopback(ifp)) + if (if_is_loopback_or_vrf(ifp)) return; /* |