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

Commit 82b009f9 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents db404b13 d47d2fdd

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

+3 −3
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ static const struct qlcnic_mailbox_metadata qlcnic_mbx_tbl[] = { 
	{QLCNIC_CMD_CREATE_RX_CTX, 4, 1},

	{QLCNIC_CMD_DESTROY_RX_CTX, 2, 1},

	{QLCNIC_CMD_CREATE_TX_CTX, 4, 1},

	{QLCNIC_CMD_DESTROY_TX_CTX, 2, 1},

	{QLCNIC_CMD_DESTROY_TX_CTX, 3, 1},

	{QLCNIC_CMD_INTRPT_TEST, 4, 1},

	{QLCNIC_CMD_SET_MTU, 4, 1},

	{QLCNIC_CMD_READ_PHY, 4, 2},
@@ -32,7 +32,7 @@ static const struct qlcnic_mailbox_metadata qlcnic_mbx_tbl[] = { 
	{QLCNIC_CMD_CONFIGURE_ESWITCH, 4, 1},

	{QLCNIC_CMD_GET_MAC_STATS, 4, 1},

	{QLCNIC_CMD_GET_ESWITCH_PORT_CONFIG, 4, 3},

	{QLCNIC_CMD_GET_ESWITCH_STATS, 5, 1},

	{QLCNIC_CMD_GET_ESWITCH_STATS, 4, 1},

	{QLCNIC_CMD_CONFIG_PORT, 4, 1},

	{QLCNIC_CMD_TEMP_SIZE, 4, 4},

	{QLCNIC_CMD_GET_TEMP_HDR, 4, 1},
@@ -129,7 +129,7 @@ int qlcnic_82xx_issue_cmd(struct qlcnic_adapter *adapter, 
	}



	QLCWR32(adapter, QLCNIC_SIGN_CRB_OFFSET, signature);

	for (i = 1; i < QLCNIC_CDRP_MAX_ARGS; i++)

	for (i = 1; i < cmd->req.num; i++)

		QLCWR32(adapter, QLCNIC_CDRP_ARG(i), cmd->req.arg[i]);

	QLCWR32(adapter, QLCNIC_CDRP_CRB_OFFSET,

		QLCNIC_CDRP_FORM_CMD(cmd->req.arg[0]));