ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

misc: move to new pool_foreach macros

Browse Source 
Type: refactor
Change-Id: Ie67dc579e88132ddb1ee4a34cb69f96920101772
Signed-off-by: Damjan Marion <damarion@cisco.com>
This commit is contained in:
Damjan Marion
2020-12-13 21:47:40 +01:00
committed by Dave Barach
parent 62c25abaa3
commit b2c31b685f
228 changed files with 1395 additions and 1441 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/plugins/lacp/cli.c
+4 -5
View File
@@ -29,7 +29,7 @@ lacp_dump_ifs (lacp_interface_details_t ** out_lacpifs)
lacp_interface_details_t *lacpif = NULL;
/* *INDENT-OFF* */
pool_foreach (mif, bm->neighbors,
pool_foreach (mif, bm->neighbors) {
if (mif->lacp_enabled == 0)
continue;
vec_add2(r_lacpifs, lacpif, 1);
@@ -60,7 +60,7 @@ lacp_dump_ifs (lacp_interface_details_t ** out_lacpifs)
lacpif->tx_state = mif->tx_state;
lacpif->ptx_state = mif->ptx_state;
lacpif->mux_state = mif->mux_state;
);
}
/* *INDENT-ON* */
*out_lacpifs = r_lacpifs;
@@ -295,9 +295,8 @@ show_lacp_fn (vlib_main_t * vm, unformat_input_t * input,
if (vec_len (sw_if_indices) == 0)
{
pool_foreach (mif, bm->neighbors,
vec_add1 (sw_if_indices, mif->sw_if_index);
);
pool_foreach (mif, bm->neighbors)
vec_add1 (sw_if_indices, mif->sw_if_index);
}
if (details)
src/plugins/lacp/lacp.c
+3 -3
View File
@@ -143,8 +143,8 @@ lacp_periodic (vlib_main_t * vm)
u8 actor_state, partner_state;
/* *INDENT-OFF* */
pool_foreach (mif, bm->neighbors,
({
pool_foreach (mif, bm->neighbors)
{
if (mif->port_enabled == 0)
continue;
@@ -184,7 +184,7 @@ lacp_periodic (vlib_main_t * vm)
[mif->sw_if_index].partner_state,
mif->partner.state);
}
}));
}
/* *INDENT-ON* */
}
src/plugins/lacp/rx_machine.c
+2 -2
View File
@@ -344,7 +344,7 @@ lacp_port_is_moved (vlib_main_t * vm, member_if_t * mif)
lacp_pdu_t *lacpdu = (lacp_pdu_t *) mif->last_rx_pkt;
/* *INDENT-OFF* */
pool_foreach (mif2, bm->neighbors, {
pool_foreach (mif2, bm->neighbors) {
{
if ((mif != mif2) && (mif2->rx_state == LACP_RX_STATE_PORT_DISABLED) &&
!memcmp (mif2->partner.system,
@@ -352,7 +352,7 @@ lacp_port_is_moved (vlib_main_t * vm, member_if_t * mif)
(mif2->partner.port_number == lacpdu->partner.port_info.port_number))
return 1;
}
});
}
/* *INDENT-ON* */
return 0;