diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2025-05-08 18:56:12 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2025-05-08 18:59:02 +0300 |
| commit | 6b02fd7799fc8e1160c5783459d065ceeb4b7365 (patch) | |
| tree | 5a4190dbd2cc0bf6150c2da94824e2e04047a058 /include/uapi/linux | |
| parent | 46431fd5224f7f3bab2823992ae1cf6f2700f1ce (diff) | |
| parent | 2c89c1b655c0b06823f4ee8b055140d8628fc4da (diff) | |
| download | linux-6b02fd7799fc8e1160c5783459d065ceeb4b7365.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR (net-6.15-rc6).
No conflicts.
Adjacent changes:
net/core/dev.c:
08e9f2d584c4 ("net: Lock netdevices during dev_shutdown")
a82dc19db136 ("net: avoid potential race between netdev_get_by_index_lock() and netns switch")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'include/uapi/linux')
| -rw-r--r-- | include/uapi/linux/bpf.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 28705ae67784..fd404729b115 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -4968,6 +4968,9 @@ union bpf_attr { * the netns switch takes place from ingress to ingress without * going through the CPU's backlog queue. * + * *skb*\ **->mark** and *skb*\ **->tstamp** are not cleared during + * the netns switch. + * * The *flags* argument is reserved and must be 0. The helper is * currently only supported for tc BPF program types at the * ingress hook and for veth and netkit target device types. The |