diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-19 22:00:00 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-07-24 19:51:35 +0200 |
| commit | 25b787a28780e33da3afef6130589dbe8fa3c243 (patch) | |
| tree | 2e92ce8ff2d2af7f86a4b2132972cfc7b6a0b4fc /pimd/pim_rpf.c | |
| parent | pimd: More refactor for 'struct pim_instance *' for pim_nht.c (diff) | |
| download | frr-25b787a28780e33da3afef6130589dbe8fa3c243.tar.xz frr-25b787a28780e33da3afef6130589dbe8fa3c243.zip | |
pimd: Remove pimg from pim_nht.c in totality
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_rpf.c')
| -rw-r--r-- | pimd/pim_rpf.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c index 0946028e2..22741230d 100644 --- a/pimd/pim_rpf.c +++ b/pimd/pim_rpf.c @@ -221,7 +221,8 @@ enum pim_rpf_result pim_rpf_update(struct pim_upstream *up, struct pim_rpf *old, if (pim_find_or_track_nexthop(pimg, &nht_p, up, NULL, &pnc)) { if (pnc.nexthop_num) { if (!pim_ecmp_nexthop_search( - &pnc, &up->rpf.source_nexthop, &src, &grp, + pimg, &pnc, &up->rpf.source_nexthop, &src, + &grp, !PIM_UPSTREAM_FLAG_TEST_FHR(up->flags) && !PIM_UPSTREAM_FLAG_TEST_SRC_IGMP( up->flags))) @@ -229,10 +230,10 @@ enum pim_rpf_result pim_rpf_update(struct pim_upstream *up, struct pim_rpf *old, } } else { if (!pim_ecmp_nexthop_lookup( - &rpf->source_nexthop, up->upstream_addr, &src, &grp, - !PIM_UPSTREAM_FLAG_TEST_FHR(up->flags) - && !PIM_UPSTREAM_FLAG_TEST_SRC_IGMP( - up->flags))) + pimg, &rpf->source_nexthop, up->upstream_addr, &src, + &grp, !PIM_UPSTREAM_FLAG_TEST_FHR(up->flags) + && !PIM_UPSTREAM_FLAG_TEST_SRC_IGMP( + up->flags))) return PIM_RPF_FAILURE; } |