IB/core: Re-enable create_flow/destroy_flow uverbs

This commit reverts commit 7afbddfae993 ("IB/core: Temporarily disable create_flow/destroy_flow uverbs"). Since the uverbs extensions functionality was experimental for v3.12, this patch re-enables the support for them and flow-steering for v3.13.

Matan Barak committed 13 years ago

Commit 69ad5da1 parent f21519b6 files · +0 −32Browse files

Showing the changes to include/uapi (1 of 6 files). Show all

Unified · Split

include/uapi/rdma/ib_user_verbs.h+0−6

@@ -89,12 +89,10 @@ enum { · 88 unmodified lines
89	89	IB_USER_VERBS_CMD_OPEN_QP,
90	90	};
91	91
92		−#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
93	92	enum {
94	93	IB_USER_VERBS_EX_CMD_CREATE_FLOW = IB_USER_VERBS_CMD_THRESHOLD,
95	94	IB_USER_VERBS_EX_CMD_DESTROY_FLOW
96	95	};
97		−#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
98	96
99	97	/*
100	98	* Make sure that all structs defined in this file remain laid out so
@@ -137,14 +135,12 @@ struct ib_uverbs_cmd_hdr { · 36 unmodified lines
137	135	__u16 out_words;
138	136	};
139	137
140		−#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
141	138	struct ib_uverbs_ex_cmd_hdr {
142	139	__u64 response;
143	140	__u16 provider_in_words;
144	141	__u16 provider_out_words;
145	142	__u32 cmd_hdr_reserved;
146	143	};
147		−#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
148	144
149	145	struct ib_uverbs_get_context {
150	146	__u64 response;
@@ -707,7 +703,6 @@ struct ib_uverbs_detach_mcast { · 556 unmodified lines
707	703	__u64 driver_data[0];
708	704	};
709	705
710		−#ifdef CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING
711	706	struct ib_uverbs_flow_spec_hdr {
712	707	__u32 type;
713	708	__u16 size;
@@ -802,7 +797,6 @@ struct ib_uverbs_destroy_flow { · 88 unmodified lines
802	797	__u32 comp_mask;
803	798	__u32 flow_handle;
804	799	};
805		−#endif /* CONFIG_INFINIBAND_EXPERIMENTAL_UVERBS_FLOW_STEERING */
806	800
807	801	struct ib_uverbs_create_srq {
808	802	__u64 response;