From 8a853e3f0275efc8b05cb195085d45946942744a Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 14 Nov 2018 11:13:11 +0000 Subject: New upstream version 18.11-rc3 Change-Id: I958b9d019027ef049bd992b3968a667f3ae382ae Signed-off-by: Luca Boccassi --- examples/fips_validation/fips_validation_tdes.c | 2 +- examples/fips_validation/main.c | 6 +++--- examples/flow_filtering/main.c | 2 +- examples/ip_pipeline/cli.c | 28 +++++++++++++++---------- examples/l3fwd-power/main.c | 2 +- 5 files changed, 23 insertions(+), 17 deletions(-) (limited to 'examples') diff --git a/examples/fips_validation/fips_validation_tdes.c b/examples/fips_validation/fips_validation_tdes.c index 5064ff3b..15ee434e 100644 --- a/examples/fips_validation/fips_validation_tdes.c +++ b/examples/fips_validation/fips_validation_tdes.c @@ -202,7 +202,7 @@ parse_test_tdes_writeback(struct fips_val *val) static int writeback_tdes_hex_str(const char *key, char *dst, struct fips_val *val) { - struct fips_val tmp_val; + struct fips_val tmp_val = {0}; tmp_val.len = 8; diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c index 85f54cbf..e7559c63 100644 --- a/examples/fips_validation/main.c +++ b/examples/fips_validation/main.c @@ -887,9 +887,9 @@ fips_mct_tdes_test(void) #define TDES_EXTERN_ITER 400 #define TDES_INTERN_ITER 10000 struct fips_val val, val_key; - uint8_t prev_out[TDES_BLOCK_SIZE]; - uint8_t prev_prev_out[TDES_BLOCK_SIZE]; - uint8_t prev_in[TDES_BLOCK_SIZE]; + uint8_t prev_out[TDES_BLOCK_SIZE] = {0}; + uint8_t prev_prev_out[TDES_BLOCK_SIZE] = {0}; + uint8_t prev_in[TDES_BLOCK_SIZE] = {0}; uint32_t i, j, k; int ret; diff --git a/examples/flow_filtering/main.c b/examples/flow_filtering/main.c index 27e287ae..a582ac07 100644 --- a/examples/flow_filtering/main.c +++ b/examples/flow_filtering/main.c @@ -137,7 +137,7 @@ init_port(void) struct rte_eth_dev_info dev_info; rte_eth_dev_info_get(port_id, &dev_info); - port_conf.txmode.offloads &= dev_info.rx_offload_capa; + port_conf.txmode.offloads &= dev_info.tx_offload_capa; printf(":: initializing port: %d\n", port_id); ret = rte_eth_dev_configure(port_id, nr_queues, nr_queues, &port_conf); diff --git a/examples/ip_pipeline/cli.c b/examples/ip_pipeline/cli.c index 3de62068..91038628 100644 --- a/examples/ip_pipeline/cli.c +++ b/examples/ip_pipeline/cli.c @@ -6841,20 +6841,26 @@ cli_rule_file_process(const char *file_name, return 0; cli_rule_file_process_free: - *rule_list = NULL; - *n_rules = rule_id; - *line_number = line_id; + if (rule_list != NULL) + *rule_list = NULL; - for ( ; ; ) { - struct table_rule *rule; + if (n_rules != NULL) + *n_rules = rule_id; - rule = TAILQ_FIRST(list); - if (rule == NULL) - break; + if (line_number != NULL) + *line_number = line_id; - TAILQ_REMOVE(list, rule, node); - free(rule); - } + if (list != NULL) + for ( ; ; ) { + struct table_rule *rule; + + rule = TAILQ_FIRST(list); + if (rule == NULL) + break; + + TAILQ_REMOVE(list, rule, node); + free(rule); + } if (f) fclose(f); diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c index 0b3f8fe6..9c7b3156 100644 --- a/examples/l3fwd-power/main.c +++ b/examples/l3fwd-power/main.c @@ -1957,7 +1957,7 @@ main(int argc, char **argv) rte_exit(EXIT_FAILURE, "Invalid L3FWD parameters\n"); if (init_power_library()) - rte_exit(EXIT_FAILURE, "init_power_library failed\n"); + RTE_LOG(ERR, L3FWD_POWER, "init_power_library failed\n"); if (update_lcore_params() < 0) rte_exit(EXIT_FAILURE, "update_lcore_params failed\n"); -- cgit 1.2.3-korg