rdam: uapi update ib_user_verbs.h

Merge in latest santized kernel header.
Put sanitized version of current ib_user_verbs.h.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/rdma/include/uapi/rdma/ib_user_verbs.h b/rdma/include/uapi/rdma/ib_user_verbs.h
index 6aeb03315b0bd543b4fa11d5a46ab8d8a98430a8..4f9991de8e3adccc8fcea97acf2cec2704a673fe 100644 (file)
--- a/rdma/include/uapi/rdma/ib_user_verbs.h
+++ b/rdma/include/uapi/rdma/ib_user_verbs.h
@@ -998,6 +998,19 @@ struct ib_uverbs_flow_spec_action_handle {
        __u32                         reserved1;
 };
 
+struct ib_uverbs_flow_spec_action_count {
+       union {
+               struct ib_uverbs_flow_spec_hdr hdr;
+               struct {
+                       __u32 type;
+                       __u16 size;
+                       __u16 reserved;
+               };
+       };
+       __u32                         handle;
+       __u32                         reserved1;
+};
+
 struct ib_uverbs_flow_tunnel_filter {
        __be32 tunnel_id;
 };
@@ -1033,6 +1046,56 @@ struct ib_uverbs_flow_spec_esp {
        struct ib_uverbs_flow_spec_esp_filter mask;
 };
 
+struct ib_uverbs_flow_gre_filter {
+       /* c_ks_res0_ver field is bits 0-15 in offset 0 of a standard GRE header:
+        * bit 0 - C - checksum bit.
+        * bit 1 - reserved. set to 0.
+        * bit 2 - key bit.
+        * bit 3 - sequence number bit.
+        * bits 4:12 - reserved. set to 0.
+        * bits 13:15 - GRE version.
+        */
+       __be16 c_ks_res0_ver;
+       __be16 protocol;
+       __be32 key;
+};
+
+struct ib_uverbs_flow_spec_gre {
+       union {
+               struct ib_uverbs_flow_spec_hdr hdr;
+               struct {
+                       __u32 type;
+                       __u16 size;
+                       __u16 reserved;
+               };
+       };
+       struct ib_uverbs_flow_gre_filter     val;
+       struct ib_uverbs_flow_gre_filter     mask;
+};
+
+struct ib_uverbs_flow_mpls_filter {
+       /* The field includes the entire MPLS label:
+        * bits 0:19 - label field.
+        * bits 20:22 - traffic class field.
+        * bits 23 - bottom of stack bit.
+        * bits 24:31 - ttl field.
+        */
+       __be32 label;
+};
+
+struct ib_uverbs_flow_spec_mpls {
+       union {
+               struct ib_uverbs_flow_spec_hdr hdr;
+               struct {
+                       __u32 type;
+                       __u16 size;
+                       __u16 reserved;
+               };
+       };
+       struct ib_uverbs_flow_mpls_filter     val;
+       struct ib_uverbs_flow_mpls_filter     mask;
+};
+
 struct ib_uverbs_flow_attr {
        __u32 type;
        __u16 size;