]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
qlcnic: fix for setting function modes
authorRajesh Borundia <rajesh.borundia@qlogic.com>
Tue, 17 Aug 2010 00:34:21 +0000 (00:34 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 17 Aug 2010 10:59:46 +0000 (03:59 -0700)
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>
drivers/net/qlcnic/qlcnic_main.c

index 70c4b6b0031eeb8d343351a0c59243ee105ba7d9..06ffd7637f87f188dd46eda2eb0b241ceb0d5fb5 100644 (file)
@@ -543,8 +543,6 @@ qlcnic_set_function_modes(struct qlcnic_adapter *adapter)
        ret = qlcnic_api_lock(adapter);
        if (ret)
                goto err_lock;
-       if (QLC_DEV_CLR_REF_CNT(ref_count, adapter->ahw.pci_func))
-               goto err_npar;
 
        if (qlcnic_config_npars) {
                for (i = 0; i < QLCNIC_MAX_PCI_FUNC; i++) {
@@ -562,7 +560,6 @@ qlcnic_set_function_modes(struct qlcnic_adapter *adapter)
                        adapter->ahw.pci_func));
        }
        writel(data, priv_op);
-err_npar:
        qlcnic_api_unlock(adapter);
 err_lock:
        return ret;