Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9de06610 authored by Amit S. Kale's avatar Amit S. Kale Committed by Jeff Garzik
Browse files

NetXen: Driver unload fixes 



Signed-off-by: default avatarAmit S. Kale <amitkale@netxen.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent fa302484

drivers/net/netxen/netxen_nic_hw.c

+5 −4
Original line number Diff line number Diff line
@@ -242,10 +242,11 @@ int netxen_nic_hw_resources(struct netxen_adapter *adapter) 
	adapter->cmd_consumer = (uint32_t *) (((char *)addr) +

					      sizeof(struct netxen_ring_ctx));



	addr = pci_alloc_consistent(adapter->ahw.pdev,

	addr = netxen_alloc(adapter->ahw.pdev,

			    sizeof(struct cmd_desc_type0) *

			    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);



	if (addr == NULL) {

drivers/net/netxen/netxen_nic_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1155,8 +1155,8 @@ static void __exit netxen_exit_module(void) 
	/*

	 * Wait for some time to allow the dma to drain, if any.

	 */

	destroy_workqueue(netxen_workq);

	pci_unregister_driver(&netxen_driver);

	destroy_workqueue(netxen_workq);

}



module_exit(netxen_exit_module);