github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Merge branch 'netlink-specs-conntrack-minor-spec-fixes'

Browse Source 
Jakub Kicinski says:

====================
netlink: specs: conntrack: minor spec fixes

Clashiko raised a bunch of pre-existing issues on a recent series
from Ilya. Let's fix those and whatever else pops out in AI review
and looks relatively legitimate.
====================

Link: https://patch.msgid.link/20260910003852.2184031-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski 2026-09-11 16:42:51 -07:00
commit cde77d69ea
1 changed files with 36 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Documentation/netlink/specs/conntrack.yaml
View File

@ -72,14 +72,14 @@ definitions:
type: enum
entries:
- none
- cloned
- closed
- cookie-wait
- cookie-echoed
- established
- shutdown-sent
- shutdown-received
- shutdown-recd
- shutdown-ack-sent
- shutdown-heartbeat-sent
- heartbeat-sent
-
name: nf-ct-status
type: flags
@ -116,9 +116,11 @@ attribute-sets:
-
name: packets-old
type: u32
doc: obsolete
-
name: bytes-old
type: u32
doc: obsolete
-
name: pad
type: pad
@ -292,6 +294,12 @@ attribute-sets:
name: help-name
type: string
doc: helper name
-
name: help-info
type: binary
doc: >-
Private data of a user space helper, only present for helpers
registered via nfnetlink_cthelper with a non-zero data length.
-
name: nat-proto-attrs
attributes:
@ -314,16 +322,16 @@ attribute-sets:
name: nat-v4-maxip
type: u32
byte-order: big-endian
-
name: nat-proto
type: nest
nested-attributes: nat-proto-attrs
-
name: nat-v6-minip
type: binary
-
name: nat-v6-maxip
type: binary
-
name: nat-proto
type: nest
nested-attributes: nat-proto-attrs
-
name: seqadj-attrs
attributes:
@ -345,6 +353,20 @@ attribute-sets:
-
name: secctx-name
type: string
-
name: timestamp-attrs
attributes:
-
name: start
type: u64
byte-order: big-endian
-
name: stop
type: u64
byte-order: big-endian
-
name: pad
type: pad
-
name: synproxy-attrs
attributes:
@ -445,7 +467,7 @@ attribute-sets:
nested-attributes: seqadj-attrs
-
name: secmark
type: binary
type: u32
doc: obsolete
-
name: zone
@ -458,8 +480,8 @@ attribute-sets:
nested-attributes: secctx-attrs
-
name: timestamp
type: u64
byte-order: big-endian
type: nest
nested-attributes: timestamp-attrs
-
name: mark-mask
type: u32
@ -510,7 +532,7 @@ attribute-sets:
name: invalid
type: u32
byte-order: big-endian
doc: obsolete
doc: packets which could not be tracked
-
name: ignore
type: u32
@ -582,20 +604,18 @@ operations:
- status
- protoinfo
- help
- nat-src
- nat-dst
- timeout
- mark
- counters-orig
- counters-reply
- use
- id
- nat-dst
- tuple-master
- seq-adj-orig
- seq-adj-reply
- zone
- secctx
- timestamp
- labels
- synproxy
dump:
@ -618,20 +638,18 @@ operations:
- status
- protoinfo
- help
- nat-src
- nat-dst
- timeout
- mark
- counters-orig
- counters-reply
- use
- id
- nat-dst
- tuple-master
- seq-adj-orig
- seq-adj-reply
- zone
- secctx
- timestamp
- labels
- synproxy
-
@ -645,8 +663,8 @@ operations:
reply:
value: 0x104
attributes:
- searched
- found
- invalid
- insert
- insert-failed
- drop