diff options
| -rw-r--r-- | pimd/pim_macro.c | 2 | ||||
| -rw-r--r-- | pimd/pim_rpf.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/pimd/pim_macro.c b/pimd/pim_macro.c index f67636a3fe..adb999a2b2 100644 --- a/pimd/pim_macro.c +++ b/pimd/pim_macro.c @@ -309,10 +309,10 @@ struct pim_assert_metric pim_macro_ch_my_assert_metric_eval(const struct pim_ifc /* RFC 4601 4.2. Data Packet Forwarding Rules - RFC 4601 4.8.2. PIM-SSM-Only Routers Macro: inherited_olist(S,G) = + inherited_olist(S,G,rpt) (+) joins(S,G) (+) pim_include(S,G) (-) lost_assert(S,G) */ static int pim_macro_chisin_inherited_olist(const struct pim_ifchannel *ch) diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c index fb3636b2dc..1838118168 100644 --- a/pimd/pim_rpf.c +++ b/pimd/pim_rpf.c @@ -165,7 +165,6 @@ enum pim_rpf_result pim_rpf_update(struct pim_upstream *up, nhaddr_str, rpf->source_nexthop.mrib_metric_preference, rpf->source_nexthop.mrib_route_metric); - /* warning only */ } pim_upstream_update_join_desired(up); |