NetXen: Driver unload fixes

Signed-off-by: Amit S. Kale <amitkale@netxen.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Amit S. Kale 2007-02-21 06:37:06 -08:00 committed by Jeff Garzik
parent fa30248421
commit 9de0661066
2 changed files with 6 additions and 5 deletions

View File

@ -242,10 +242,11 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter)
adapter->cmd_consumer = (uint32_t *) (((char *)addr) + adapter->cmd_consumer = (uint32_t *) (((char *)addr) +
sizeof(struct netxen_ring_ctx)); sizeof(struct netxen_ring_ctx));
addr = pci_alloc_consistent(adapter->ahw.pdev, addr = netxen_alloc(adapter->ahw.pdev,
sizeof(struct cmd_desc_type0) * sizeof(struct cmd_desc_type0) *
adapter->max_tx_desc_count, adapter->max_tx_desc_count,
(dma_addr_t *) & hw->cmd_desc_phys_addr); (dma_addr_t *) & hw->cmd_desc_phys_addr,
&adapter->ahw.cmd_desc_pdev);
printk("cmd_desc_phys_addr: 0x%llx\n", (u64) hw->cmd_desc_phys_addr); printk("cmd_desc_phys_addr: 0x%llx\n", (u64) hw->cmd_desc_phys_addr);
if (addr == NULL) { if (addr == NULL) {

View File

@ -1155,8 +1155,8 @@ static void __exit netxen_exit_module(void)
/* /*
* Wait for some time to allow the dma to drain, if any. * Wait for some time to allow the dma to drain, if any.
*/ */
destroy_workqueue(netxen_workq);
pci_unregister_driver(&netxen_driver); pci_unregister_driver(&netxen_driver);
destroy_workqueue(netxen_workq);
} }
module_exit(netxen_exit_module); module_exit(netxen_exit_module);