提交 b7475794 编写于 作者: O Or Gerlitz 提交者: David S. Miller

net/mlx4: USe one wrapper that returns -EPERM

When a VF issues a firmware command which is disallowed for them, the PF
rerturns -EPERM from that command wrapper. Move to use one such wrapper
instance, instead of repeating the same code on such commands.
Signed-off-by: NOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 dae98cad
...@@ -800,16 +800,7 @@ static int mlx4_MAD_IFC_wrapper(struct mlx4_dev *dev, int slave, ...@@ -800,16 +800,7 @@ static int mlx4_MAD_IFC_wrapper(struct mlx4_dev *dev, int slave,
vhcr->op, MLX4_CMD_TIME_CLASS_C, MLX4_CMD_NATIVE); vhcr->op, MLX4_CMD_TIME_CLASS_C, MLX4_CMD_NATIVE);
} }
static int MLX4_CMD_UPDATE_QP_wrapper(struct mlx4_dev *dev, int slave, static int mlx4_CMD_EPERM_wrapper(struct mlx4_dev *dev, int slave,
struct mlx4_vhcr *vhcr,
struct mlx4_cmd_mailbox *inbox,
struct mlx4_cmd_mailbox *outbox,
struct mlx4_cmd_info *cmd)
{
return -EPERM;
}
static int MLX4_CMD_GET_OP_REQ_wrapper(struct mlx4_dev *dev, int slave,
struct mlx4_vhcr *vhcr, struct mlx4_vhcr *vhcr,
struct mlx4_cmd_mailbox *inbox, struct mlx4_cmd_mailbox *inbox,
struct mlx4_cmd_mailbox *outbox, struct mlx4_cmd_mailbox *outbox,
...@@ -1258,7 +1249,7 @@ static struct mlx4_cmd_info cmd_info[] = { ...@@ -1258,7 +1249,7 @@ static struct mlx4_cmd_info cmd_info[] = {
.out_is_imm = false, .out_is_imm = false,
.encode_slave_id = false, .encode_slave_id = false,
.verify = NULL, .verify = NULL,
.wrapper = MLX4_CMD_UPDATE_QP_wrapper .wrapper = mlx4_CMD_EPERM_wrapper
}, },
{ {
.opcode = MLX4_CMD_GET_OP_REQ, .opcode = MLX4_CMD_GET_OP_REQ,
...@@ -1267,7 +1258,7 @@ static struct mlx4_cmd_info cmd_info[] = { ...@@ -1267,7 +1258,7 @@ static struct mlx4_cmd_info cmd_info[] = {
.out_is_imm = false, .out_is_imm = false,
.encode_slave_id = false, .encode_slave_id = false,
.verify = NULL, .verify = NULL,
.wrapper = MLX4_CMD_GET_OP_REQ_wrapper, .wrapper = mlx4_CMD_EPERM_wrapper,
}, },
{ {
.opcode = MLX4_CMD_CONF_SPECIAL_QP, .opcode = MLX4_CMD_CONF_SPECIAL_QP,
...@@ -1378,7 +1369,7 @@ static struct mlx4_cmd_info cmd_info[] = { ...@@ -1378,7 +1369,7 @@ static struct mlx4_cmd_info cmd_info[] = {
.out_is_imm = false, .out_is_imm = false,
.encode_slave_id = false, .encode_slave_id = false,
.verify = NULL, .verify = NULL,
.wrapper = mlx4_FLOW_STEERING_IB_UC_QP_RANGE_wrapper .wrapper = mlx4_CMD_EPERM_wrapper
}, },
}; };
......
...@@ -1247,11 +1247,6 @@ int mlx4_QP_FLOW_STEERING_DETACH_wrapper(struct mlx4_dev *dev, int slave, ...@@ -1247,11 +1247,6 @@ int mlx4_QP_FLOW_STEERING_DETACH_wrapper(struct mlx4_dev *dev, int slave,
struct mlx4_cmd_mailbox *inbox, struct mlx4_cmd_mailbox *inbox,
struct mlx4_cmd_mailbox *outbox, struct mlx4_cmd_mailbox *outbox,
struct mlx4_cmd_info *cmd); struct mlx4_cmd_info *cmd);
int mlx4_FLOW_STEERING_IB_UC_QP_RANGE_wrapper(struct mlx4_dev *dev, int slave,
struct mlx4_vhcr *vhcr,
struct mlx4_cmd_mailbox *inbox,
struct mlx4_cmd_mailbox *outbox,
struct mlx4_cmd_info *cmd);
int mlx4_get_mgm_entry_size(struct mlx4_dev *dev); int mlx4_get_mgm_entry_size(struct mlx4_dev *dev);
int mlx4_get_qp_per_mgm(struct mlx4_dev *dev); int mlx4_get_qp_per_mgm(struct mlx4_dev *dev);
......
...@@ -4015,16 +4015,6 @@ int mlx4_QUERY_IF_STAT_wrapper(struct mlx4_dev *dev, int slave, ...@@ -4015,16 +4015,6 @@ int mlx4_QUERY_IF_STAT_wrapper(struct mlx4_dev *dev, int slave,
return err; return err;
} }
int mlx4_FLOW_STEERING_IB_UC_QP_RANGE_wrapper(struct mlx4_dev *dev, int slave,
struct mlx4_vhcr *vhcr,
struct mlx4_cmd_mailbox *inbox,
struct mlx4_cmd_mailbox *outbox,
struct mlx4_cmd_info *cmd)
{
return -EPERM;
}
static void detach_qp(struct mlx4_dev *dev, int slave, struct res_qp *rqp) static void detach_qp(struct mlx4_dev *dev, int slave, struct res_qp *rqp)
{ {
struct res_gid *rgid; struct res_gid *rgid;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册