summaryrefslogtreecommitdiffstats
path: root/net/core/xdp.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2020-07-03 08:05:59 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2020-07-03 08:05:59 -0300
commit9434628fcee63b1f3c6a6881b70e8f69a1f68e88 (patch)
tree255d093aeda6c125f0158e883eb2bf400bb7f737 /net/core/xdp.c
parentc42ad5d4358230be166fc36c87bae0dd1680c570 (diff)
parentcdd3bb54332f82295ed90cd0c09c78cd0c0ee822 (diff)
downloadlinux-9434628fcee63b1f3c6a6881b70e8f69a1f68e88.tar.bz2
Merge remote-tracking branch 'torvalds/master' into perf/urgent
To synchronize UAPI headers. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'net/core/xdp.c')
-rw-r--r--net/core/xdp.c1
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);