Skip to contentSkip to conversation

netlink: specs: ethtool: fix random typos

PATCH Applied Jakub Kicinski 3 participants 4 messages Jun 5, 2023 – Jun 7, 2023

Subsystems (4)
lore
Share & tools
lore

Jakub Kicinski

author maintainer
#0 lore raw

PATCH 1/1 netlink: specs: ethtool: fix random typos

Working on the code gen for C reveals typos in the ethtool spec as the compiler tries to find the names in the existing uAPI header. Fix the mistakes.

Fixes a353318ebf24 ("tools: ynl: populate most of the ethtool spec")

---
CC: [email protected]

---
 Documentation/netlink/specs/ethtool.yaml | 32 ++++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)
Documentation/netlink/specs/ethtool.yaml +16 -16
index 3abc576ff797..4846345bade4 100644
@@ -223,7 +223,7 @@ doc: Partial family for Ethtool Netlink.
         name: tx-min-frag-size
         type: u32
       -
-        name: tx-min-frag-size
+        name: rx-min-frag-size
         type: u32
       -
         name: verify-enabled
@@ -294,7 +294,7 @@ doc: Partial family for Ethtool Netlink.
         name: master-slave-state
         type: u8
       -
-        name: master-slave-lanes
+        name: lanes
         type: u32
       -
         name: rate-matching
@@ -322,7 +322,7 @@ doc: Partial family for Ethtool Netlink.
         name: ext-substate
         type: u8
       -
-        name: down-cnt
+        name: ext-down-cnt
         type: u32
   -
     name: debug
@@ -577,7 +577,7 @@ doc: Partial family for Ethtool Netlink.
         name: phc-index
         type: u32
   -
-    name: cable-test-nft-nest-result
+    name: cable-test-ntf-nest-result
     attributes:
       -
         name: pair
@@ -586,7 +586,7 @@ doc: Partial family for Ethtool Netlink.
         name: code
         type: u8
   -
-    name: cable-test-nft-nest-fault-length
+    name: cable-test-ntf-nest-fault-length
     attributes:
       -
         name: pair
@@ -595,16 +595,16 @@ doc: Partial family for Ethtool Netlink.
         name: cm
         type: u32
   -
-    name: cable-test-nft-nest
+    name: cable-test-ntf-nest
     attributes:
       -
         name: result
         type: nest
-        nested-attributes: cable-test-nft-nest-result
+        nested-attributes: cable-test-ntf-nest-result
       -
         name: fault-length
         type: nest
-        nested-attributes: cable-test-nft-nest-fault-length
+        nested-attributes: cable-test-ntf-nest-fault-length
   -
     name: cable-test
     attributes:
@@ -618,7 +618,7 @@ doc: Partial family for Ethtool Netlink.
       -
         name: nest
         type: nest
-        nested-attributes: cable-test-nft-nest
+        nested-attributes: cable-test-ntf-nest
   -
     name: cable-test-tdr-cfg
     attributes:
@@ -776,7 +776,7 @@ doc: Partial family for Ethtool Netlink.
         name: hist-bkt-hi
         type: u32
       -
-        name: hist-bkt-val
+        name: hist-val
         type: u64
   -
     name: stats
@@ -965,7 +965,7 @@ doc: Partial family for Ethtool Netlink.
             - duplex
             - master-slave-cfg
             - master-slave-state
-            - master-slave-lanes
+            - lanes
             - rate-matching
       dump: *linkmodes-get-op
     -
@@ -999,7 +999,7 @@ doc: Partial family for Ethtool Netlink.
             - sqi-max
             - ext-state
             - ext-substate
-            - down-cnt
+            - ext-down-cnt
       dump: *linkstate-get-op
     -
       name: debug-get
@@ -1351,7 +1351,7 @@ doc: Partial family for Ethtool Netlink.
         reply:
           attributes:
             - header
-            - cable-test-nft-nest
+            - cable-test-ntf-nest
     -
       name: cable-test-tdr-act
       doc: Cable test TDR.
@@ -1539,7 +1539,7 @@ doc: Partial family for Ethtool Netlink.
             - hkey
       dump: *rss-get-op
     -
-      name: plca-get
+      name: plca-get-cfg
       doc: Get PLCA params.
 
       attribute-set: plca
@@ -1561,7 +1561,7 @@ doc: Partial family for Ethtool Netlink.
             - burst-tmr
       dump: *plca-get-op
     -
-      name: plca-set
+      name: plca-set-cfg
       doc: Set PLCA params.
 
       attribute-set: plca
@@ -1585,7 +1585,7 @@ doc: Partial family for Ethtool Netlink.
     -
       name: plca-ntf
       doc: Notification for change in PLCA params.
-      notify: plca-get
+      notify: plca-get-cfg
     -
       name: mm-get
       doc: Get MAC Merge configuration and state
Signature · 1 line
2.40.1
Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Jakub Kicinski

Working on the code gen for C reveals typos in the ethtool spec as the compiler tries to find the names in the existing uAPI header. Fix the mistakes.

Fixes a353318ebf24 ("tools: ynl: populate most of the ethtool spec")

Ooopsie, thanks!

Quoted 41 lines

---
CC: [email protected]

---
 Documentation/netlink/specs/ethtool.yaml | 32 ++++++++++++------------
 1 file changed, 16 insertions(+), 16 deletions(-)
Documentation/netlink/specs/ethtool.yaml +3 -3
index 3abc576ff797..4846345bade4 100644
@@ -223,7 +223,7 @@ doc: Partial family for Ethtool Netlink.
         name: tx-min-frag-size
         type: u32
       -
-        name: tx-min-frag-size
+        name: rx-min-frag-size
         type: u32
       -
         name: verify-enabled
@@ -294,7 +294,7 @@ doc: Partial family for Ethtool Netlink.
         name: master-slave-state
         type: u8
       -
-        name: master-slave-lanes
+        name: lanes
         type: u32
       -
         name: rate-matching
@@ -322,7 +322,7 @@ doc: Partial family for Ethtool Netlink.
         name: ext-substate
         type: u8
       -
-        name: down-cnt
+        name: ext-down-cnt
         type: u32
   -
     name: debug
@@ -577,7 +577,7 @@ doc: Partial family for Ethtool Netlink.
         name: phc-index
         type: u32
   -

[..]

Quoted 35 lines
Documentation/netlink/specs/ethtool.yaml +5 -5
-    name: cable-test-nft-nest-result
+    name: cable-test-ntf-nest-result
     attributes:
       -
         name: pair
@@ -586,7 +586,7 @@ doc: Partial family for Ethtool Netlink.
         name: code
         type: u8
   -
-    name: cable-test-nft-nest-fault-length
+    name: cable-test-ntf-nest-fault-length
     attributes:
       -
         name: pair
@@ -595,16 +595,16 @@ doc: Partial family for Ethtool Netlink.
         name: cm
         type: u32
   -
-    name: cable-test-nft-nest
+    name: cable-test-ntf-nest
     attributes:
       -
         name: result
         type: nest
-        nested-attributes: cable-test-nft-nest-result
+        nested-attributes: cable-test-ntf-nest-result
       -
         name: fault-length
         type: nest
-        nested-attributes: cable-test-nft-nest-fault-length
+        nested-attributes: cable-test-ntf-nest-fault-length
   -
     name: cable-test
     attributes:

Documentation/netlink/specs/ethtool.yaml doc: Partial family for Ethtool Netlink. · line 621

Quoted 5 lines
Documentation/netlink/specs/ethtool.yaml +1 -1
@@ -618,7 +618,7 @@ doc: Partial family for Ethtool Netlink.
       -
         name: nest
         type: nest
-        nested-attributes: cable-test-nft-nest
+        nested-attributes: cable-test-ntf-nest

So much NFTs! Long live NFTs :-D

author maintainer
#2 lore raw
Quoted 4 lines · On Mon, 5 Jun 2023 16:37:26 -0700 Stanislav Fomichev wrote:

Documentation/netlink/specs/ethtool.yaml doc: Partial family for Ethtool Netlink. · line 621

Quoted 2 lines
Documentation/netlink/specs/ethtool.yaml +1 -1
-        nested-attributes: cable-test-nft-nest
+        nested-attributes: cable-test-ntf-nest  

So much NFTs! Long live NFTs :-D

Maybe if I named the patch "remove NFT references" we'd have made the news. Missed opportunity :D

#3 lore raw
In reply to Jakub Kicinski
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:

Quoted 8 lines · On Mon, 5 Jun 2023 16:32:57 -0700 you wrote:

Working on the code gen for C reveals typos in the ethtool spec as the compiler tries to find the names in the existing uAPI header. Fix the mistakes.

Fixes a353318ebf24 ("tools: ynl: populate most of the ethtool spec")

[...]

Here is the summary with links:
- [net] netlink: specs: ethtool: fix random typos

    https://git.kernel.org/netdev/net/c/f6ca5baf2a86

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html