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

Commit 6226204b authored by Pratik Pujar's avatar Pratik Pujar Committed by David S. Miller
Browse files

qlcnic: Fix operation type and command type. 



Operation type and command type is not set correct in back channel
response.

Signed-off-by: default avatarPratik Pujar <pratik.pujar@qlogic.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c70a3175

drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c

+2 −0
Original line number Diff line number Diff line
@@ -762,6 +762,7 @@ static int qlcnic_sriov_alloc_bc_mbx_args(struct qlcnic_cmd_args *mbx, u32 type) 
			memset(mbx->rsp.arg, 0, sizeof(u32) * mbx->rsp.num);

			mbx->req.arg[0] = (type | (mbx->req.num << 16) |

					   (3 << 29));

			mbx->rsp.arg[0] = (type & 0xffff) | mbx->rsp.num << 16;

			return 0;

		}

	}
@@ -813,6 +814,7 @@ static int qlcnic_sriov_prepare_bc_hdr(struct qlcnic_bc_trans *trans, 
		cmd->req.num = trans->req_pay_size / 4;

		cmd->rsp.num = trans->rsp_pay_size / 4;

		hdr = trans->rsp_hdr;

		cmd->op_type = trans->req_hdr->op_type;

	}



	trans->trans_id = seq;

drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c

+1 −3
Original line number Diff line number Diff line
@@ -641,8 +641,6 @@ static int qlcnic_sriov_pf_channel_cfg_cmd(struct qlcnic_bc_trans *trans, 
	int err;



	adapter = vf->adapter;

	cmd->rsp.arg[0] = trans->req_hdr->cmd_op;

	cmd->rsp.arg[0] |= (1 << 16);



	if (trans->req_hdr->cmd_op == QLCNIC_BC_CMD_CHANNEL_INIT) {

		err = qlcnic_sriov_pf_config_vport(adapter, 1, func);
@@ -1187,7 +1185,7 @@ static int qlcnic_sriov_pf_get_acl_cmd(struct qlcnic_bc_trans *trans, 
	u8 cmd_op, mode = vp->vlan_mode;



	cmd_op = trans->req_hdr->cmd_op;

	cmd->rsp.arg[0] = (cmd_op & 0xffff) | 14 << 16 | 1 << 25;

	cmd->rsp.arg[0] |= 1 << 25;



	switch (mode) {

	case QLC_GUEST_VLAN_MODE: