summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2026-08-28 15:34:54 -0700
committerJakub Kicinski <kuba@kernel.org>2026-08-28 15:34:54 -0700
commitc185c78e2a0eed9bbc63537b99f65a8d5da8112d (patch)
tree40849a8788920d26970ea9d6ba8eaf3aaabf8963
parent7fcc2fe39fed1cb98a7374a113ff3800e8f9af80 (diff)
parent8b348496cbec0d5ca24a99f668096e2e16e8fbeb (diff)
downloadlinux-c185c78e2a0eed9bbc63537b99f65a8d5da8112d.tar.gz
linux-c185c78e2a0eed9bbc63537b99f65a8d5da8112d.zip
Merge branch 'netlink-specs-fixes-for-conntrack-dump-filtering'
Ilya Maximets says: ==================== netlink: specs: fixes for conntrack dump filtering ==================== Link: https://patch.msgid.link/20260826220444.4054714-1-i.maximets@ovn.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
-rw-r--r--Documentation/netlink/specs/conntrack.yaml21
1 files changed, 18 insertions, 3 deletions
diff --git a/Documentation/netlink/specs/conntrack.yaml b/Documentation/netlink/specs/conntrack.yaml
index db7cddcda50a..b1eb102ab843 100644
--- a/Documentation/netlink/specs/conntrack.yaml
+++ b/Documentation/netlink/specs/conntrack.yaml
@@ -361,6 +361,17 @@ attribute-sets:
type: u32
byte-order: big-endian
-
+ name: filter-attrs
+ attributes:
+ -
+ name: orig-flags
+ type: u32
+ doc: bitmask of tuple fields to filter on, original direction
+ -
+ name: reply-flags
+ type: u32
+ doc: bitmask of tuple fields to filter on, reply direction
+ -
name: conntrack-attrs
attributes:
-
@@ -466,7 +477,7 @@ attribute-sets:
-
name: filter
type: nest
- nested-attributes: tuple-attrs
+ nested-attributes: filter-attrs
-
name: status-mask
type: u32
@@ -591,10 +602,14 @@ operations:
request:
value: 0x101
attributes:
- - mark
- - filter
+ - tuple-orig
+ - tuple-reply
- status
+ - mark
- zone
+ - mark-mask
+ - filter
+ - status-mask
reply:
value: 0x100
attributes: