diff options
| author | Martin KaFai Lau <martin.lau@kernel.org> | 2025-09-04 21:22:00 -0700 |
|---|---|---|
| committer | Martin KaFai Lau <martin.lau@kernel.org> | 2025-09-04 21:22:00 -0700 |
| commit | 2dfd8b8de66d9b0ef16d089e4d4525acf2a59cb2 (patch) | |
| tree | 754bdd0072da3c133995a6bfab64eb0d60232f89 /include/linux | |
| parent | 02614eee26fbdfd73b944769001cefeff6ed008c (diff) | |
| parent | 54728bd535fb3899ad51489dc1e05eb5bb53cb95 (diff) | |
Merge branch 'bpf-next/skb-meta-dynptr' into 'bpf-next/net'
Merge skb-meta-dynptr branch into net branch after fixing a compiler
warning. No conflict.
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/filter.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/filter.h b/include/linux/filter.h index 9ed21b65e2e9..af6d9354662c 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -1822,7 +1822,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 */ |