diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-19 19:36:53 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-07-24 13:51:35 -0400 |
| commit | 9b29ea95fc5b03de64cf9de55a89894deaed17e7 (patch) | |
| tree | 65ca0f047472ea8b25e98063d479d434bc18e5e9 /pimd/pim_nht.c | |
| parent | fec883d95a64c37a9d0cb728085c816ff7188874 (diff) | |
pimd: Remove pimg from pim_upstream.c
Move the upstream_list, hash and wheel into 'struct pim_instance'
Remove all pimg to pim in pim_upstream
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_nht.c')
| -rw-r--r-- | pimd/pim_nht.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c index ccb48aae51..eb8bfa7115 100644 --- a/pimd/pim_nht.c +++ b/pimd/pim_nht.c @@ -389,7 +389,7 @@ static int pim_update_upstream_nh(struct pim_instance *pim, */ if (up->channel_oil && up->channel_oil->oil_inherited_rescan) { - pim_upstream_inherited_olist_decide(up); + pim_upstream_inherited_olist_decide(pim, up); up->channel_oil->oil_inherited_rescan = 0; } @@ -431,7 +431,7 @@ static int pim_update_upstream_nh(struct pim_instance *pim, /* FIXME can join_desired actually be changed by pim_rpf_update() returning PIM_RPF_CHANGED ? */ - pim_upstream_update_join_desired(up); + pim_upstream_update_join_desired(pim, up); } /* PIM_RPF_CHANGED */ |