diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-07-31 10:41:12 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-08-02 07:44:00 -0400 |
| commit | 86b473a7e810bc8cfb37fbf9d733048e83c59fbd (patch) | |
| tree | e587a9cbf1f6ef6f0119ed5f97c469e208310d64 /pimd/pim_cmd.c | |
| parent | 1a8a3da8c21b13bbb66d58ade9580b4f19d8e1ad (diff) | |
pimd: Rename pim_ifp->pim_ifchannel_list
Remove the redundant information in pim_ifp->pim_ifchannel_list
just call it pim_ifp->ifchannel_list
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_cmd.c')
| -rw-r--r-- | pimd/pim_cmd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 1519e7a116..6dfd9c2d60 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -228,7 +228,7 @@ static void pim_show_assert(struct pim_instance *pim, struct vty *vty) if (!pim_ifp) continue; - for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_ifchannel_list, + for (ALL_LIST_ELEMENTS_RO(pim_ifp->ifchannel_list, ch_node, ch)) { pim_show_assert_helper(vty, pim_ifp, ch, now); } /* scan interface channels */ @@ -282,7 +282,7 @@ static void pim_show_assert_internal(struct pim_instance *pim, struct vty *vty) if (!pim_ifp) continue; - for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_ifchannel_list, + for (ALL_LIST_ELEMENTS_RO(pim_ifp->ifchannel_list, ch_node, ch)) { pim_show_assert_internal_helper(vty, pim_ifp, ch); } /* scan interface channels */ @@ -332,7 +332,7 @@ static void pim_show_assert_metric(struct pim_instance *pim, struct vty *vty) if (!pim_ifp) continue; - for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_ifchannel_list, + for (ALL_LIST_ELEMENTS_RO(pim_ifp->ifchannel_list, ch_node, ch)) { pim_show_assert_metric_helper(vty, pim_ifp, ch); } /* scan interface channels */ @@ -396,7 +396,7 @@ static void pim_show_assert_winner_metric(struct pim_instance *pim, if (!pim_ifp) continue; - for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_ifchannel_list, + for (ALL_LIST_ELEMENTS_RO(pim_ifp->ifchannel_list, ch_node, ch)) { pim_show_assert_winner_metric_helper(vty, pim_ifp, ch); } /* scan interface channels */ @@ -487,7 +487,7 @@ static void pim_show_membership(struct pim_instance *pim, struct vty *vty, if (!pim_ifp) continue; - for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_ifchannel_list, + for (ALL_LIST_ELEMENTS_RO(pim_ifp->ifchannel_list, ch_node, ch)) { pim_show_membership_helper(vty, pim_ifp, ch, json); } /* scan interface channels */ @@ -1364,7 +1364,7 @@ static void pim_show_interfaces(struct pim_instance *pim, struct vty *vty, continue; pim_nbrs = pim_ifp->pim_neighbor_list->count; - pim_ifchannels = pim_ifp->pim_ifchannel_list->count; + pim_ifchannels = pim_ifp->ifchannel_list->count; fhr = 0; for (ALL_LIST_ELEMENTS_RO(pim->upstream_list, upnode, up)) @@ -1704,7 +1704,7 @@ static void pim_show_join(struct pim_instance *pim, struct vty *vty, u_char uj) if (!pim_ifp) continue; - for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_ifchannel_list, + for (ALL_LIST_ELEMENTS_RO(pim_ifp->ifchannel_list, ch_node, ch)) { pim_show_join_helper(vty, pim_ifp, ch, json, now, uj); @@ -2534,7 +2534,7 @@ static void pim_show_join_desired(struct pim_instance *pim, struct vty *vty, if (!pim_ifp) continue; - for (ALL_LIST_ELEMENTS_RO(pim_ifp->pim_ifchannel_list, + for (ALL_LIST_ELEMENTS_RO(pim_ifp->ifchannel_list, ch_node, ch)) { /* scan all interfaces */ pim_show_join_desired_helper(pim, vty, |