mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-02-17 05:28:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bpf-next/skb-meta-dynptr' into 'bpf-next/master'

Browse Source 
Merge skb-meta-dynptr branch into master branch after fixing a compiler
warning. No conflict.

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
This commit is contained in:
Martin KaFai Lau
2025-09-04 21:10:13 -07:00
parent b338cf849e 54728bd535
commit 9621eb635b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/filter.h
View File

@@ -1816,7 +1816,7 @@ static inline void bpf_xdp_copy_buf(struct xdp_buff *xdp, unsigned long off, voi
static inline void *bpf_skb_meta_pointer(struct sk_buff *skb, u32 offset)
{
return NULL;
return ERR_PTR(-EOPNOTSUPP);
}
#endif /* CONFIG_NET */