diff options
| author | David S. Miller <davem@davemloft.net> | 2020-06-17 13:26:55 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-17 13:26:55 -0700 |
| commit | b9d37bbb55b8993d296a86fa21f98fa550b61967 (patch) | |
| tree | 73a93a246e9261c7738595af15e6f5a0cf44115a /net | |
| parent | 69119673bd50b176ded34032fadd41530fb5af21 (diff) | |
| parent | 8030e250d882db174cbcd88273570ffb36a13080 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2020-06-17
The following pull-request contains BPF updates for your *net* tree.
We've added 10 non-merge commits during the last 2 day(s) which contain
a total of 14 files changed, 158 insertions(+), 59 deletions(-).
The main changes are:
1) Important fix for bpf_probe_read_kernel_str() return value, from Andrii.
2) [gs]etsockopt fix for large optlen, from Stanislav.
3) devmap allocation fix, from Toke.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/xdp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/core/xdp.c b/net/core/xdp.c index 90f44f382115..3c45f99e26d5 100644 --- a/net/core/xdp.c +++ b/net/core/xdp.c @@ -462,6 +462,7 @@ struct xdp_frame *xdp_convert_zc_to_xdp_frame(struct xdp_buff *xdp) xdpf->len = totsize - metasize; xdpf->headroom = 0; xdpf->metasize = metasize; + xdpf->frame_sz = PAGE_SIZE; xdpf->mem.type = MEM_TYPE_PAGE_ORDER0; xsk_buff_free(xdp); |