diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2023-02-24 22:55:49 +0300 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2023-02-24 22:55:50 +0300 |
| commit | 766d1bdceb3290f83ecadd949cc0cd3ef08f8146 (patch) | |
| tree | d6ac33a0c6191f548cd5b577fb8b18fe4c021f76 | |
| parent | ac3ad19584b26fae9ac86e4faebe790becc74491 (diff) | |
| parent | d77e7eceeac9f3ab40b45649531993b456eeacd0 (diff) | |
| download | linux-766d1bdceb3290f83ecadd949cc0cd3ef08f8146.tar.xz | |
Merge branch 'tools-ynl-gen-fix-glitches-found-by-chuck'
Jakub Kicinski says:
====================
tools: ynl-gen: fix glitches found by Chuck
A handful of fixes Chuck run into while trying to define the family
for crypto handshakes.
====================
Link: https://lore.kernel.org/r/20230223183141.1422857-1-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | tools/net/ynl/lib/.gitignore | 1 | ||||
| -rw-r--r-- | tools/net/ynl/lib/nlspec.py | 4 | ||||
| -rwxr-xr-x | tools/net/ynl/ynl-gen-c.py | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/tools/net/ynl/lib/.gitignore b/tools/net/ynl/lib/.gitignore new file mode 100644 index 000000000000..c18dd8d83cee --- /dev/null +++ b/tools/net/ynl/lib/.gitignore @@ -0,0 +1 @@ +__pycache__/ diff --git a/tools/net/ynl/lib/nlspec.py b/tools/net/ynl/lib/nlspec.py index e204679ad8b7..71da568e2c28 100644 --- a/tools/net/ynl/lib/nlspec.py +++ b/tools/net/ynl/lib/nlspec.py @@ -3,7 +3,6 @@ import collections import importlib import os -import traceback import yaml @@ -234,8 +233,7 @@ class SpecFamily(SpecElement): resolved.append(elem) if len(resolved) == 0: - traceback.print_exception(last_exception) - raise Exception("Could not resolve any spec element, infinite loop?") + raise last_exception def new_attr_set(self, elem): return SpecAttrSet(self, elem) diff --git a/tools/net/ynl/ynl-gen-c.py b/tools/net/ynl/ynl-gen-c.py index 3942f24b9163..274e9c566f61 100755 --- a/tools/net/ynl/ynl-gen-c.py +++ b/tools/net/ynl/ynl-gen-c.py @@ -546,7 +546,7 @@ class Struct: max_val = 0 self.attr_max_val = None for name, attr in self.attr_list: - if attr.value > max_val: + if attr.value >= max_val: max_val = attr.value self.attr_max_val = attr self.attrs[name] = attr |