diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-06-30 18:37:44 +0300 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-06-30 18:37:44 +0300 |
| commit | 0a30901b0732a59e038088d3de3e5611db1870d3 (patch) | |
| tree | 1d194c6c9fa651e866cc8f6a508535eb482bb15c /tools/net/ynl | |
| parent | 814bc1de03ea4361101408e63a68e4b82aef22cb (diff) | |
| parent | 6995e2de6891c724bfeb2db33d7b87775f913ad1 (diff) | |
| download | linux-0a30901b0732a59e038088d3de3e5611db1870d3.tar.xz | |
Merge branch 'master' into mm-hotfixes-stable
Diffstat (limited to 'tools/net/ynl')
| -rw-r--r-- | tools/net/ynl/lib/ynl.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools/net/ynl/lib/ynl.py b/tools/net/ynl/lib/ynl.py index aa77bcae4807..3144f33196be 100644 --- a/tools/net/ynl/lib/ynl.py +++ b/tools/net/ynl/lib/ynl.py @@ -591,8 +591,9 @@ class YnlFamily(SpecFamily): print('Unexpected message: ' + repr(gm)) continue - rsp.append(self._decode(gm.raw_attrs, op.attr_set.name) - | gm.fixed_header_attrs) + rsp_msg = self._decode(gm.raw_attrs, op.attr_set.name) + rsp_msg.update(gm.fixed_header_attrs) + rsp.append(rsp_msg) if not rsp: return None |