Commit f06f0891 authored by David S. Miller's avatar David S. Miller

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 283f105b b059aef7
...@@ -20,6 +20,7 @@ definitions: ...@@ -20,6 +20,7 @@ definitions:
name: user-features name: user-features
type: flags type: flags
name-prefix: ovs-dp-f- name-prefix: ovs-dp-f-
enum-name:
entries: entries:
- -
name: unaligned name: unaligned
...@@ -142,7 +143,6 @@ operations: ...@@ -142,7 +143,6 @@ operations:
do: do:
request: request:
attributes: attributes:
- dp-ifindex
- name - name
- upcall-pid - upcall-pid
- user-features - user-features
...@@ -154,7 +154,6 @@ operations: ...@@ -154,7 +154,6 @@ operations:
do: do:
request: request:
attributes: attributes:
- dp-ifindex
- name - name
mcast-groups: mcast-groups:
......
...@@ -124,6 +124,7 @@ definitions: ...@@ -124,6 +124,7 @@ definitions:
- -
name: ovs-frag-type name: ovs-frag-type
name-prefix: ovs-frag-type- name-prefix: ovs-frag-type-
enum-name: ovs-frag-type
type: enum type: enum
entries: entries:
- -
...@@ -269,6 +270,7 @@ definitions: ...@@ -269,6 +270,7 @@ definitions:
- -
name: ovs-ufid-flags name: ovs-ufid-flags
name-prefix: ovs-ufid-f- name-prefix: ovs-ufid-f-
enum-name:
type: flags type: flags
entries: entries:
- omit-key - omit-key
...@@ -288,6 +290,7 @@ definitions: ...@@ -288,6 +290,7 @@ definitions:
doc: Basis used for computing hash. doc: Basis used for computing hash.
- -
name: ovs-hash-alg name: ovs-hash-alg
enum-name: ovs-hash-alg
type: enum type: enum
doc: | doc: |
Data path hash algorithm for computing Datapath hash. The algorithm type only specifies Data path hash algorithm for computing Datapath hash. The algorithm type only specifies
...@@ -339,6 +342,7 @@ definitions: ...@@ -339,6 +342,7 @@ definitions:
MPLS tunnel attributes. MPLS tunnel attributes.
- -
name: ct-state-flags name: ct-state-flags
enum-name:
type: flags type: flags
name-prefix: ovs-cs-f- name-prefix: ovs-cs-f-
entries: entries:
...@@ -947,13 +951,11 @@ operations: ...@@ -947,13 +951,11 @@ operations:
do: &flow-get-op do: &flow-get-op
request: request:
attributes: attributes:
- dp-ifindex
- key - key
- ufid - ufid
- ufid-flags - ufid-flags
reply: reply:
attributes: attributes:
- dp-ifindex
- key - key
- ufid - ufid
- mask - mask
...@@ -968,7 +970,6 @@ operations: ...@@ -968,7 +970,6 @@ operations:
do: do:
request: request:
attributes: attributes:
- dp-ifindex
- key - key
- ufid - ufid
- mask - mask
......
...@@ -135,7 +135,6 @@ operations: ...@@ -135,7 +135,6 @@ operations:
- name - name
- type - type
- upcall-pid - upcall-pid
- dp-ifindex
- ifindex - ifindex
- options - options
- -
...@@ -146,7 +145,6 @@ operations: ...@@ -146,7 +145,6 @@ operations:
do: do:
request: request:
attributes: attributes:
- dp-ifindex
- port-no - port-no
- type - type
- name - name
...@@ -158,11 +156,9 @@ operations: ...@@ -158,11 +156,9 @@ operations:
do: &vport-get-op do: &vport-get-op
request: request:
attributes: attributes:
- dp-ifindex
- name - name
reply: &dev-all reply: &dev-all
attributes: attributes:
- dp-ifindex
- port-no - port-no
- type - type
- name - name
......
...@@ -15099,7 +15099,7 @@ W: https://github.com/multipath-tcp/mptcp_net-next/wiki ...@@ -15099,7 +15099,7 @@ W: https://github.com/multipath-tcp/mptcp_net-next/wiki
B: https://github.com/multipath-tcp/mptcp_net-next/issues B: https://github.com/multipath-tcp/mptcp_net-next/issues
T: git https://github.com/multipath-tcp/mptcp_net-next.git export-net T: git https://github.com/multipath-tcp/mptcp_net-next.git export-net
T: git https://github.com/multipath-tcp/mptcp_net-next.git export T: git https://github.com/multipath-tcp/mptcp_net-next.git export
F: Documentation/netlink/specs/mptcp.yaml F: Documentation/netlink/specs/mptcp_pm.yaml
F: Documentation/networking/mptcp-sysctl.rst F: Documentation/networking/mptcp-sysctl.rst
F: include/net/mptcp.h F: include/net/mptcp.h
F: include/trace/events/mptcp.h F: include/trace/events/mptcp.h
......
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
/* Do not edit directly, auto-generated from: */ /* Do not edit directly, auto-generated from: */
/* Documentation/netlink/specs/mptcp.yaml */ /* Documentation/netlink/specs/mptcp_pm.yaml */
/* YNL-GEN uapi header */ /* YNL-GEN uapi header */
#ifndef _UAPI_LINUX_MPTCP_PM_H #ifndef _UAPI_LINUX_MPTCP_PM_H
......
// SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) // SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
/* Do not edit directly, auto-generated from: */ /* Do not edit directly, auto-generated from: */
/* Documentation/netlink/specs/mptcp.yaml */ /* Documentation/netlink/specs/mptcp_pm.yaml */
/* YNL-GEN kernel source */ /* YNL-GEN kernel source */
#include <net/netlink.h> #include <net/netlink.h>
......
/* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */ /* SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause) */
/* Do not edit directly, auto-generated from: */ /* Do not edit directly, auto-generated from: */
/* Documentation/netlink/specs/mptcp.yaml */ /* Documentation/netlink/specs/mptcp_pm.yaml */
/* YNL-GEN kernel header */ /* YNL-GEN kernel header */
#ifndef _LINUX_MPTCP_PM_GEN_H #ifndef _LINUX_MPTCP_PM_GEN_H
......
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