diff options
Diffstat (limited to 'src/plugins/ioam/ip6')
| -rw-r--r-- | src/plugins/ioam/ip6/ioam_cache.c | 25 | ||||
| -rw-r--r-- | src/plugins/ioam/ip6/ioam_cache.h | 19 |
2 files changed, 17 insertions, 27 deletions
diff --git a/src/plugins/ioam/ip6/ioam_cache.c b/src/plugins/ioam/ip6/ioam_cache.c index 74b50c9282e..d9f7029717a 100644 --- a/src/plugins/ioam/ip6/ioam_cache.c +++ b/src/plugins/ioam/ip6/ioam_cache.c @@ -253,12 +253,10 @@ ioam_cache_table_print (vlib_main_t * vm, u8 verbose) int no_of_threads = vec_len (vlib_worker_threads); int i; - pool_foreach (entry, cm->ioam_rewrite_pool, ( - { - vlib_cli_output (vm, "%U", - format_ioam_cache_entry, - entry); - })); + pool_foreach (entry, cm->ioam_rewrite_pool) + { + vlib_cli_output (vm, "%U", format_ioam_cache_entry, entry); + } if (cm->ts_stats) for (i = 0; i < no_of_threads; i++) @@ -269,16 +267,11 @@ ioam_cache_table_print (vlib_main_t * vm, u8 verbose) if (verbose == 1) vlib_worker_thread_barrier_sync (vm); - pool_foreach (ts_entry, cm->ioam_ts_pool[i], ( - { - vlib_cli_output (vm, - "%U", - format_ioam_cache_ts_entry, - ts_entry, - (u32) - i); - } - )); + pool_foreach (ts_entry, cm->ioam_ts_pool[i]) + { + vlib_cli_output (vm, "%U", format_ioam_cache_ts_entry, ts_entry, + (u32) i); + } vlib_worker_thread_barrier_release (vm); } diff --git a/src/plugins/ioam/ip6/ioam_cache.h b/src/plugins/ioam/ip6/ioam_cache.h index dc4ae0053fa..b85172e8ac1 100644 --- a/src/plugins/ioam/ip6/ioam_cache.h +++ b/src/plugins/ioam/ip6/ioam_cache.h @@ -471,10 +471,10 @@ ioam_cache_table_destroy (vlib_main_t * vm) ioam_cache_entry_t *entry = 0; /* free pool and hash table */ clib_bihash_free_8_8 (&cm->ioam_rewrite_cache_table); - pool_foreach (entry, cm->ioam_rewrite_pool, ( - { - ioam_cache_entry_free (entry); - })); + pool_foreach (entry, cm->ioam_rewrite_pool) + { + ioam_cache_entry_free (entry); + } pool_free (cm->ioam_rewrite_pool); cm->ioam_rewrite_pool = 0; vec_free (cm->sr_rewrite_template); @@ -610,13 +610,10 @@ ioam_cache_ts_table_destroy (vlib_main_t * vm) /* free pool and hash table */ for (i = 0; i < no_of_threads; i++) { - pool_foreach (entry, cm->ioam_ts_pool[i], ( - { - ioam_cache_ts_entry_free (i, - entry, - cm->error_node_index); - } - )); + pool_foreach (entry, cm->ioam_ts_pool[i]) + { + ioam_cache_ts_entry_free (i, entry, cm->error_node_index); + } pool_free (cm->ioam_ts_pool[i]); cm->ioam_ts_pool = 0; tw_timer_wheel_free_16t_2w_512sl (&cm->timer_wheels[i]); |