summaryrefslogtreecommitdiffstats
path: root/pimd/pim_upstream.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-05-21 14:45:46 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-07-24 19:51:36 +0200
commit611925dc0261dd24fd1c02ac7c3af5c0bf3803cf (patch)
tree1578c0c75d661ac3a333de447710b84ce7df8941 /pimd/pim_upstream.c
parentpimd: Convert vif and ifindex lookups to use 'struct pim_instance *' (diff)
downloadfrr-611925dc0261dd24fd1c02ac7c3af5c0bf3803cf.tar.xz
frr-611925dc0261dd24fd1c02ac7c3af5c0bf3803cf.zip
pimd: Convert channel_oil_hash and list into 'struct pim_instance *'
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_upstream.c')
-rw-r--r--pimd/pim_upstream.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 96f49ec53..9d4620675 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -702,7 +702,7 @@ pim_upstream_new(struct prefix_sg *sg, struct interface *incoming, int flags)
pim_ifp = up->rpf.source_nexthop.interface->info;
if (pim_ifp)
up->channel_oil = pim_channel_oil_add(
- &up->sg, pim_ifp->mroute_vif_index);
+ pim, &up->sg, pim_ifp->mroute_vif_index);
}
listnode_add_sort(pim->upstream_list, up);
@@ -1414,8 +1414,8 @@ int pim_upstream_inherited_olist_decide(struct pim_instance *pim,
__PRETTY_FUNCTION__, up->sg_str);
}
if (pim_ifp && !up->channel_oil)
- up->channel_oil =
- pim_channel_oil_add(&up->sg, pim_ifp->mroute_vif_index);
+ up->channel_oil = pim_channel_oil_add(
+ pim, &up->sg, pim_ifp->mroute_vif_index);
for (ALL_LIST_ELEMENTS_RO(vrf_iflist(pim->vrf_id), node, ifp)) {
if (!ifp->info)