diff options
| author | David S. Miller <davem@davemloft.net> | 2020-06-14 00:28:08 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-14 00:28:08 +0200 |
| commit | fa7566a0d68f8467846cba8ec29f1551b0a42de9 (patch) | |
| tree | c520797b309d68cacd4bb9089473af7bf8644f07 /net/xdp | |
| parent | net: atm: Remove the error message according to the atomic context (diff) | |
| parent | bpf: Undo internal BPF_PROBE_MEM in BPF insns dump (diff) | |
| download | linux-fa7566a0d68f8467846cba8ec29f1551b0a42de9.tar.xz linux-fa7566a0d68f8467846cba8ec29f1551b0a42de9.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2020-06-12
The following pull-request contains BPF updates for your *net* tree.
We've added 26 non-merge commits during the last 10 day(s) which contain
a total of 27 files changed, 348 insertions(+), 93 deletions(-).
The main changes are:
1) sock_hash accounting fix, from Andrey.
2) libbpf fix and probe_mem sanitizing, from Andrii.
3) sock_hash fixes, from Jakub.
4) devmap_val fix, from Jesper.
5) load_bytes_relative fix, from YiFei.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xdp')
| -rw-r--r-- | net/xdp/xsk.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index b6c0f08bd80d..3700266229f6 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -352,10 +352,8 @@ static int xsk_generic_xmit(struct sock *sk) len = desc.len; skb = sock_alloc_send_skb(sk, len, 1, &err); - if (unlikely(!skb)) { - err = -EAGAIN; + if (unlikely(!skb)) goto out; - } skb_put(skb, len); addr = desc.addr; |