Skip to content

Commit 82b009f

Browse files
committed
Merge branch 'qlcnic'
Rajesh Borundia says: ==================== qlcnic: Bug fixes This series fixes following issues. * We were programming maximum number of arguments supported by adapter instead of required in a command. * Destroy tx command requires three arguments instead of two. Please apply these patches to net. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
2 parents db404b1 + d47d2fd commit 82b009f

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ static const struct qlcnic_mailbox_metadata qlcnic_mbx_tbl[] = {
1111
{QLCNIC_CMD_CREATE_RX_CTX, 4, 1},
1212
{QLCNIC_CMD_DESTROY_RX_CTX, 2, 1},
1313
{QLCNIC_CMD_CREATE_TX_CTX, 4, 1},
14-
{QLCNIC_CMD_DESTROY_TX_CTX, 2, 1},
14+
{QLCNIC_CMD_DESTROY_TX_CTX, 3, 1},
1515
{QLCNIC_CMD_INTRPT_TEST, 4, 1},
1616
{QLCNIC_CMD_SET_MTU, 4, 1},
1717
{QLCNIC_CMD_READ_PHY, 4, 2},
@@ -32,7 +32,7 @@ static const struct qlcnic_mailbox_metadata qlcnic_mbx_tbl[] = {
3232
{QLCNIC_CMD_CONFIGURE_ESWITCH, 4, 1},
3333
{QLCNIC_CMD_GET_MAC_STATS, 4, 1},
3434
{QLCNIC_CMD_GET_ESWITCH_PORT_CONFIG, 4, 3},
35-
{QLCNIC_CMD_GET_ESWITCH_STATS, 5, 1},
35+
{QLCNIC_CMD_GET_ESWITCH_STATS, 4, 1},
3636
{QLCNIC_CMD_CONFIG_PORT, 4, 1},
3737
{QLCNIC_CMD_TEMP_SIZE, 4, 4},
3838
{QLCNIC_CMD_GET_TEMP_HDR, 4, 1},
@@ -129,7 +129,7 @@ int qlcnic_82xx_issue_cmd(struct qlcnic_adapter *adapter,
129129
}
130130

131131
QLCWR32(adapter, QLCNIC_SIGN_CRB_OFFSET, signature);
132-
for (i = 1; i < QLCNIC_CDRP_MAX_ARGS; i++)
132+
for (i = 1; i < cmd->req.num; i++)
133133
QLCWR32(adapter, QLCNIC_CDRP_ARG(i), cmd->req.arg[i]);
134134
QLCWR32(adapter, QLCNIC_CDRP_CRB_OFFSET,
135135
QLCNIC_CDRP_FORM_CMD(cmd->req.arg[0]));

0 commit comments

Comments
 (0)