Commit 7cf93538 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller

tools: ynl: fully inherit attrs in subsets

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: be5bea1c ("net: add basic C code generators for Netlink")
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ad93bab6
...@@ -199,7 +199,8 @@ The ``value`` property can be skipped, in which case the attribute ID ...@@ -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
~~~~ ~~~~
......
...@@ -95,15 +95,22 @@ class SpecAttrSet(SpecElement): ...@@ -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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment