diff options
| author | David S. Miller <davem@davemloft.net> | 2020-09-30 10:49:20 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-09-30 10:49:20 +0200 |
| commit | 1f25c9bbfd44aed9f9b6546b2815072e7b769546 (patch) | |
| tree | bcca71f65a4ceb571b3f87f32dfefdb9b269e781 /arch | |
| parent | Merge branch 'mptcp-Fix-for-32-bit-DATA_FIN' (diff) | |
| parent | bpf, powerpc: Fix misuse of fallthrough in bpf_jit_comp() (diff) | |
| download | linux-1f25c9bbfd44aed9f9b6546b2815072e7b769546.tar.xz linux-1f25c9bbfd44aed9f9b6546b2815072e7b769546.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2020-09-29
The following pull-request contains BPF updates for your *net* tree.
We've added 7 non-merge commits during the last 14 day(s) which contain
a total of 7 files changed, 28 insertions(+), 8 deletions(-).
The main changes are:
1) fix xdp loading regression in libbpf for old kernels, from Andrii.
2) Do not discard packet when NETDEV_TX_BUSY, from Magnus.
3) Fix corner cases in libbpf related to endianness and kconfig, from Tony.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/net/bpf_jit_comp.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/net/bpf_jit_comp.c b/arch/powerpc/net/bpf_jit_comp.c index 78d61f97371e..e809cb5a1631 100644 --- a/arch/powerpc/net/bpf_jit_comp.c +++ b/arch/powerpc/net/bpf_jit_comp.c @@ -475,7 +475,6 @@ static int bpf_jit_build_body(struct bpf_prog *fp, u32 *image, case BPF_JMP | BPF_JSET | BPF_K: case BPF_JMP | BPF_JSET | BPF_X: true_cond = COND_NE; - fallthrough; cond_branch: /* same targets, can avoid doing the test :) */ if (filter[i].jt == filter[i].jf) { |