Skip to content

Commit 8e59d9e

Browse files
author
Paolo Abeni
committed
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 6ffdbb9 ("netlink: specs: rt_link: decode ip6tnl, vti and vti6 link attrs"). ==================== Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
2 parents ec6a328 + 8af7a91 commit 8e59d9e

File tree

1 file changed

+67
-1
lines changed

1 file changed

+67
-1
lines changed

Documentation/netlink/specs/rt-link.yaml

Lines changed: 67 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1685,15 +1685,19 @@ attribute-sets:
16851685
-
16861686
name: iflags
16871687
type: u16
1688+
byte-order: big-endian
16881689
-
16891690
name: oflags
16901691
type: u16
1692+
byte-order: big-endian
16911693
-
16921694
name: ikey
16931695
type: u32
1696+
byte-order: big-endian
16941697
-
16951698
name: okey
16961699
type: u32
1700+
byte-order: big-endian
16971701
-
16981702
name: local
16991703
type: binary
@@ -1713,10 +1717,11 @@ attribute-sets:
17131717
type: u8
17141718
-
17151719
name: encap-limit
1716-
type: u32
1720+
type: u8
17171721
-
17181722
name: flowinfo
17191723
type: u32
1724+
byte-order: big-endian
17201725
-
17211726
name: flags
17221727
type: u32
@@ -1729,9 +1734,11 @@ attribute-sets:
17291734
-
17301735
name: encap-sport
17311736
type: u16
1737+
byte-order: big-endian
17321738
-
17331739
name: encap-dport
17341740
type: u16
1741+
byte-order: big-endian
17351742
-
17361743
name: collect-metadata
17371744
type: flag
@@ -1753,6 +1760,54 @@ attribute-sets:
17531760
-
17541761
name: erspan-hwid
17551762
type: u16
1763+
-
1764+
name: linkinfo-gre6-attrs
1765+
subset-of: linkinfo-gre-attrs
1766+
attributes:
1767+
-
1768+
name: link
1769+
-
1770+
name: iflags
1771+
-
1772+
name: oflags
1773+
-
1774+
name: ikey
1775+
-
1776+
name: okey
1777+
-
1778+
name: local
1779+
display-hint: ipv6
1780+
-
1781+
name: remote
1782+
display-hint: ipv6
1783+
-
1784+
name: ttl
1785+
-
1786+
name: encap-limit
1787+
-
1788+
name: flowinfo
1789+
-
1790+
name: flags
1791+
-
1792+
name: encap-type
1793+
-
1794+
name: encap-flags
1795+
-
1796+
name: encap-sport
1797+
-
1798+
name: encap-dport
1799+
-
1800+
name: collect-metadata
1801+
-
1802+
name: fwmark
1803+
-
1804+
name: erspan-index
1805+
-
1806+
name: erspan-ver
1807+
-
1808+
name: erspan-dir
1809+
-
1810+
name: erspan-hwid
17561811
-
17571812
name: linkinfo-vti-attrs
17581813
name-prefix: ifla-vti-
@@ -1764,9 +1819,11 @@ attribute-sets:
17641819
-
17651820
name: ikey
17661821
type: u32
1822+
byte-order: big-endian
17671823
-
17681824
name: okey
17691825
type: u32
1826+
byte-order: big-endian
17701827
-
17711828
name: local
17721829
type: binary
@@ -1816,6 +1873,7 @@ attribute-sets:
18161873
-
18171874
name: port
18181875
type: u16
1876+
byte-order: big-endian
18191877
-
18201878
name: collect-metadata
18211879
type: flag
@@ -1835,6 +1893,7 @@ attribute-sets:
18351893
-
18361894
name: label
18371895
type: u32
1896+
byte-order: big-endian
18381897
-
18391898
name: ttl-inherit
18401899
type: u8
@@ -1875,9 +1934,11 @@ attribute-sets:
18751934
-
18761935
name: flowinfo
18771936
type: u32
1937+
byte-order: big-endian
18781938
-
18791939
name: flags
18801940
type: u16
1941+
byte-order: big-endian
18811942
-
18821943
name: proto
18831944
type: u8
@@ -1907,9 +1968,11 @@ attribute-sets:
19071968
-
19081969
name: encap-sport
19091970
type: u16
1971+
byte-order: big-endian
19101972
-
19111973
name: encap-dport
19121974
type: u16
1975+
byte-order: big-endian
19131976
-
19141977
name: collect-metadata
19151978
type: flag
@@ -2224,6 +2287,9 @@ sub-messages:
22242287
-
22252288
value: gretap
22262289
attribute-set: linkinfo-gre-attrs
2290+
-
2291+
value: ip6gre
2292+
attribute-set: linkinfo-gre6-attrs
22272293
-
22282294
value: geneve
22292295
attribute-set: linkinfo-geneve-attrs

0 commit comments

Comments
 (0)