diff options
Diffstat (limited to 'zebra')
| -rw-r--r-- | zebra/if_ioctl.c | 2 | ||||
| -rw-r--r-- | zebra/interface.c | 8 | ||||
| -rw-r--r-- | zebra/irdp_main.c | 2 | ||||
| -rw-r--r-- | zebra/rtadv.c | 2 | ||||
| -rw-r--r-- | zebra/zebra_l2.c | 2 | ||||
| -rw-r--r-- | zebra/zebra_ptm.c | 4 | ||||
| -rw-r--r-- | zebra/zebra_vrf.c | 2 | ||||
| -rw-r--r-- | zebra/zebra_vxlan.c | 2 | ||||
| -rw-r--r-- | zebra/zserv.c | 2 |
9 files changed, 13 insertions, 13 deletions
diff --git a/zebra/if_ioctl.c b/zebra/if_ioctl.c index 33e53551b..1d108886d 100644 --- a/zebra/if_ioctl.c +++ b/zebra/if_ioctl.c @@ -265,7 +265,7 @@ static void interface_info_ioctl() struct vrf *vrf = vrf_lookup_by_id(VRF_DEFAULT); struct interface *ifp; - RB_FOREACH (ifp, if_name_head, &vrf->ifaces_by_name) { + FOR_ALL_INTERFACES (vrf, ifp) { if_get_index(ifp); #ifdef SIOCGIFHWADDR if_get_hwaddr(ifp); diff --git a/zebra/interface.c b/zebra/interface.c index fe7241964..e912b2dcf 100644 --- a/zebra/interface.c +++ b/zebra/interface.c @@ -1328,7 +1328,7 @@ DEFUN (show_interface, /* All interface print. */ vrf = vrf_lookup_by_id(vrf_id); - RB_FOREACH (ifp, if_name_head, &vrf->ifaces_by_name) + FOR_ALL_INTERFACES (vrf, ifp) if_dump_vty(vty, ifp); return CMD_SUCCESS; @@ -1350,7 +1350,7 @@ DEFUN (show_interface_vrf_all, /* All interface print. */ RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) - RB_FOREACH (ifp, if_name_head, &vrf->ifaces_by_name) + FOR_ALL_INTERFACES (vrf, ifp) if_dump_vty(vty, ifp); return CMD_SUCCESS; @@ -1429,7 +1429,7 @@ static void if_show_description(struct vty *vty, vrf_id_t vrf_id) struct interface *ifp; vty_out(vty, "Interface Status Protocol Description\n"); - RB_FOREACH (ifp, if_name_head, &vrf->ifaces_by_name) { + FOR_ALL_INTERFACES (vrf, ifp) { int len; len = vty_out(vty, "%s", ifp->name); @@ -2835,7 +2835,7 @@ static int if_config_write(struct vty *vty) zebra_ptm_write(vty); RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) - RB_FOREACH (ifp, if_name_head, &vrf->ifaces_by_name) { + FOR_ALL_INTERFACES (vrf, ifp) { struct zebra_if *if_data; struct listnode *addrnode; struct connected *ifc; diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c index 816bc85ce..5567d53c3 100644 --- a/zebra/irdp_main.c +++ b/zebra/irdp_main.c @@ -322,7 +322,7 @@ static int irdp_finish(void) zlog_info("IRDP: Received shutdown notification."); RB_FOREACH (vrf, vrf_id_head, &vrfs_by_id) - RB_FOREACH (ifp, if_name_head, &vrf->ifaces_by_name) { + FOR_ALL_INTERFACES (vrf, ifp) { zi = ifp->info; if (!zi) diff --git a/zebra/rtadv.c b/zebra/rtadv.c index c870e2916..6a8e2ac59 100644 --- a/zebra/rtadv.c +++ b/zebra/rtadv.c @@ -397,7 +397,7 @@ static int rtadv_timer(struct thread *thread) } RB_FOREACH (vrf, vrf_id_head, &vrfs_by_id) - RB_FOREACH (ifp, if_name_head, &vrf->ifaces_by_name) { + FOR_ALL_INTERFACES (vrf, ifp) { if (if_is_loopback(ifp) || CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_VRF_LOOPBACK) diff --git a/zebra/zebra_l2.c b/zebra/zebra_l2.c index 2ee711e1c..529fc48ed 100644 --- a/zebra/zebra_l2.c +++ b/zebra/zebra_l2.c @@ -55,7 +55,7 @@ static void map_slaves_to_bridge(struct interface *br_if, int link) struct interface *ifp; RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) { - RB_FOREACH (ifp, if_name_head, &vrf->ifaces_by_name) { + FOR_ALL_INTERFACES (vrf, ifp) { struct zebra_if *zif; struct zebra_l2info_brslave *br_slave; diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c index 46d16e46c..93b0723d8 100644 --- a/zebra/zebra_ptm.c +++ b/zebra/zebra_ptm.c @@ -263,7 +263,7 @@ DEFUN (zebra_ptm_enable, ptm_cb.ptm_enable = ZEBRA_IF_PTM_ENABLE_ON; RB_FOREACH (vrf, vrf_name_head, &vrfs_by_name) - RB_FOREACH (ifp, if_name_head, &vrf->ifaces_by_name) + FOR_ALL_INTERFACES (vrf, ifp) if (!ifp->ptm_enable) { if_data = (struct zebra_if *)ifp->info; if (if_data @@ -1091,7 +1091,7 @@ void zebra_ptm_reset_status(int ptm_disable) int send_linkup; RB_FOREACH (vrf, vrf_id_head, &vrfs_by_id) - RB_FOREACH (ifp, if_name_head, &vrf->ifaces_by_name) { + FOR_ALL_INTERFACES (vrf, ifp) { send_linkup = 0; if (ifp->ptm_enable) { if (!if_is_operative(ifp)) diff --git a/zebra/zebra_vrf.c b/zebra/zebra_vrf.c index 44a682957..0d0a8dd74 100644 --- a/zebra/zebra_vrf.c +++ b/zebra/zebra_vrf.c @@ -203,7 +203,7 @@ static int zebra_vrf_delete(struct vrf *vrf) zebra_mpls_close_tables(zvrf); zebra_pw_exit(zvrf); - RB_FOREACH (ifp, if_name_head, &vrf->ifaces_by_name) + FOR_ALL_INTERFACES (vrf, ifp) if_nbr_ipv6ll_to_ipv4ll_neigh_del_all(ifp); } diff --git a/zebra/zebra_vxlan.c b/zebra/zebra_vxlan.c index 6066980b2..c0b5f9d10 100644 --- a/zebra/zebra_vxlan.c +++ b/zebra/zebra_vxlan.c @@ -1215,7 +1215,7 @@ struct interface *zebra_get_vrr_intf_for_svi(struct interface *ifp) zvrf = vrf_info_lookup(ifp->vrf_id); assert(zvrf); - RB_FOREACH (tmp_if, if_name_head, &zvrf->vrf->ifaces_by_name) { + FOR_ALL_INTERFACES (zvrf->vrf, tmp_if) { zif = tmp_if->info; if (!zif) continue; diff --git a/zebra/zserv.c b/zebra/zserv.c index 2a08a556d..390ff62b1 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -1004,7 +1004,7 @@ static int zread_interface_add(struct zserv *client, u_short length, vrf_bitmap_set(client->ifinfo, zvrf_id(zvrf)); RB_FOREACH (vrf, vrf_id_head, &vrfs_by_id) { - RB_FOREACH (ifp, if_name_head, &vrf->ifaces_by_name) { + FOR_ALL_INTERFACES (vrf, ifp) { /* Skip pseudo interface. */ if (!CHECK_FLAG(ifp->status, ZEBRA_INTERFACE_ACTIVE)) continue; |