Skip to content

Commit f06f089

Browse files
committed
Merge branch 'netlink-specs-legacy'
Jakub Kicinski says: ==================== netlink: specs: prep legacy specs for C code gen Minor adjustments to some specs to make them ready for C code gen. v2: - fix MAINATINERS and subject of patch 3 ==================== Signed-off-by: David S. Miller <[email protected]>
2 parents 283f105 + b059aef commit f06f089

File tree

8 files changed

+9
-13
lines changed

8 files changed

+9
-13
lines changed

Documentation/netlink/specs/ovs_datapath.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ definitions:
2020
name: user-features
2121
type: flags
2222
name-prefix: ovs-dp-f-
23+
enum-name:
2324
entries:
2425
-
2526
name: unaligned
@@ -142,7 +143,6 @@ operations:
142143
do:
143144
request:
144145
attributes:
145-
- dp-ifindex
146146
- name
147147
- upcall-pid
148148
- user-features
@@ -154,7 +154,6 @@ operations:
154154
do:
155155
request:
156156
attributes:
157-
- dp-ifindex
158157
- name
159158

160159
mcast-groups:

Documentation/netlink/specs/ovs_flow.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,7 @@ definitions:
124124
-
125125
name: ovs-frag-type
126126
name-prefix: ovs-frag-type-
127+
enum-name: ovs-frag-type
127128
type: enum
128129
entries:
129130
-
@@ -269,6 +270,7 @@ definitions:
269270
-
270271
name: ovs-ufid-flags
271272
name-prefix: ovs-ufid-f-
273+
enum-name:
272274
type: flags
273275
entries:
274276
- omit-key
@@ -288,6 +290,7 @@ definitions:
288290
doc: Basis used for computing hash.
289291
-
290292
name: ovs-hash-alg
293+
enum-name: ovs-hash-alg
291294
type: enum
292295
doc: |
293296
Data path hash algorithm for computing Datapath hash. The algorithm type only specifies
@@ -339,6 +342,7 @@ definitions:
339342
MPLS tunnel attributes.
340343
-
341344
name: ct-state-flags
345+
enum-name:
342346
type: flags
343347
name-prefix: ovs-cs-f-
344348
entries:
@@ -947,13 +951,11 @@ operations:
947951
do: &flow-get-op
948952
request:
949953
attributes:
950-
- dp-ifindex
951954
- key
952955
- ufid
953956
- ufid-flags
954957
reply:
955958
attributes:
956-
- dp-ifindex
957959
- key
958960
- ufid
959961
- mask
@@ -968,7 +970,6 @@ operations:
968970
do:
969971
request:
970972
attributes:
971-
- dp-ifindex
972973
- key
973974
- ufid
974975
- mask

Documentation/netlink/specs/ovs_vport.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,6 @@ operations:
135135
- name
136136
- type
137137
- upcall-pid
138-
- dp-ifindex
139138
- ifindex
140139
- options
141140
-
@@ -146,7 +145,6 @@ operations:
146145
do:
147146
request:
148147
attributes:
149-
- dp-ifindex
150148
- port-no
151149
- type
152150
- name
@@ -158,11 +156,9 @@ operations:
158156
do: &vport-get-op
159157
request:
160158
attributes:
161-
- dp-ifindex
162159
- name
163160
reply: &dev-all
164161
attributes:
165-
- dp-ifindex
166162
- port-no
167163
- type
168164
- name

MAINTAINERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15099,7 +15099,7 @@ W: https://github.com/multipath-tcp/mptcp_net-next/wiki
1509915099
B: https://github.com/multipath-tcp/mptcp_net-next/issues
1510015100
T: git https://github.com/multipath-tcp/mptcp_net-next.git export-net
1510115101
T: git https://github.com/multipath-tcp/mptcp_net-next.git export
15102-
F: Documentation/netlink/specs/mptcp.yaml
15102+
F: Documentation/netlink/specs/mptcp_pm.yaml
1510315103
F: Documentation/networking/mptcp-sysctl.rst
1510415104
F: include/net/mptcp.h
1510515105
F: include/trace/events/mptcp.h

include/uapi/linux/mptcp_pm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
22
/* Do not edit directly, auto-generated from: */
3-
/* Documentation/netlink/specs/mptcp.yaml */
3+
/* Documentation/netlink/specs/mptcp_pm.yaml */
44
/* YNL-GEN uapi header */
55

66
#ifndef _UAPI_LINUX_MPTCP_PM_H

net/mptcp/mptcp_pm_gen.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
22
/* Do not edit directly, auto-generated from: */
3-
/* Documentation/netlink/specs/mptcp.yaml */
3+
/* Documentation/netlink/specs/mptcp_pm.yaml */
44
/* YNL-GEN kernel source */
55

66
#include <net/netlink.h>

net/mptcp/mptcp_pm_gen.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
22
/* Do not edit directly, auto-generated from: */
3-
/* Documentation/netlink/specs/mptcp.yaml */
3+
/* Documentation/netlink/specs/mptcp_pm.yaml */
44
/* YNL-GEN kernel header */
55

66
#ifndef _LINUX_MPTCP_PM_GEN_H

0 commit comments

Comments
 (0)