diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-20 01:36:53 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-07-24 19:51:35 +0200 |
| commit | 9b29ea95fc5b03de64cf9de55a89894deaed17e7 (patch) | |
| tree | 65ca0f047472ea8b25e98063d479d434bc18e5e9 /pimd/pim_oil.c | |
| parent | pimd: pim_rp.c -> convert pimg to pim (diff) | |
| download | frr-9b29ea95fc5b03de64cf9de55a89894deaed17e7.tar.xz frr-9b29ea95fc5b03de64cf9de55a89894deaed17e7.zip | |
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_oil.c')
| -rw-r--r-- | pimd/pim_oil.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pimd/pim_oil.c b/pimd/pim_oil.c index aeef0ff4e..d4398d1c2 100644 --- a/pimd/pim_oil.c +++ b/pimd/pim_oil.c @@ -165,7 +165,7 @@ struct channel_oil *pim_channel_oil_add(struct prefix_sg *sg, c_oil->oil.mfcc_parent = input_vif_index; ++c_oil->oil_ref_count; c_oil->up = pim_upstream_find( - sg); // channel might be present prior to upstream + pimg, sg); // channel might be present prior to upstream return c_oil; } @@ -191,7 +191,7 @@ struct channel_oil *pim_channel_oil_add(struct prefix_sg *sg, c_oil->oil.mfcc_parent = input_vif_index; c_oil->oil_ref_count = 1; c_oil->installed = 0; - c_oil->up = pim_upstream_find(sg); + c_oil->up = pim_upstream_find(pimg, sg); listnode_add_sort(pim_channel_oil_list, c_oil); |