Skip to content

Commit 8af7a91

Browse files
kuba-mooPaolo Abeni
authored andcommitted
netlink: specs: rt-link: decode ip6gre
Driver tests now require GRE tunnels, while we don't configure them with YNL, YNL will complain when it sees link types it doesn't recognize. Teach it decoding ip6gre tunnels. The attrs are largely the same as IPv4 GRE. Correct the type of encap-limit, but note that this attr is only used in ip6gre, so the mistake didn't matter until now. Fixes: 0d0f417 ("selftests: drv-net: add a simple TSO test") Signed-off-by: Jakub Kicinski <[email protected]> Reviewed-by: Donald Hunter <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
1 parent de92258 commit 8af7a91

File tree

1 file changed

+52
-1
lines changed

1 file changed

+52
-1
lines changed

Documentation/netlink/specs/rt-link.yaml

Lines changed: 52 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1717,7 +1717,7 @@ attribute-sets:
17171717
type: u8
17181718
-
17191719
name: encap-limit
1720-
type: u32
1720+
type: u8
17211721
-
17221722
name: flowinfo
17231723
type: u32
@@ -1760,6 +1760,54 @@ attribute-sets:
17601760
-
17611761
name: erspan-hwid
17621762
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
17631811
-
17641812
name: linkinfo-vti-attrs
17651813
name-prefix: ifla-vti-
@@ -2239,6 +2287,9 @@ sub-messages:
22392287
-
22402288
value: gretap
22412289
attribute-set: linkinfo-gre-attrs
2290+
-
2291+
value: ip6gre
2292+
attribute-set: linkinfo-gre6-attrs
22422293
-
22432294
value: geneve
22442295
attribute-set: linkinfo-geneve-attrs

0 commit comments

Comments
 (0)