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

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

Documentation/netlink/specs/ovs_datapath.yaml

+1 −2
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ definitions: 
    name: user-features

    type: flags

    name-prefix: ovs-dp-f-

    enum-name:

    entries:

      -

        name: unaligned
@@ -142,7 +143,6 @@ operations: 
      do:

        request:

          attributes:

            - dp-ifindex

            - name

            - upcall-pid

            - user-features
@@ -154,7 +154,6 @@ operations: 
      do:

        request:

          attributes:

            - dp-ifindex

            - name



mcast-groups:

Documentation/netlink/specs/ovs_flow.yaml

+4 −3
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ definitions: 
  -

    name: ovs-frag-type

    name-prefix: ovs-frag-type-

    enum-name: ovs-frag-type

    type: enum

    entries:

      -
@@ -269,6 +270,7 @@ definitions: 
  -

    name: ovs-ufid-flags

    name-prefix: ovs-ufid-f-

    enum-name:

    type: flags

    entries:

      - omit-key
@@ -288,6 +290,7 @@ definitions: 
        doc: Basis used for computing hash.

  -

    name: ovs-hash-alg

    enum-name: ovs-hash-alg

    type: enum

    doc: |

      Data path hash algorithm for computing Datapath hash. The algorithm type only specifies
@@ -339,6 +342,7 @@ definitions: 
          MPLS tunnel attributes.

  -

    name: ct-state-flags

    enum-name:

    type: flags

    name-prefix: ovs-cs-f-

    entries:
@@ -947,13 +951,11 @@ operations: 
      do: &flow-get-op

        request:

          attributes:

            - dp-ifindex

            - key

            - ufid

            - ufid-flags

        reply:

          attributes:

            - dp-ifindex

            - key

            - ufid

            - mask
@@ -968,7 +970,6 @@ operations: 
      do:

        request:

          attributes:

            - dp-ifindex

            - key

            - ufid

            - mask

Documentation/netlink/specs/ovs_vport.yaml

+0 −4
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ operations: 
            - name

            - type

            - upcall-pid

            - dp-ifindex

            - ifindex

            - options

    -
@@ -146,7 +145,6 @@ operations: 
      do:

        request:

          attributes:

            - dp-ifindex

            - port-no

            - type

            - name
@@ -158,11 +156,9 @@ operations: 
      do: &vport-get-op

        request:

          attributes:

            - dp-ifindex

            - name

        reply: &dev-all

          attributes:

            - dp-ifindex

            - port-no

            - type

            - name

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -15099,7 +15099,7 @@ W: https://github.com/multipath-tcp/mptcp_net-next/wiki 
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

F:	Documentation/netlink/specs/mptcp.yaml

F:	Documentation/netlink/specs/mptcp_pm.yaml

F:	Documentation/networking/mptcp-sysctl.rst

F:	include/net/mptcp.h

F:	include/trace/events/mptcp.h