lib: enforce vrf_name_to_id by returning default_vrf when name is null

[mirror_frr.git] / pimd / pim_ifchannel.h

diff --git a/pimd/pim_ifchannel.h b/pimd/pim_ifchannel.h
index cef431c30d0f35af712b968a83998b26d853bd2f..b9d4d291d854d910aeb96bd58048878b1786050d 100644 (file)
--- a/pimd/pim_ifchannel.h
+++ b/pimd/pim_ifchannel.h
@@ -111,10 +111,9 @@ struct pim_ifchannel {
 };
 
 RB_HEAD(pim_ifchannel_rb, pim_ifchannel);
-RB_PROTOTYPE(pim_ifchannel_rb, pim_ifchannel,
-            pim_ifp_rb, pim_ifchannel_compare);
+RB_PROTOTYPE(pim_ifchannel_rb, pim_ifchannel, pim_ifp_rb,
+            pim_ifchannel_compare);
 
-void pim_ifchannel_free(struct pim_ifchannel *ch);
 void pim_ifchannel_delete(struct pim_ifchannel *ch);
 void pim_ifchannel_delete_all(struct interface *ifp);
 void pim_ifchannel_membership_clear(struct interface *ifp);
@@ -151,8 +150,7 @@ void pim_ifchannel_update_assert_tracking_desired(struct pim_ifchannel *ch);
 
 void pim_ifchannel_scan_forward_start(struct interface *new_ifp);
 void pim_ifchannel_set_star_g_join_state(struct pim_ifchannel *ch, int eom,
-                                        uint8_t source_flags, uint8_t join,
-                                        uint8_t starg_alone);
+                                        uint8_t join);
 
 int pim_ifchannel_compare(const struct pim_ifchannel *ch1,
                          const struct pim_ifchannel *ch2);