summaryrefslogtreecommitdiffstats
path: root/src/plugins/lacp
diff options
context:
space:
mode:
authorDamjan Marion <damarion@cisco.com>2020-12-13 21:47:40 +0100
committerDave Barach <openvpp@barachs.net>2020-12-14 12:14:21 +0000
commitb2c31b685fd2cf28436ca32bc93e23eb24c74878 (patch)
treedc0a1b1ff784445b2cbb0f9b2c07b5bcb4f5a5d0 /src/plugins/lacp
parent62c25abaa3e93be5815172d391295a6ab0390122 (diff)
misc: move to new pool_foreach macros
Type: refactor Change-Id: Ie67dc579e88132ddb1ee4a34cb69f96920101772 Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src/plugins/lacp')
-rw-r--r--src/plugins/lacp/cli.c9
-rw-r--r--src/plugins/lacp/lacp.c6
-rw-r--r--src/plugins/lacp/rx_machine.c4
3 files changed, 9 insertions, 10 deletions
diff --git a/src/plugins/lacp/cli.c b/src/plugins/lacp/cli.c
index 7abc6f0c4ca..fee9a5a2269 100644
--- a/src/plugins/lacp/cli.c
+++ b/src/plugins/lacp/cli.c
@@ -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)
diff --git a/src/plugins/lacp/lacp.c b/src/plugins/lacp/lacp.c
index 319a8f79d48..44a32aa23a9 100644
--- a/src/plugins/lacp/lacp.c
+++ b/src/plugins/lacp/lacp.c
@@ -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* */
}
diff --git a/src/plugins/lacp/rx_machine.c b/src/plugins/lacp/rx_machine.c
index 60edc80d863..6e36a661034 100644
--- a/src/plugins/lacp/rx_machine.c
+++ b/src/plugins/lacp/rx_machine.c
@@ -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;