diff options
| author | Anirban Chakraborty <anirban.chakraborty@qlogic.com> | 2011-09-13 08:06:18 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-09-23 14:23:59 -0400 |
| commit | 7777de9af54a1402c79bf7663b38ff5ba308dd45 (patch) | |
| tree | 5374023bb976a2d8bd6d0d98ae5e940c7fec095a /drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | |
| parent | 853d4bcaeb31905b85ba9f65f46cfaf9c41d1915 (diff) | |
qlcnic: Change CDRP function
Argument list to CDRP function has become unmanageably long. Fix it by properly
declaring a struct that encompasses all the input and output parameters.
Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c index b127f809421b..11f4df75e84c 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ethtool.c @@ -659,7 +659,7 @@ static int qlcnic_irq_test(struct net_device *netdev) struct qlcnic_adapter *adapter = netdev_priv(netdev); int max_sds_rings = adapter->max_sds_rings; int ret; - u32 *rd_args[3]; + struct qlcnic_cmd_args cmd; if (test_and_set_bit(__QLCNIC_RESETTING, &adapter->state)) return -EIO; @@ -669,10 +669,12 @@ static int qlcnic_irq_test(struct net_device *netdev) goto clear_it; adapter->diag_cnt = 0; - memset(rd_args, 0, sizeof(rd_args)); - ret = qlcnic_issue_cmd(adapter, adapter->ahw->pci_func, - adapter->fw_hal_version, adapter->ahw->pci_func, - 0, 0, 0x00000011, rd_args); + memset(&cmd, 0, sizeof(cmd)); + cmd.req.cmd = QLCNIC_CDRP_CMD_INTRPT_TEST; + cmd.req.arg1 = adapter->ahw->pci_func; + qlcnic_issue_cmd(adapter, &cmd); + ret = cmd.rsp.cmd; + if (ret) goto done; |