raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-09 19:39:56 +00:00
Code Issues Projects Releases Wiki Activity

tools: ynl: fully inherit attrs in subsets

Browse Source 
To avoid having to repeat the entire definition of an attribute
(including the value) use the Attr object from the original set.
In fact this is already the documented expectation.

Fixes: be5bea1cc0 ("net: add basic C code generators for Netlink")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Jakub Kicinski
2023-03-01 10:36:40 -08:00
committed by David S. Miller
parent ad93bab6b8
commit 7cf93538e0
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Documentation/userspace-api/netlink/specs.rst
View File

@@ -199,7 +199,8 @@ The ``value`` property can be skipped, in which case the attribute ID
will be the value of the previous attribute plus one (recursively) will be the value of the previous attribute plus one (recursively)
and ``0`` for the first attribute in the attribute set. and ``0`` for the first attribute in the attribute set.
Note that the ``value`` of an attribute is defined only in its main set. Note that the ``value`` of an attribute is defined only in its main set
(not in subsets).
enum enum
~~~~ ~~~~

23
tools/net/ynl/lib/nlspec.py
View File

@@ -95,15 +95,22 @@ class SpecAttrSet(SpecElement):
self.attrs = collections.OrderedDict() self.attrs = collections.OrderedDict()
self.attrs_by_val = collections.OrderedDict() self.attrs_by_val = collections.OrderedDict()
val = 0 if self.subset_of is None:
for elem in self.yaml['attributes']: val = 0
if 'value' in elem: for elem in self.yaml['attributes']:
val = elem['value'] if 'value' in elem:
val = elem['value']
attr = self.new_attr(elem, val) attr = self.new_attr(elem, val)
self.attrs[attr.name] = attr self.attrs[attr.name] = attr
self.attrs_by_val[attr.value] = attr self.attrs_by_val[attr.value] = attr
val += 1 val += 1
else:
real_set = family.attr_sets[self.subset_of]
for elem in self.yaml['attributes']:
attr = real_set[elem['name']]
self.attrs[attr.name] = attr
self.attrs_by_val[attr.value] = attr
def new_attr(self, elem, value): def new_attr(self, elem, value):
return SpecAttr(self.family, self, elem, value) return SpecAttr(self.family, self, elem, value)