Commit 886365cf authored by Donald Hunter's avatar Donald Hunter Committed by Jakub Kicinski

tools/net/ynl: Rename _fixed_header_size() to _struct_size()

Refactor the _fixed_header_size() method to be _struct_size() so that
naming is consistent with _encode_struct() and _decode_struct().
Signed-off-by: default avatarDonald Hunter <donald.hunter@gmail.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Link: https://lore.kernel.org/r/20240129223458.52046-9-donald.hunter@gmail.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e45fee0f
...@@ -353,7 +353,7 @@ class NetlinkProtocol: ...@@ -353,7 +353,7 @@ class NetlinkProtocol:
fixed_header_size = 0 fixed_header_size = 0
if ynl: if ynl:
op = ynl.rsp_by_value[msg.cmd()] op = ynl.rsp_by_value[msg.cmd()]
fixed_header_size = ynl._fixed_header_size(op.fixed_header) fixed_header_size = ynl._struct_size(op.fixed_header)
msg.raw_attrs = NlAttrs(msg.raw, fixed_header_size) msg.raw_attrs = NlAttrs(msg.raw, fixed_header_size)
return msg return msg
...@@ -585,7 +585,7 @@ class YnlFamily(SpecFamily): ...@@ -585,7 +585,7 @@ class YnlFamily(SpecFamily):
offset = 0 offset = 0
if msg_format.fixed_header: if msg_format.fixed_header:
decoded.update(self._decode_struct(attr.raw, msg_format.fixed_header)); decoded.update(self._decode_struct(attr.raw, msg_format.fixed_header));
offset = self._fixed_header_size(msg_format.fixed_header) offset = self._struct_size(msg_format.fixed_header)
if msg_format.attr_set: if msg_format.attr_set:
if msg_format.attr_set in self.attr_sets: if msg_format.attr_set in self.attr_sets:
subdict = self._decode(NlAttrs(attr.raw, offset), msg_format.attr_set) subdict = self._decode(NlAttrs(attr.raw, offset), msg_format.attr_set)
...@@ -675,18 +675,18 @@ class YnlFamily(SpecFamily): ...@@ -675,18 +675,18 @@ class YnlFamily(SpecFamily):
return return
msg = self.nlproto.decode(self, NlMsg(request, 0, op.attr_set)) msg = self.nlproto.decode(self, NlMsg(request, 0, op.attr_set))
offset = 20 + self._fixed_header_size(op.fixed_header) offset = 20 + self._struct_size(op.fixed_header)
path = self._decode_extack_path(msg.raw_attrs, op.attr_set, offset, path = self._decode_extack_path(msg.raw_attrs, op.attr_set, offset,
extack['bad-attr-offs']) extack['bad-attr-offs'])
if path: if path:
del extack['bad-attr-offs'] del extack['bad-attr-offs']
extack['bad-attr'] = path extack['bad-attr'] = path
def _fixed_header_size(self, name): def _struct_size(self, name):
if name: if name:
fixed_header_members = self.consts[name].members members = self.consts[name].members
size = 0 size = 0
for m in fixed_header_members: for m in members:
if m.type in ['pad', 'binary']: if m.type in ['pad', 'binary']:
size += m.len size += m.len
else: else:
......
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