diff options
| author | Jafar Al-Gharaibeh <Jafaral@users.noreply.github.com> | 2019-12-07 00:47:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-07 00:47:07 +0100 |
| commit | 94c1ae82daedf364feb7541cd1e786664aa04df8 (patch) | |
| tree | a6617798d7369bf96d81ed34db015b7f5d082357 /pimd/pim_join.c | |
| parent | Merge pull request #4765 from opensourcerouting/defaults-v2 (diff) | |
| parent | pimd: eval use_rpt on new upstream post IIF setup but before MFC programming (diff) | |
| download | frr-94c1ae82daedf364feb7541cd1e786664aa04df8.tar.xz frr-94c1ae82daedf364feb7541cd1e786664aa04df8.zip | |
Merge pull request #5355 from AnuradhaKaruppiah/pim-state-machine-fixes
PIM state machine fixes
Diffstat (limited to 'pimd/pim_join.c')
| -rw-r--r-- | pimd/pim_join.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/pimd/pim_join.c b/pimd/pim_join.c index 89be42842..fbb547c80 100644 --- a/pimd/pim_join.c +++ b/pimd/pim_join.c @@ -327,7 +327,6 @@ int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh, recv_prune(ifp, neigh, msg_holdtime, msg_upstream_addr.u.prefix4, &sg, msg_source_flags); - /* * So if we are receiving a S,G,RPT prune * before we have any data for that S,G @@ -348,10 +347,10 @@ int pim_joinprune_recv(struct interface *ifp, struct pim_neighbor *neigh, "%s: SGRpt flag is set, del inherit oif from up %s", __PRETTY_FUNCTION__, up->sg_str); - pim_channel_del_oif( + pim_channel_del_inherited_oif( up->channel_oil, starg_ch->interface, - PIM_OIF_FLAG_PROTO_STAR); + __func__); } } } |