diff options
| author | David S. Miller <davem@davemloft.net> | 2018-08-04 17:51:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-08-04 17:51:55 -0700 |
| commit | 5dbfb6eca0b23751d9ab21989a07b5a22fa544fe (patch) | |
| tree | f689b89e1dd9fd73701af44f5aba3e7c78509a10 /net | |
| parent | 5607016cd1bbec538050b495669c3c8c5a2cee80 (diff) | |
| parent | 8c85cbdf371f9ddf256ecc5d9548b26ee8fcfe2f (diff) | |
| download | linux-5dbfb6eca0b23751d9ab21989a07b5a22fa544fe.tar.gz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Daniel Borkmann says: ==================== pull-request: bpf 2018-08-05 The following pull-request contains BPF updates for your *net* tree. The main changes are: 1) Fix bpftool percpu_array dump by using correct roundup to next multiple of 8 for the value size, from Yonghong. 2) Fix in AF_XDP's __xsk_rcv_zc() to not returning frames back to allocator since driver will recycle frame anyway in case of an error, from Jakub. 3) Fix up BPF test_lwt_seg6local test cases to final iproute2 syntax, from Mathieu. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -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 72335c2e8108..4e937cd7c17d 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -84,10 +84,8 @@ static int __xsk_rcv_zc(struct xdp_sock *xs, struct xdp_buff *xdp, u32 len) { int err = xskq_produce_batch_desc(xs->rx, (u64)xdp->handle, len); - if (err) { - xdp_return_buff(xdp); + if (err) xs->rx_dropped++; - } return err; } |