* [PATCH 0/1] NetXen: Driver unload fixes
@ 2007-02-21 14:37 Amit S. Kale
2007-02-27 9:16 ` Jeff Garzik
0 siblings, 1 reply; 2+ messages in thread
From: Amit S. Kale @ 2007-02-21 14:37 UTC (permalink / raw)
To: netdev; +Cc: amitkale, jeff, netxenproj, rob
Signed-off-by: Amit S. Kale <amitkale@netxen.com>
---
netxen_nic_hw.c | 9 +++++----
netxen_nic_main.c | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 7195af3..deec796 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -242,10 +242,11 @@ int netxen_nic_hw_resources(struct netxe
adapter->cmd_consumer = (uint32_t *) (((char *)addr) +
sizeof(struct netxen_ring_ctx));
- addr = pci_alloc_consistent(adapter->ahw.pdev,
- sizeof(struct cmd_desc_type0) *
- adapter->max_tx_desc_count,
- (dma_addr_t *) & hw->cmd_desc_phys_addr);
+ addr = netxen_alloc(adapter->ahw.pdev,
+ sizeof(struct cmd_desc_type0) *
+ adapter->max_tx_desc_count,
+ (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) {
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 225ff55..b2fc2bc 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1155,8 +1155,8 @@ static void __exit netxen_exit_module(vo
/*
* 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);
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 0/1] NetXen: Driver unload fixes
2007-02-21 14:37 [PATCH 0/1] NetXen: Driver unload fixes Amit S. Kale
@ 2007-02-27 9:16 ` Jeff Garzik
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Garzik @ 2007-02-27 9:16 UTC (permalink / raw)
To: Amit S. Kale; +Cc: netdev, netxenproj, rob
Amit S. Kale wrote:
> Signed-off-by: Amit S. Kale <amitkale@netxen.com>
>
> ---
>
> netxen_nic_hw.c | 9 +++++----
> netxen_nic_main.c | 2 +-
> 2 files changed, 6 insertions(+), 5 deletions(-)
applied 1-2
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-02-27 9:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-02-21 14:37 [PATCH 0/1] NetXen: Driver unload fixes Amit S. Kale
2007-02-27 9:16 ` Jeff Garzik
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).