diff options
author | Rajesh Borundia <rajesh.borundia@qlogic.com> | 2010-08-16 20:34:21 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-08-17 06:59:46 -0400 |
commit | ecd7d31038e2e0e95b4596eec021e02ba67a0a37 (patch) | |
tree | 6a4060dc6492fd655bce9e1b30126cb7b1fb7271 /drivers/net/qlcnic | |
parent | 3c4b23b1be212d1b8494655182c0d4cef0a37be3 (diff) |
qlcnic: fix for setting function modes
function modes was not working with CNA device, in CNA mode
other function(FCOE) can be enabled before nic.
Signed-off-by: Rajesh Borundia <rajesh.borundia@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlcnic')
-rw-r--r-- | drivers/net/qlcnic/qlcnic_main.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c index 70c4b6b0031e..06ffd7637f87 100644 --- a/drivers/net/qlcnic/qlcnic_main.c +++ b/drivers/net/qlcnic/qlcnic_main.c | |||
@@ -543,8 +543,6 @@ qlcnic_set_function_modes(struct qlcnic_adapter *adapter) | |||
543 | ret = qlcnic_api_lock(adapter); | 543 | ret = qlcnic_api_lock(adapter); |
544 | if (ret) | 544 | if (ret) |
545 | goto err_lock; | 545 | goto err_lock; |
546 | if (QLC_DEV_CLR_REF_CNT(ref_count, adapter->ahw.pci_func)) | ||
547 | goto err_npar; | ||
548 | 546 | ||
549 | if (qlcnic_config_npars) { | 547 | if (qlcnic_config_npars) { |
550 | for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) { | 548 | for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) { |
@@ -562,7 +560,6 @@ qlcnic_set_function_modes(struct qlcnic_adapter *adapter) | |||
562 | adapter->ahw.pci_func)); | 560 | adapter->ahw.pci_func)); |
563 | } | 561 | } |
564 | writel(data, priv_op); | 562 | writel(data, priv_op); |
565 | err_npar: | ||
566 | qlcnic_api_unlock(adapter); | 563 | qlcnic_api_unlock(adapter); |
567 | err_lock: | 564 | err_lock: |
568 | return ret; | 565 | return ret; |