summaryrefslogtreecommitdiffstats
path: root/pimd
diff options
context:
space:
mode:
authorsarita patra <saritap@vmware.com>2022-04-27 12:43:55 +0200
committerSarita Patra <saritap@vmware.com>2022-07-07 19:56:45 +0200
commitf0e91749df3d7bb7d8b607eb05d91576f1017783 (patch)
treee31a53cf43b16093b28374bfa4cdc0a3df7ed93b /pimd
parentpim6d: remove unused variable neigh_src_str (diff)
downloadfrr-f0e91749df3d7bb7d8b607eb05d91576f1017783.tar.xz
frr-f0e91749df3d7bb7d8b607eb05d91576f1017783.zip
Revert "pim6d: IPv6-adjust BSM code"
This reverts commit 809c11a9d87e0d12a5c3d3ca6906bc398a58de6c.
Diffstat (limited to 'pimd')
-rw-r--r--pimd/pim_bsm.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/pimd/pim_bsm.c b/pimd/pim_bsm.c
index 6ea67fbef..db41a03f5 100644
--- a/pimd/pim_bsm.c
+++ b/pimd/pim_bsm.c
@@ -1366,12 +1366,7 @@ int pim_bsm_process(struct interface *ifp, pim_sgaddr *sg, uint8_t *buf,
}
}
-#if PIM_IPV == 4
- if (!pim_addr_cmp(sg->grp, qpim_all_pim_routers_addr))
-#else
- if (0)
-#endif
- {
+ if (!pim_addr_cmp(sg->grp, qpim_all_pim_routers_addr)) {
/* Multicast BSMs are only accepted if source interface & IP
* match RPF towards the BSR's IP address, or they have
* no-forward set