| Message ID | 20201202123816.5f3a9743@canb.auug.org.au (mailing list archive) |
|---|---|
| State | Not Applicable |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | linux-next: build failure after merge of the net-next tree | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Guessed tree name to be net-next |
| netdev/subject_prefix | warning | Target tree name not specified in the subject |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | fail | Errors and warnings before: 1 this patch: 5 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 8 lines checked |
| netdev/build_allmodconfig_warn | fail | Errors and warnings before: 1 this patch: 5 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
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(-)