diff options
| author | dhananjay@netxen.com | 2007-12-26 19:23:56 +0100 |
|---|---|---|
| committer | Jeff Garzik | 2008-01-12 23:35:34 +0100 |
| commit | 72b0a7a8a40a50cf2eab42fd6a56e04b05090434 (patch) | |
| tree | 21855d0a2f6b733bf616b555b5694ed698c32144 /drivers/net/netxen/netxen_nic_main.c | |
| parent | netxen: update driver version (diff) | |
| download | kernel-qcow2-linux-72b0a7a8a40a50cf2eab42fd6a56e04b05090434.tar.gz kernel-qcow2-linux-72b0a7a8a40a50cf2eab42fd6a56e04b05090434.tar.xz kernel-qcow2-linux-72b0a7a8a40a50cf2eab42fd6a56e04b05090434.zip | |
netxen: stop second phy correctly
This patch fixes bug that doesn't quiesce second port when interface is
brought down, which could lead to unwarranted interrupt during rmmod /
ifdown.
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_main.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 454226f7baa8..2d75c710f62a 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -732,11 +732,6 @@ static void __devexit netxen_nic_remove(struct pci_dev *pdev) unregister_netdev(netdev); - if (adapter->stop_port) - adapter->stop_port(adapter); - - netxen_nic_disable_int(adapter); - if (adapter->is_up == NETXEN_ADAPTER_UP_MAGIC) { init_firmware_done++; netxen_free_hw_resources(adapter); @@ -919,6 +914,9 @@ static int netxen_nic_close(struct net_device *netdev) netif_stop_queue(netdev); napi_disable(&adapter->napi); + if (adapter->stop_port) + adapter->stop_port(adapter); + netxen_nic_disable_int(adapter); cmd_buff = adapter->cmd_buf_arr; |