mirror of
https://github.com/torvalds/linux.git
synced 2026-06-05 13:06:59 +02:00
Merge branch 'netlink-specs-rt-link-decode-ip6gre'
Jakub Kicinski says:
====================
netlink: specs: rt-link: decode ip6gre
Adding GRE tunnels to the .config for driver tests caused
some unhappiness in YNL, as it can't decode all the link
attrs on the system. Add ip6gre support to fix the tests.
This is similar to commit 6ffdbb93a5 ("netlink: specs:
rt_link: decode ip6tnl, vti and vti6 link attrs").
====================
Link: https://patch.msgid.link/20250603135357.502626-1-kuba@kernel.org
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
This commit is contained in:
commit
8e59d9e24d
|
|
@ -1685,15 +1685,19 @@ attribute-sets:
|
|||
-
|
||||
name: iflags
|
||||
type: u16
|
||||
byte-order: big-endian
|
||||
-
|
||||
name: oflags
|
||||
type: u16
|
||||
byte-order: big-endian
|
||||
-
|
||||
name: ikey
|
||||
type: u32
|
||||
byte-order: big-endian
|
||||
-
|
||||
name: okey
|
||||
type: u32
|
||||
byte-order: big-endian
|
||||
-
|
||||
name: local
|
||||
type: binary
|
||||
|
|
@ -1713,10 +1717,11 @@ attribute-sets:
|
|||
type: u8
|
||||
-
|
||||
name: encap-limit
|
||||
type: u32
|
||||
type: u8
|
||||
-
|
||||
name: flowinfo
|
||||
type: u32
|
||||
byte-order: big-endian
|
||||
-
|
||||
name: flags
|
||||
type: u32
|
||||
|
|
@ -1729,9 +1734,11 @@ attribute-sets:
|
|||
-
|
||||
name: encap-sport
|
||||
type: u16
|
||||
byte-order: big-endian
|
||||
-
|
||||
name: encap-dport
|
||||
type: u16
|
||||
byte-order: big-endian
|
||||
-
|
||||
name: collect-metadata
|
||||
type: flag
|
||||
|
|
@ -1753,6 +1760,54 @@ attribute-sets:
|
|||
-
|
||||
name: erspan-hwid
|
||||
type: u16
|
||||
-
|
||||
name: linkinfo-gre6-attrs
|
||||
subset-of: linkinfo-gre-attrs
|
||||
attributes:
|
||||
-
|
||||
name: link
|
||||
-
|
||||
name: iflags
|
||||
-
|
||||
name: oflags
|
||||
-
|
||||
name: ikey
|
||||
-
|
||||
name: okey
|
||||
-
|
||||
name: local
|
||||
display-hint: ipv6
|
||||
-
|
||||
name: remote
|
||||
display-hint: ipv6
|
||||
-
|
||||
name: ttl
|
||||
-
|
||||
name: encap-limit
|
||||
-
|
||||
name: flowinfo
|
||||
-
|
||||
name: flags
|
||||
-
|
||||
name: encap-type
|
||||
-
|
||||
name: encap-flags
|
||||
-
|
||||
name: encap-sport
|
||||
-
|
||||
name: encap-dport
|
||||
-
|
||||
name: collect-metadata
|
||||
-
|
||||
name: fwmark
|
||||
-
|
||||
name: erspan-index
|
||||
-
|
||||
name: erspan-ver
|
||||
-
|
||||
name: erspan-dir
|
||||
-
|
||||
name: erspan-hwid
|
||||
-
|
||||
name: linkinfo-vti-attrs
|
||||
name-prefix: ifla-vti-
|
||||
|
|
@ -1764,9 +1819,11 @@ attribute-sets:
|
|||
-
|
||||
name: ikey
|
||||
type: u32
|
||||
byte-order: big-endian
|
||||
-
|
||||
name: okey
|
||||
type: u32
|
||||
byte-order: big-endian
|
||||
-
|
||||
name: local
|
||||
type: binary
|
||||
|
|
@ -1816,6 +1873,7 @@ attribute-sets:
|
|||
-
|
||||
name: port
|
||||
type: u16
|
||||
byte-order: big-endian
|
||||
-
|
||||
name: collect-metadata
|
||||
type: flag
|
||||
|
|
@ -1835,6 +1893,7 @@ attribute-sets:
|
|||
-
|
||||
name: label
|
||||
type: u32
|
||||
byte-order: big-endian
|
||||
-
|
||||
name: ttl-inherit
|
||||
type: u8
|
||||
|
|
@ -1875,9 +1934,11 @@ attribute-sets:
|
|||
-
|
||||
name: flowinfo
|
||||
type: u32
|
||||
byte-order: big-endian
|
||||
-
|
||||
name: flags
|
||||
type: u16
|
||||
byte-order: big-endian
|
||||
-
|
||||
name: proto
|
||||
type: u8
|
||||
|
|
@ -1907,9 +1968,11 @@ attribute-sets:
|
|||
-
|
||||
name: encap-sport
|
||||
type: u16
|
||||
byte-order: big-endian
|
||||
-
|
||||
name: encap-dport
|
||||
type: u16
|
||||
byte-order: big-endian
|
||||
-
|
||||
name: collect-metadata
|
||||
type: flag
|
||||
|
|
@ -2224,6 +2287,9 @@ sub-messages:
|
|||
-
|
||||
value: gretap
|
||||
attribute-set: linkinfo-gre-attrs
|
||||
-
|
||||
value: ip6gre
|
||||
attribute-set: linkinfo-gre6-attrs
|
||||
-
|
||||
value: geneve
|
||||
attribute-set: linkinfo-geneve-attrs
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user