diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2018-08-14 18:55:37 +0100 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2018-08-14 18:57:39 +0100 |
| commit | ae1479de3027a4a0f68d90bf65ac6ff2b862b837 (patch) | |
| tree | 5dbca675b6717b6b61abbe1a9583d5166fed942b /lib/librte_bpf/bpf_jit_x86.c | |
| parent | 8cee230dd1f0f9f31f4b0339c671d0b1ee14e111 (diff) | |
| parent | b63264c8342e6a1b6971c79550d2af2024b6a4de (diff) | |
Merge branch 'upstream' into 18.08.x
Change-Id: Ifbda2d554199dd4d11e01f0090881b5f0103ae12
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'lib/librte_bpf/bpf_jit_x86.c')
| -rw-r--r-- | lib/librte_bpf/bpf_jit_x86.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/lib/librte_bpf/bpf_jit_x86.c b/lib/librte_bpf/bpf_jit_x86.c index 111e028d..68ea389f 100644 --- a/lib/librte_bpf/bpf_jit_x86.c +++ b/lib/librte_bpf/bpf_jit_x86.c @@ -113,20 +113,6 @@ union bpf_jit_imm { uint8_t u8[4]; }; -static size_t -bpf_size(uint32_t bpf_op_sz) -{ - if (bpf_op_sz == BPF_B) - return sizeof(uint8_t); - else if (bpf_op_sz == BPF_H) - return sizeof(uint16_t); - else if (bpf_op_sz == BPF_W) - return sizeof(uint32_t); - else if (bpf_op_sz == EBPF_DW) - return sizeof(uint64_t); - return 0; -} - /* * In many cases for imm8 we can produce shorter code. */ @@ -1294,7 +1280,8 @@ emit(struct bpf_jit_state *st, const struct rte_bpf *bpf) break; /* call instructions */ case (BPF_JMP | EBPF_CALL): - emit_call(st, (uintptr_t)bpf->prm.xsym[ins->imm].func); + emit_call(st, + (uintptr_t)bpf->prm.xsym[ins->imm].func.val); break; /* return instruction */ case (BPF_JMP | EBPF_EXIT): |