X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest-pmd%2Fbpf_cmd.c;h=6980291f075e7c21d767075b63103d6cc5f4529d;hb=f1ea76eb63944a65e9e0bbc32244bc7c8b4fbd1d;hp=16e3c3b3b3385e48267e27c9c3fd143f96e43a4f;hpb=9b539662437c0bbd385329bf077224cbb83d0c48;p=dpdk.git diff --git a/app/test-pmd/bpf_cmd.c b/app/test-pmd/bpf_cmd.c index 16e3c3b3b3..6980291f07 100644 --- a/app/test-pmd/bpf_cmd.c +++ b/app/test-pmd/bpf_cmd.c @@ -20,7 +20,7 @@ static const struct rte_bpf_xsym bpf_xsym[] = { .name = RTE_STR(stdout), .type = RTE_BPF_XTYPE_VAR, .var = { - .val = &stdout, + .val = (void *)(uintptr_t)&stdout, .desc = { .type = RTE_BPF_ARG_PTR, .size = sizeof(stdout), @@ -69,7 +69,7 @@ bpf_parse_flags(const char *str, struct rte_bpf_arg *arg, uint32_t *flags) *flags = RTE_BPF_ETH_F_NONE; arg->type = RTE_BPF_ARG_PTR; - arg->size = mbuf_data_size; + arg->size = mbuf_data_size[0]; for (i = 0; str[i] != 0; i++) { v = toupper(str[i]); @@ -78,7 +78,7 @@ bpf_parse_flags(const char *str, struct rte_bpf_arg *arg, uint32_t *flags) else if (v == 'M') { arg->type = RTE_BPF_ARG_PTR_MBUF; arg->size = sizeof(struct rte_mbuf); - arg->buf_size = mbuf_data_size; + arg->buf_size = mbuf_data_size[0]; } else if (v == '-') continue; else @@ -124,9 +124,9 @@ cmdline_parse_token_string_t cmd_load_bpf_dir = TOKEN_STRING_INITIALIZER(struct cmd_bpf_ld_result, dir, "rx#tx"); cmdline_parse_token_num_t cmd_load_bpf_port = - TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, port, UINT8); + TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, port, RTE_UINT8); cmdline_parse_token_num_t cmd_load_bpf_queue = - TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, queue, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_bpf_ld_result, queue, RTE_UINT16); cmdline_parse_token_string_t cmd_load_bpf_flags = TOKEN_STRING_INITIALIZER(struct cmd_bpf_ld_result, flags, NULL); @@ -180,9 +180,9 @@ cmdline_parse_token_string_t cmd_unload_bpf_dir = TOKEN_STRING_INITIALIZER(struct cmd_bpf_unld_result, dir, "rx#tx"); cmdline_parse_token_num_t cmd_unload_bpf_port = - TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result, port, UINT8); + TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result, port, RTE_UINT8); cmdline_parse_token_num_t cmd_unload_bpf_queue = - TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result, queue, UINT16); + TOKEN_NUM_INITIALIZER(struct cmd_bpf_unld_result, queue, RTE_UINT16); cmdline_parse_inst_t cmd_operate_bpf_unld_parse = { .f = cmd_operate_bpf_unld_parsed,