Skip to content

Commit 9e6dd4c

Browse files
committed
netlink: specs: mptcp: replace underscores with dashes in names
We're trying to add a strict regexp for the name format in the spec. Underscores will not be allowed, dashes should be used instead. This makes no difference to C (codegen, if used, replaces special chars in names) but it gives more uniform naming in Python. Fixes: bc8aeb2 ("Documentation: netlink: add a YAML spec for mptcp") Reviewed-by: Davide Caratti <[email protected]> Reviewed-by: Donald Hunter <[email protected]> Reviewed-by: Matthieu Baerts (NGI0) <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent e40d3d0 commit 9e6dd4c

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

Documentation/netlink/specs/mptcp_pm.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,21 @@ definitions:
5757
doc: >-
5858
A new subflow has been established. 'error' should not be set.
5959
Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
60-
daddr6, sport, dport, backup, if_idx [, error].
60+
daddr6, sport, dport, backup, if-idx [, error].
6161
-
6262
name: sub-closed
6363
doc: >-
6464
A subflow has been closed. An error (copy of sk_err) could be set if an
6565
error has been detected for this subflow.
6666
Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
67-
daddr6, sport, dport, backup, if_idx [, error].
67+
daddr6, sport, dport, backup, if-idx [, error].
6868
-
6969
name: sub-priority
7070
value: 13
7171
doc: >-
7272
The priority of a subflow has changed. 'error' should not be set.
7373
Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
74-
daddr6, sport, dport, backup, if_idx [, error].
74+
daddr6, sport, dport, backup, if-idx [, error].
7575
-
7676
name: listener-created
7777
value: 15
@@ -255,7 +255,7 @@ attribute-sets:
255255
name: timeout
256256
type: u32
257257
-
258-
name: if_idx
258+
name: if-idx
259259
type: u32
260260
-
261261
name: reset-reason

include/uapi/linux/mptcp_pm.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@
2727
* token, rem_id.
2828
* @MPTCP_EVENT_SUB_ESTABLISHED: A new subflow has been established. 'error'
2929
* should not be set. Attributes: token, family, loc_id, rem_id, saddr4 |
30-
* saddr6, daddr4 | daddr6, sport, dport, backup, if_idx [, error].
30+
* saddr6, daddr4 | daddr6, sport, dport, backup, if-idx [, error].
3131
* @MPTCP_EVENT_SUB_CLOSED: A subflow has been closed. An error (copy of
3232
* sk_err) could be set if an error has been detected for this subflow.
3333
* Attributes: token, family, loc_id, rem_id, saddr4 | saddr6, daddr4 |
34-
* daddr6, sport, dport, backup, if_idx [, error].
34+
* daddr6, sport, dport, backup, if-idx [, error].
3535
* @MPTCP_EVENT_SUB_PRIORITY: The priority of a subflow has changed. 'error'
3636
* should not be set. Attributes: token, family, loc_id, rem_id, saddr4 |
37-
* saddr6, daddr4 | daddr6, sport, dport, backup, if_idx [, error].
37+
* saddr6, daddr4 | daddr6, sport, dport, backup, if-idx [, error].
3838
* @MPTCP_EVENT_LISTENER_CREATED: A new PM listener is created. Attributes:
3939
* family, sport, saddr4 | saddr6.
4040
* @MPTCP_EVENT_LISTENER_CLOSED: A PM listener is closed. Attributes: family,

0 commit comments

Comments
 (0)