From: Donald Sharp <sharpd@cumulusnetworks.com>
Date: Tue, 20 Oct 2015 15:41:09 +0000 (-0700)
Subject: pimd: Cleanup some comments and documentation
X-Git-Tag: frr-2.0-rc1~819
X-Git-Url: https://git.puffer.fish/?a=commitdiff_plain;h=a441b8d7089c6920137078a1dc409607c45a59ed;p=mirror%2Ffrr.git

pimd: Cleanup some comments and documentation

Starting the transition of PIM-SSM to PIM-SM means
that we have to cleanup some internal code comments
so that the code will match the comments.

Signed-off-by: Donald Sharp<sharpd@cumulusnetworks.com
---

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);