Message ID | 20230526220653.65538-1-kuba@kernel.org (mailing list archive) |
---|---|
State | Accepted |
Commit | 0684f29a89e58944a9bfae3a8b5c1a217e44c960 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | [net] netlink: specs: correct types of legacy arrays | expand |
On Fri, May 26, 2023 at 3:07 PM Jakub Kicinski <kuba@kernel.org> wrote: > > ethtool has some attrs which dump multiple scalars into > an attribute. The spec currently expects one attr per entry. > > Fixes: a353318ebf24 ("tools: ynl: populate most of the ethtool spec") > Signed-off-by: Jakub Kicinski <kuba@kernel.org> Acked-by: Stanislav Fomichev <sdf@google.com> > --- > CC: sdf@google.com > --- > Documentation/netlink/specs/ethtool.yaml | 32 ++++++------------------ > 1 file changed, 8 insertions(+), 24 deletions(-) > > diff --git a/Documentation/netlink/specs/ethtool.yaml b/Documentation/netlink/specs/ethtool.yaml > index 129f413ea349..3abc576ff797 100644 > --- a/Documentation/netlink/specs/ethtool.yaml > +++ b/Documentation/netlink/specs/ethtool.yaml > @@ -60,22 +60,6 @@ doc: Partial family for Ethtool Netlink. > type: nest > nested-attributes: bitset-bits > > - - > - name: u64-array > - attributes: > - - > - name: u64 > - type: nest > - multi-attr: true > - nested-attributes: u64 > - - > - name: s32-array > - attributes: > - - > - name: s32 > - type: nest > - multi-attr: true > - nested-attributes: s32 > - > name: string > attributes: > @@ -705,16 +689,16 @@ doc: Partial family for Ethtool Netlink. > type: u8 > - > name: corrected > - type: nest > - nested-attributes: u64-array > + type: binary > + sub-type: u64 > - > name: uncorr > - type: nest > - nested-attributes: u64-array > + type: binary > + sub-type: u64 > - > name: corr-bits > - type: nest > - nested-attributes: u64-array > + type: binary > + sub-type: u64 > - > name: fec > attributes: > @@ -827,8 +811,8 @@ doc: Partial family for Ethtool Netlink. > type: u32 > - > name: index > - type: nest > - nested-attributes: s32-array > + type: binary > + sub-type: s32 > - > name: module > attributes: > -- > 2.40.1 >
Hello: This patch was applied to netdev/net.git (main) by Jakub Kicinski <kuba@kernel.org>: On Fri, 26 May 2023 15:06:53 -0700 you wrote: > ethtool has some attrs which dump multiple scalars into > an attribute. The spec currently expects one attr per entry. > > Fixes: a353318ebf24 ("tools: ynl: populate most of the ethtool spec") > Signed-off-by: Jakub Kicinski <kuba@kernel.org> > --- > CC: sdf@google.com > > [...] Here is the summary with links: - [net] netlink: specs: correct types of legacy arrays https://git.kernel.org/netdev/net/c/0684f29a89e5 You are awesome, thank you!
diff --git a/Documentation/netlink/specs/ethtool.yaml b/Documentation/netlink/specs/ethtool.yaml index 129f413ea349..3abc576ff797 100644 --- a/Documentation/netlink/specs/ethtool.yaml +++ b/Documentation/netlink/specs/ethtool.yaml @@ -60,22 +60,6 @@ doc: Partial family for Ethtool Netlink. type: nest nested-attributes: bitset-bits - - - name: u64-array - attributes: - - - name: u64 - type: nest - multi-attr: true - nested-attributes: u64 - - - name: s32-array - attributes: - - - name: s32 - type: nest - multi-attr: true - nested-attributes: s32 - name: string attributes: @@ -705,16 +689,16 @@ doc: Partial family for Ethtool Netlink. type: u8 - name: corrected - type: nest - nested-attributes: u64-array + type: binary + sub-type: u64 - name: uncorr - type: nest - nested-attributes: u64-array + type: binary + sub-type: u64 - name: corr-bits - type: nest - nested-attributes: u64-array + type: binary + sub-type: u64 - name: fec attributes: @@ -827,8 +811,8 @@ doc: Partial family for Ethtool Netlink. type: u32 - name: index - type: nest - nested-attributes: s32-array + type: binary + sub-type: s32 - name: module attributes:
ethtool has some attrs which dump multiple scalars into an attribute. The spec currently expects one attr per entry. Fixes: a353318ebf24 ("tools: ynl: populate most of the ethtool spec") Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- CC: sdf@google.com --- Documentation/netlink/specs/ethtool.yaml | 32 ++++++------------------ 1 file changed, 8 insertions(+), 24 deletions(-)