diff options
| author | Martin KaFai Lau <martin.lau@kernel.org> | 2025-09-05 07:10:13 +0300 |
|---|---|---|
| committer | Martin KaFai Lau <martin.lau@kernel.org> | 2025-09-05 07:23:47 +0300 |
| commit | 9621eb635ba96514edd0fbfaeeec1fffea294abb (patch) | |
| tree | d5a17693568be294e66f045a128c431317fe83a2 /include | |
| parent | b338cf849ec82a3063119c9902c5ae21bc9dccb1 (diff) | |
| parent | 54728bd535fb3899ad51489dc1e05eb5bb53cb95 (diff) | |
| download | linux-9621eb635ba96514edd0fbfaeeec1fffea294abb.tar.xz | |
Merge branch 'bpf-next/skb-meta-dynptr' into 'bpf-next/master'
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>
Diffstat (limited to 'include')
| -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 9092d8ea95c8..4241a885975f 100644 --- a/include/linux/filter.h +++ b/include/linux/filter.h @@ -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 */ |