aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/infiniband/core/uverbs.h16
-rw-r--r--include/uapi/rdma/ib_user_verbs.h16
2 files changed, 16 insertions, 16 deletions
diff --git a/drivers/infiniband/core/uverbs.h b/drivers/infiniband/core/uverbs.h
index d8f9c6c272d7..777954f67270 100644
--- a/drivers/infiniband/core/uverbs.h
+++ b/drivers/infiniband/core/uverbs.h
@@ -178,6 +178,22 @@ void ib_uverbs_event_handler(struct ib_event_handler *handler,
178 struct ib_event *event); 178 struct ib_event *event);
179void ib_uverbs_dealloc_xrcd(struct ib_uverbs_device *dev, struct ib_xrcd *xrcd); 179void ib_uverbs_dealloc_xrcd(struct ib_uverbs_device *dev, struct ib_xrcd *xrcd);
180 180
181struct ib_uverbs_flow_spec {
182 union {
183 union {
184 struct ib_uverbs_flow_spec_hdr hdr;
185 struct {
186 __u32 type;
187 __u16 size;
188 __u16 reserved;
189 };
190 };
191 struct ib_uverbs_flow_spec_eth eth;
192 struct ib_uverbs_flow_spec_ipv4 ipv4;
193 struct ib_uverbs_flow_spec_tcp_udp tcp_udp;
194 };
195};
196
181#define IB_UVERBS_DECLARE_CMD(name) \ 197#define IB_UVERBS_DECLARE_CMD(name) \
182 ssize_t ib_uverbs_##name(struct ib_uverbs_file *file, \ 198 ssize_t ib_uverbs_##name(struct ib_uverbs_file *file, \
183 const char __user *buf, int in_len, \ 199 const char __user *buf, int in_len, \
diff --git a/include/uapi/rdma/ib_user_verbs.h b/include/uapi/rdma/ib_user_verbs.h
index 43014981550a..fc9bbe37cfce 100644
--- a/include/uapi/rdma/ib_user_verbs.h
+++ b/include/uapi/rdma/ib_user_verbs.h
@@ -765,22 +765,6 @@ struct ib_uverbs_flow_spec_tcp_udp {
765 struct ib_uverbs_flow_tcp_udp_filter mask; 765 struct ib_uverbs_flow_tcp_udp_filter mask;
766}; 766};
767 767
768struct ib_uverbs_flow_spec {
769 union {
770 union {
771 struct ib_uverbs_flow_spec_hdr hdr;
772 struct {
773 __u32 type;
774 __u16 size;
775 __u16 reserved;
776 };
777 };
778 struct ib_uverbs_flow_spec_eth eth;
779 struct ib_uverbs_flow_spec_ipv4 ipv4;
780 struct ib_uverbs_flow_spec_tcp_udp tcp_udp;
781 };
782};
783
784struct ib_uverbs_flow_attr { 768struct ib_uverbs_flow_attr {
785 __u32 type; 769 __u32 type;
786 __u16 size; 770 __u16 size;