leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qlcnic: dont free host resources during fw recovery

Browse Source 
There is no need to free/alloc host resources during firmware
recovery.

Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Amit Kumar Salecha 2010-06-22 03:19:02 +00:00 committed by David S. Miller
parent 8a15ad1fb1
commit 52486a3ac8
1 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/net/qlcnic/qlcnic_main.c
View File

@ -1392,8 +1392,6 @@ static int __qlcnic_shutdown(struct pci_dev *pdev)
cancel_work_sync(&adapter->tx_timeout_task);
qlcnic_detach(adapter);
qlcnic_clr_all_drv_state(adapter);
clear_bit(__QLCNIC_RESETTING, &adapter->state);
@ -1454,28 +1452,16 @@ qlcnic_resume(struct pci_dev *pdev)
}
if (netif_running(netdev)) {
err = qlcnic_attach(adapter);
if (err)
goto err_out;
err = qlcnic_up(adapter, netdev);
if (err)
goto err_out_detach;
goto done;
qlcnic_config_indev_addr(netdev, NETDEV_UP);
}
done:
netif_device_attach(netdev);
qlcnic_schedule_work(adapter, qlcnic_fw_poll_work, FW_POLL_DELAY);
return 0;
err_out_detach:
qlcnic_detach(adapter);
err_out:
qlcnic_clr_all_drv_state(adapter);
netif_device_attach(netdev);
return err;
}
#endif
@ -2426,10 +2412,6 @@ qlcnic_detach_work(struct work_struct *work)
qlcnic_down(adapter, netdev);
rtnl_lock();
qlcnic_detach(adapter);
rtnl_unlock();
status = QLCRD32(adapter, QLCNIC_PEG_HALT_STATUS1);
if (status & QLCNIC_RCODE_FATAL_ERROR)
@ -2518,19 +2500,11 @@ qlcnic_attach_work(struct work_struct *work)
struct qlcnic_adapter *adapter = container_of(work,
struct qlcnic_adapter, fw_work.work);
struct net_device *netdev = adapter->netdev;
int err;
if (netif_running(netdev)) {
err = qlcnic_attach(adapter);
if (err)
if (qlcnic_up(adapter, netdev))
goto done;
err = qlcnic_up(adapter, netdev);
if (err) {
qlcnic_detach(adapter);
goto done;
}
qlcnic_config_indev_addr(netdev, NETDEV_UP);
}