diff options
| author | Mark Brown <broonie@kernel.org> | 2023-03-13 13:20:45 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2023-03-13 13:20:45 +0000 |
| commit | b9d0bb8f1c2e5dce9b8a54fb77d1af4aa64a4c01 (patch) | |
| tree | 1e8f106c57c2934eee422f8ee5e59e73015e2dc4 /tools/net/ynl/lib/ynl.py | |
| parent | 5bd73a162bc881dbb98ff9909dd865286852ee2b (diff) | |
| parent | eeac8ede17557680855031c6f305ece2378af326 (diff) | |
| download | linux-stable-b9d0bb8f1c2e5dce9b8a54fb77d1af4aa64a4c01.tar.gz linux-stable-b9d0bb8f1c2e5dce9b8a54fb77d1af4aa64a4c01.tar.bz2 linux-stable-b9d0bb8f1c2e5dce9b8a54fb77d1af4aa64a4c01.zip | |
Merge tag 'v6.3-rc2' into regulator-6.4 to fix clock related boot issues
Linux 6.3-rc2
Diffstat (limited to 'tools/net/ynl/lib/ynl.py')
| -rw-r--r-- | tools/net/ynl/lib/ynl.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py index 1c7411ee04dc..90764a83c646 100644 --- a/tools/net/ynl/lib/ynl.py +++ b/tools/net/ynl/lib/ynl.py @@ -1,4 +1,4 @@ -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause import functools import os @@ -303,11 +303,6 @@ class YnlFamily(SpecFamily): self.sock.setsockopt(Netlink.SOL_NETLINK, Netlink.NETLINK_CAP_ACK, 1) self.sock.setsockopt(Netlink.SOL_NETLINK, Netlink.NETLINK_EXT_ACK, 1) - self._types = dict() - - for elem in self.yaml.get('definitions', []): - self._types[elem['name']] = elem - self.async_msg_ids = set() self.async_msg_queue = [] @@ -353,13 +348,13 @@ class YnlFamily(SpecFamily): def _decode_enum(self, rsp, attr_spec): raw = rsp[attr_spec['name']] - enum = self._types[attr_spec['enum']] + enum = self.consts[attr_spec['enum']] i = attr_spec.get('value-start', 0) if 'enum-as-flags' in attr_spec and attr_spec['enum-as-flags']: value = set() while raw: if raw & 1: - value.add(enum['entries'][i]) + value.add(enum.entries_by_val[i].name) raw >>= 1 i += 1 else: |