diff options
| author |   Sucheta Chakraborty <sucheta.chakraborty@qlogic.com> | 2013-12-17 09:01:50 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-12-17 17:09:43 -0500 |
| commit | 3720bf796b1826e8be804c3000b2c51492c4a10b (patch) | |
| tree | 7a20f56de39591160722d08ac4c24d2e803f31fd /drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | |
| parent | qlcnic: Disable DCB operations from SR-IOV VFs. (diff) | |
| download | linux-dev-3720bf796b1826e8be804c3000b2c51492c4a10b.tar.xz linux-dev-3720bf796b1826e8be804c3000b2c51492c4a10b.zip | |
qlcnic: Issue INIT_NIC command only once.
o DCB AEN registration was reissuing INIT_NIC command. Instead, club
all options of INIT NIC command and issue this command only once.
Signed-off-by: Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
Signed-off-by: Manish Chopra <manish.chopra@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 083941c14158..484e0598620b 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -2497,8 +2497,6 @@ static void qlcnic_remove(struct pci_dev *pdev) qlcnic_cancel_idc_work(adapter); ahw = adapter->ahw; - qlcnic_dcb_free(adapter->dcb); - unregister_netdev(netdev); qlcnic_sriov_cleanup(adapter); @@ -2511,6 +2509,8 @@ static void qlcnic_remove(struct pci_dev *pdev) kfree(ahw->fw_info); } + qlcnic_dcb_free(adapter->dcb); + qlcnic_detach(adapter); if (adapter->npars != NULL) |