From 8a96c6d0e71428df0ea98e52c5e8f8e1318adc0d Mon Sep 17 00:00:00 2001 From: Damjan Marion Date: Mon, 21 Mar 2022 15:06:57 +0100 Subject: vppinfra: use clib_mem_alloc Type: refactor Change-Id: I26a2a410f8f4070d10696f796d5887842cad3916 Signed-off-by: Damjan Marion --- src/examples/srv6-sample-localsid/srv6_localsid_sample.c | 3 +-- src/plugins/srv6-ad-flow/ad-flow.c | 2 +- src/plugins/srv6-ad/ad.c | 2 +- src/plugins/srv6-am/am.c | 2 +- src/plugins/srv6-as/as.c | 2 +- src/plugins/srv6-mobile/gtp4_d.c | 2 +- src/plugins/srv6-mobile/gtp4_dt.c | 2 +- src/plugins/srv6-mobile/gtp4_e.c | 2 +- src/plugins/srv6-mobile/gtp6_d.c | 2 +- src/plugins/srv6-mobile/gtp6_d_di.c | 2 +- src/plugins/srv6-mobile/gtp6_dt.c | 2 +- src/plugins/srv6-mobile/gtp6_e.c | 2 +- 12 files changed, 12 insertions(+), 13 deletions(-) (limited to 'src') diff --git a/src/examples/srv6-sample-localsid/srv6_localsid_sample.c b/src/examples/srv6-sample-localsid/srv6_localsid_sample.c index 8ea3218e412..5b33ed6d091 100644 --- a/src/examples/srv6-sample-localsid/srv6_localsid_sample.c +++ b/src/examples/srv6-sample-localsid/srv6_localsid_sample.c @@ -91,8 +91,7 @@ unformat_srv6_localsid_sample (unformat_input_t * input, va_list * args) if (unformat (input, "new_srv6_localsid %u", &table_id)) { /* Allocate a portion of memory */ - ls_mem = clib_mem_alloc_aligned_at_offset ( - sizeof(srv6_localsid_sample_per_sid_memory_t), 0, 0, 1); + ls_mem = clib_mem_alloc (sizeof (srv6_localsid_sample_per_sid_memory_t)); /* Set to zero the memory */ clib_memset (ls_mem, 0, sizeof(srv6_localsid_sample_per_sid_memory_t)); diff --git a/src/plugins/srv6-ad-flow/ad-flow.c b/src/plugins/srv6-ad-flow/ad-flow.c index fd9706dabe1..56a7f643a00 100644 --- a/src/plugins/srv6-ad-flow/ad-flow.c +++ b/src/plugins/srv6-ad-flow/ad-flow.c @@ -366,7 +366,7 @@ unformat_srv6_ad_flow_localsid (unformat_input_t *input, va_list *args) } /* Allocate and initialize memory block for local SID parameters */ - ls_mem = clib_mem_alloc_aligned_at_offset (sizeof *ls_mem, 0, 0, 1); + ls_mem = clib_mem_alloc (sizeof *ls_mem); clib_memset (ls_mem, 0, sizeof *ls_mem); *plugin_mem_p = ls_mem; diff --git a/src/plugins/srv6-ad/ad.c b/src/plugins/srv6-ad/ad.c index 045ddeb466d..387df614e7f 100644 --- a/src/plugins/srv6-ad/ad.c +++ b/src/plugins/srv6-ad/ad.c @@ -362,7 +362,7 @@ unformat_srv6_ad_localsid (unformat_input_t * input, va_list * args) } /* Allocate and initialize memory block for local SID parameters */ - ls_mem = clib_mem_alloc_aligned_at_offset (sizeof *ls_mem, 0, 0, 1); + ls_mem = clib_mem_alloc (sizeof *ls_mem); clib_memset (ls_mem, 0, sizeof *ls_mem); *plugin_mem_p = ls_mem; diff --git a/src/plugins/srv6-am/am.c b/src/plugins/srv6-am/am.c index 1408ebc470b..bcc483e292b 100644 --- a/src/plugins/srv6-am/am.c +++ b/src/plugins/srv6-am/am.c @@ -139,7 +139,7 @@ unformat_srv6_am_localsid (unformat_input_t * input, va_list * args) unformat_vnet_sw_interface, vnm, &sw_if_index_in)) { /* Allocate a portion of memory */ - ls_mem = clib_mem_alloc_aligned_at_offset (sizeof *ls_mem, 0, 0, 1); + ls_mem = clib_mem_alloc (sizeof *ls_mem); /* Set to zero the memory */ clib_memset (ls_mem, 0, sizeof *ls_mem); diff --git a/src/plugins/srv6-as/as.c b/src/plugins/srv6-as/as.c index d9dbd8aa608..2d9b831075b 100644 --- a/src/plugins/srv6-as/as.c +++ b/src/plugins/srv6-as/as.c @@ -470,7 +470,7 @@ unformat_srv6_as_localsid (unformat_input_t * input, va_list * args) } /* Allocate and initialize memory block for local SID parameters */ - ls_mem = clib_mem_alloc_aligned_at_offset (sizeof *ls_mem, 0, 0, 1); + ls_mem = clib_mem_alloc (sizeof *ls_mem); clib_memset (ls_mem, 0, sizeof *ls_mem); *plugin_mem_p = ls_mem; diff --git a/src/plugins/srv6-mobile/gtp4_d.c b/src/plugins/srv6-mobile/gtp4_d.c index bf5dcd2e1b2..269902429d3 100644 --- a/src/plugins/srv6-mobile/gtp4_d.c +++ b/src/plugins/srv6-mobile/gtp4_d.c @@ -172,7 +172,7 @@ clb_unformat_srv6_t_m_gtp4_d (unformat_input_t * input, va_list * args) return 0; } - ls_mem = clib_mem_alloc_aligned_at_offset (sizeof *ls_mem, 0, 0, 1); + ls_mem = clib_mem_alloc (sizeof *ls_mem); clib_memset (ls_mem, 0, sizeof *ls_mem); *plugin_mem_p = ls_mem; diff --git a/src/plugins/srv6-mobile/gtp4_dt.c b/src/plugins/srv6-mobile/gtp4_dt.c index 44a4af34c2f..1f6bab1d055 100644 --- a/src/plugins/srv6-mobile/gtp4_dt.c +++ b/src/plugins/srv6-mobile/gtp4_dt.c @@ -118,7 +118,7 @@ clb_unformat_srv6_t_m_gtp4_dt (unformat_input_t * input, va_list * args) return 0; } - ls_mem = clib_mem_alloc_aligned_at_offset (sizeof *ls_mem, 0, 0, 1); + ls_mem = clib_mem_alloc (sizeof *ls_mem); clib_memset (ls_mem, 0, sizeof *ls_mem); *plugin_mem_p = ls_mem; diff --git a/src/plugins/srv6-mobile/gtp4_e.c b/src/plugins/srv6-mobile/gtp4_e.c index 580619f761f..8efb938cf72 100644 --- a/src/plugins/srv6-mobile/gtp4_e.c +++ b/src/plugins/srv6-mobile/gtp4_e.c @@ -113,7 +113,7 @@ clb_unformat_srv6_end_m_gtp4_e (unformat_input_t * input, va_list * args) if (!config) return 0; - ls_mem = clib_mem_alloc_aligned_at_offset (sizeof *ls_mem, 0, 0, 1); + ls_mem = clib_mem_alloc (sizeof *ls_mem); clib_memset (ls_mem, 0, sizeof *ls_mem); *plugin_mem_p = ls_mem; diff --git a/src/plugins/srv6-mobile/gtp6_d.c b/src/plugins/srv6-mobile/gtp6_d.c index 2d464fbf760..79549276c2c 100644 --- a/src/plugins/srv6-mobile/gtp6_d.c +++ b/src/plugins/srv6-mobile/gtp6_d.c @@ -150,7 +150,7 @@ clb_unformat_srv6_end_m_gtp6_d (unformat_input_t * input, va_list * args) return 0; } - ls_mem = clib_mem_alloc_aligned_at_offset (sizeof *ls_mem, 0, 0, 1); + ls_mem = clib_mem_alloc (sizeof *ls_mem); clib_memset (ls_mem, 0, sizeof *ls_mem); *plugin_mem_p = ls_mem; diff --git a/src/plugins/srv6-mobile/gtp6_d_di.c b/src/plugins/srv6-mobile/gtp6_d_di.c index acebcd6d1d7..601db26aa90 100644 --- a/src/plugins/srv6-mobile/gtp6_d_di.c +++ b/src/plugins/srv6-mobile/gtp6_d_di.c @@ -125,7 +125,7 @@ clb_unformat_srv6_end_m_gtp6_d_di (unformat_input_t * input, va_list * args) return 0; } - ls_mem = clib_mem_alloc_aligned_at_offset (sizeof *ls_mem, 0, 0, 1); + ls_mem = clib_mem_alloc (sizeof *ls_mem); clib_memset (ls_mem, 0, sizeof *ls_mem); *plugin_mem_p = ls_mem; diff --git a/src/plugins/srv6-mobile/gtp6_dt.c b/src/plugins/srv6-mobile/gtp6_dt.c index cbd2327cc47..ba8de54bec9 100644 --- a/src/plugins/srv6-mobile/gtp6_dt.c +++ b/src/plugins/srv6-mobile/gtp6_dt.c @@ -112,7 +112,7 @@ clb_unformat_srv6_end_m_gtp6_dt (unformat_input_t * input, va_list * args) return 0; } - ls_mem = clib_mem_alloc_aligned_at_offset (sizeof *ls_mem, 0, 0, 1); + ls_mem = clib_mem_alloc (sizeof *ls_mem); clib_memset (ls_mem, 0, sizeof *ls_mem); *plugin_mem_p = ls_mem; diff --git a/src/plugins/srv6-mobile/gtp6_e.c b/src/plugins/srv6-mobile/gtp6_e.c index 16ed023d13d..feaaaf95419 100644 --- a/src/plugins/srv6-mobile/gtp6_e.c +++ b/src/plugins/srv6-mobile/gtp6_e.c @@ -86,7 +86,7 @@ clb_unformat_srv6_end_m_gtp6_e (unformat_input_t * input, va_list * args) if (!unformat (input, "end.m.gtp6.e fib-table %d", &fib_table)) return 0; - ls_mem = clib_mem_alloc_aligned_at_offset (sizeof *ls_mem, 0, 0, 1); + ls_mem = clib_mem_alloc (sizeof *ls_mem); clib_memset (ls_mem, 0, sizeof *ls_mem); *plugin_mem_p = ls_mem; -- cgit 1.2.3-korg