diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2022-01-21 16:47:18 +0100 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2022-02-16 16:40:56 +0100 |
| commit | ae449dc594e837eaf7eb36de37097d59ad586280 (patch) | |
| tree | 0275ed4a10720dea04b20111da1eac935e6f61f9 /pimd/pim_nht.c | |
| parent | 94120cb227b26043e7c353e997e8ebf85dc46674 (diff) | |
pim6d: remove `PIM_V6_TEMP_BREAK`
It's no longer necessary, pim6d now compiles without this hack.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'pimd/pim_nht.c')
| -rw-r--r-- | pimd/pim_nht.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c index beaa5c802b..e221dd3fa0 100644 --- a/pimd/pim_nht.c +++ b/pimd/pim_nht.c @@ -361,7 +361,7 @@ bool pim_nht_bsr_rpf_check(struct pim_instance *pim, struct in_addr bsr_addr, pim_addr nhaddr; switch (nh->type) { -#if PIM_IPV == 4 || !defined(PIM_V6_TEMP_BREAK) +#if PIM_IPV == 4 case NEXTHOP_TYPE_IPV4: if (nh->ifindex == IFINDEX_INTERNAL) continue; @@ -605,7 +605,7 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim, ifps[i] = if_lookup_by_index(nh_node->ifindex, pim->vrf->vrf_id); if (ifps[i]) { -#if PIM_IPV == 4 || !defined(PIM_V6_TEMP_BREAK) +#if PIM_IPV == 4 pim_addr nhaddr = nh_node->gate.ipv4; #else pim_addr nhaddr = nh_node->gate.ipv6; @@ -799,7 +799,7 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS) nbr = pim_neighbor_find_if(ifp1); /* Overwrite with Nbr address as NH addr */ if (nbr) -#if PIM_IPV == 4 || !defined(PIM_V6_TEMP_BREAK) +#if PIM_IPV == 4 nexthop->gate.ipv4 = nbr->source_addr; #else nexthop->gate.ipv6 = nbr->source_addr; |