Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ad544cfe authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

RDMA/uverbs: Split UVERBS_ATTR_FLOW_ACTION_ESP_HANDLE 



Two methods are sharing the same attribute constant, but the attribute
definitions are not the same. This should not have been done, instead
split them into two attributes with the same number.

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent 87fc2a62

drivers/infiniband/core/uverbs_std_types_flow_action.c

+8 −4
Original line number Diff line number Diff line
@@ -321,7 +321,8 @@ static int UVERBS_HANDLER(UVERBS_METHOD_FLOW_ACTION_ESP_CREATE)(struct ib_device 
		return ret;



	/* No need to check as this attribute is marked as MANDATORY */

	uobj = uverbs_attr_get_uobject(attrs, UVERBS_ATTR_FLOW_ACTION_ESP_HANDLE);

	uobj = uverbs_attr_get_uobject(

		attrs, UVERBS_ATTR_CREATE_FLOW_ACTION_ESP_HANDLE);

	action = ib_dev->create_flow_action_esp(ib_dev, &esp_attr.hdr, attrs);

	if (IS_ERR(action))

		return PTR_ERR(action);
@@ -351,7 +352,8 @@ static int UVERBS_HANDLER(UVERBS_METHOD_FLOW_ACTION_ESP_MODIFY)(struct ib_device 
	if (ret)

		return ret;



	uobj = uverbs_attr_get_uobject(attrs, UVERBS_ATTR_FLOW_ACTION_ESP_HANDLE);

	uobj = uverbs_attr_get_uobject(

		attrs, UVERBS_ATTR_MODIFY_FLOW_ACTION_ESP_HANDLE);

	action = uobj->object;



	if (action->type != IB_FLOW_ACTION_ESP)
@@ -390,7 +392,8 @@ static const struct uverbs_attr_spec uverbs_flow_action_esp_replay[] = { 
};



static DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_FLOW_ACTION_ESP_CREATE,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_FLOW_ACTION_ESP_HANDLE, UVERBS_OBJECT_FLOW_ACTION,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_CREATE_FLOW_ACTION_ESP_HANDLE,

			 UVERBS_OBJECT_FLOW_ACTION,

			 UVERBS_ACCESS_NEW,

			 UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_FLOW_ACTION_ESP_ATTRS,
@@ -407,7 +410,8 @@ static DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_FLOW_ACTION_ESP_CREATE, 
			    UVERBS_ATTR_STRUCT(struct ib_uverbs_flow_action_esp_encap, type)));



static DECLARE_UVERBS_NAMED_METHOD(UVERBS_METHOD_FLOW_ACTION_ESP_MODIFY,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_FLOW_ACTION_ESP_HANDLE, UVERBS_OBJECT_FLOW_ACTION,

	&UVERBS_ATTR_IDR(UVERBS_ATTR_MODIFY_FLOW_ACTION_ESP_HANDLE,

			 UVERBS_OBJECT_FLOW_ACTION,

			 UVERBS_ACCESS_WRITE,

			 UA_FLAGS(UVERBS_ATTR_SPEC_F_MANDATORY)),

	&UVERBS_ATTR_PTR_IN(UVERBS_ATTR_FLOW_ACTION_ESP_ATTRS,

include/uapi/rdma/ib_user_ioctl_cmds.h

+6 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ enum uverbs_attrs_destroy_cq_cmd_attr_ids { 
};



enum uverbs_attrs_create_flow_action_esp {

	UVERBS_ATTR_FLOW_ACTION_ESP_HANDLE,

	UVERBS_ATTR_CREATE_FLOW_ACTION_ESP_HANDLE,

	UVERBS_ATTR_FLOW_ACTION_ESP_ATTRS,

	UVERBS_ATTR_FLOW_ACTION_ESP_ESN,

	UVERBS_ATTR_FLOW_ACTION_ESP_KEYMAT,
@@ -87,6 +87,11 @@ enum uverbs_attrs_create_flow_action_esp { 
	UVERBS_ATTR_FLOW_ACTION_ESP_ENCAP,

};



enum uverbs_attrs_modify_flow_action_esp {

	UVERBS_ATTR_MODIFY_FLOW_ACTION_ESP_HANDLE =

		UVERBS_ATTR_CREATE_FLOW_ACTION_ESP_HANDLE,

};



enum uverbs_attrs_destroy_flow_action_esp {

	UVERBS_ATTR_DESTROY_FLOW_ACTION_HANDLE,

};