| Message ID | 20201202123816.5f3a9743@canb.auug.org.au |
|---|---|
| State | New |
| Headers | show |
| Series | linux-next: build failure after merge of the net-next tree | expand |
diff --git a/net/core/xdp.c b/net/core/xdp.c index f2cdacd81d43..3100f9711eae 100644 --- a/net/core/xdp.c +++ b/net/core/xdp.c @@ -414,7 +414,7 @@ void xdp_return_frame_bulk(struct xdp_frame *xdpf, struct xdp_mem_allocator *xa; if (mem->type != MEM_TYPE_PAGE_POOL) { - __xdp_return(xdpf->data, &xdpf->mem, false); + __xdp_return(xdpf->data, &xdpf->mem, false, NULL); return; }
Hi all, After merging the net-next tree, today's linux-next build (powerpc ppc64_defconfig) failed like this: net/core/xdp.c: In function 'xdp_return_frame_bulk': net/core/xdp.c:417:3: error: too few arguments to function '__xdp_return' 417 | __xdp_return(xdpf->data, &xdpf->mem, false); | ^~~~~~~~~~~~ net/core/xdp.c:340:13: note: declared here 340 | static void __xdp_return(void *data, struct xdp_mem_info *mem, bool napi_direct, | ^~~~~~~~~~~~ Caused by commit 8965398713d8 ("net: xdp: Introduce bulking for xdp tx return path") interacting with commit ed1182dc004d ("xdp: Handle MEM_TYPE_XSK_BUFF_POOL correctly in xdp_return_buff()") from the bpf tree. I applied the following merge fix patch. From: Stephen Rothwell <sfr@canb.auug.org.au> Date: Wed, 2 Dec 2020 12:33:14 +1100 Subject: [PATCH] fix up for "xdp: Handle MEM_TYPE_XSK_BUFF_POOL correctly in xdp_return_buff()" Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- net/core/xdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)