diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2024-04-04 10:33:56 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2024-04-04 10:33:57 -0700 |
| commit | 1148c4098e918b4ffb3cc222b897c465328d2391 (patch) | |
| tree | 43f3755fc3ffc3fcc8a297641678f8c6d7f7aad2 | |
| parent | Merge branch 'bnxt_en-update-for-net-next' (diff) | |
| parent | tools: ynl: copy netlink error to NlError (diff) | |
| download | wireguard-linux-1148c4098e918b4ffb3cc222b897c465328d2391.tar.xz wireguard-linux-1148c4098e918b4ffb3cc222b897c465328d2391.zip | |
Merge branch 'selftests-net-groundwork-for-ynl-based-tests'
Jakub Kicinski says:
====================
selftests: net: groundwork for YNL-based tests (YNL prep)
v1: https://lore.kernel.org/all/20240402010520.1209517-1-kuba@kernel.org/
====================
Merge the non-controversial YNL adjustment and spec additions.
Link: https://lore.kernel.org/r/20240403023426.1762996-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | Documentation/netlink/specs/ethtool.yaml | 6 | ||||
| -rw-r--r-- | tools/net/ynl/lib/ynl.py | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/netlink/specs/ethtool.yaml b/Documentation/netlink/specs/ethtool.yaml index 197208f419dc..d0e4a47e0f21 100644 --- a/Documentation/netlink/specs/ethtool.yaml +++ b/Documentation/netlink/specs/ethtool.yaml @@ -16,6 +16,11 @@ definitions: name: stringset type: enum entries: [] + - + name: header-flags + enum-name: + type: flags + entries: [ compact-bitsets, omit-reply, stats ] attribute-sets: - @@ -30,6 +35,7 @@ attribute-sets: - name: flags type: u32 + enum: header-flags - name: bitset-bit diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py index 82d3c98067aa..b30210f537f7 100644 --- a/tools/net/ynl/lib/ynl.py +++ b/tools/net/ynl/lib/ynl.py @@ -100,9 +100,10 @@ class Netlink: class NlError(Exception): def __init__(self, nl_msg): self.nl_msg = nl_msg + self.error = -nl_msg.error def __str__(self): - return f"Netlink error: {os.strerror(-self.nl_msg.error)}\n{self.nl_msg}" + return f"Netlink error: {os.strerror(self.error)}\n{self.nl_msg}" class ConfigError(Exception): |