Commit 37c85222 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by David S. Miller

netlink: specs: ethtool: untangle UDP tunnels and cable test a bit

UDP tunnel and cable test messages have a lot of nests,
which do not match the names of the enum entries in C uAPI.
Some of the structure / nesting also looks wrong.

Untangle this a little bit based on the names, comments and
educated guesses, I haven't actually tested the results.
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 180ad455
...@@ -582,7 +582,7 @@ attribute-sets: ...@@ -582,7 +582,7 @@ attribute-sets:
name: phc-index name: phc-index
type: u32 type: u32
- -
name: cable-test-ntf-nest-result name: cable-result
attributes: attributes:
- -
name: pair name: pair
...@@ -591,7 +591,7 @@ attribute-sets: ...@@ -591,7 +591,7 @@ attribute-sets:
name: code name: code
type: u8 type: u8
- -
name: cable-test-ntf-nest-fault-length name: cable-fault-length
attributes: attributes:
- -
name: pair name: pair
...@@ -600,18 +600,25 @@ attribute-sets: ...@@ -600,18 +600,25 @@ attribute-sets:
name: cm name: cm
type: u32 type: u32
- -
name: cable-test-ntf-nest name: cable-nest
attributes: attributes:
- -
name: result name: result
type: nest type: nest
nested-attributes: cable-test-ntf-nest-result nested-attributes: cable-result
- -
name: fault-length name: fault-length
type: nest type: nest
nested-attributes: cable-test-ntf-nest-fault-length nested-attributes: cable-fault-length
- -
name: cable-test name: cable-test
attributes:
-
name: header
type: nest
nested-attributes: header
-
name: cable-test-ntf
attributes: attributes:
- -
name: header name: header
...@@ -623,7 +630,7 @@ attribute-sets: ...@@ -623,7 +630,7 @@ attribute-sets:
- -
name: nest name: nest
type: nest type: nest
nested-attributes: cable-test-ntf-nest nested-attributes: cable-nest
- -
name: cable-test-tdr-cfg name: cable-test-tdr-cfg
attributes: attributes:
...@@ -637,8 +644,22 @@ attribute-sets: ...@@ -637,8 +644,22 @@ attribute-sets:
name: step name: step
type: u32 type: u32
- -
name: pari name: pair
type: u8
-
name: cable-test-tdr-ntf
attributes:
-
name: header
type: nest
nested-attributes: header
-
name: status
type: u8 type: u8
-
name: nest
type: nest
nested-attributes: cable-nest
- -
name: cable-test-tdr name: cable-test-tdr
attributes: attributes:
...@@ -651,7 +672,7 @@ attribute-sets: ...@@ -651,7 +672,7 @@ attribute-sets:
type: nest type: nest
nested-attributes: cable-test-tdr-cfg nested-attributes: cable-test-tdr-cfg
- -
name: tunnel-info-udp-entry name: tunnel-udp-entry
attributes: attributes:
- -
name: port name: port
...@@ -662,7 +683,7 @@ attribute-sets: ...@@ -662,7 +683,7 @@ attribute-sets:
type: u32 type: u32
enum: udp-tunnel-type enum: udp-tunnel-type
- -
name: tunnel-info-udp-table name: tunnel-udp-table
attributes: attributes:
- -
name: size name: size
...@@ -672,9 +693,17 @@ attribute-sets: ...@@ -672,9 +693,17 @@ attribute-sets:
type: nest type: nest
nested-attributes: bitset nested-attributes: bitset
- -
name: udp-ports name: entry
type: nest type: nest
nested-attributes: tunnel-info-udp-entry multi-attr: true
nested-attributes: tunnel-udp-entry
-
name: tunnel-udp
attributes:
-
name: table
type: nest
nested-attributes: tunnel-udp-table
- -
name: tunnel-info name: tunnel-info
attributes: attributes:
...@@ -685,7 +714,7 @@ attribute-sets: ...@@ -685,7 +714,7 @@ attribute-sets:
- -
name: udp-ports name: udp-ports
type: nest type: nest
nested-attributes: tunnel-info-udp-table nested-attributes: tunnel-udp
- -
name: fec-stat name: fec-stat
attributes: attributes:
...@@ -1357,10 +1386,16 @@ operations: ...@@ -1357,10 +1386,16 @@ operations:
request: request:
attributes: attributes:
- header - header
reply: -
name: cable-test-ntf
doc: Cable test notification.
attribute-set: cable-test-ntf
event:
attributes: attributes:
- header - header
- cable-test-ntf-nest - status
- -
name: cable-test-tdr-act name: cable-test-tdr-act
doc: Cable test TDR. doc: Cable test TDR.
...@@ -1371,10 +1406,17 @@ operations: ...@@ -1371,10 +1406,17 @@ operations:
request: request:
attributes: attributes:
- header - header
reply: -
name: cable-test-tdr-ntf
doc: Cable test TDR notification.
attribute-set: cable-test-tdr-ntf
event:
attributes: attributes:
- header - header
- cable-test-tdr-cfg - status
- nest
- -
name: tunnel-info-get name: tunnel-info-get
doc: Get tsinfo params. doc: Get tsinfo params.
......
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