diff options
| author |   Dhananjay Phadke <dhananjay@netxen.com> | 2007-07-27 23:12:11 +0530 |
|---|---|---|
| committer |   Jeff Garzik <jeff@garzik.org> | 2007-07-30 15:52:00 -0400 |
| commit | 2c6a3f72688acbc640b3be8083dac0e90354f0cf (patch) | |
| tree | 72bcc21e9f0d176f7299ddfc2117c1acd7455358 /drivers/net/netxen/netxen_nic_main.c | |
| parent | netxen: Fix interrupt handling for multiport adapters (diff) | |
| download | linux-dev-2c6a3f72688acbc640b3be8083dac0e90354f0cf.tar.xz linux-dev-2c6a3f72688acbc640b3be8083dac0e90354f0cf.zip | |
netxen: drop redudant spinlock
Some leftover code that makes use of adapter->lock in tx_timeout function,
which resets the interface under this lock. In close() when the workqueue
is flushed, prints the warning about sleeping with interrupts disabled
(when spinlock debug is enabled). The lock was required with private netxen
IOCTLs, which were removed a while ago.
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index bb8f5f2adab9..08a62acde8bf 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -335,7 +335,6 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) adapter->ahw.pdev = pdev; adapter->ahw.pci_func = pci_func_id; spin_lock_init(&adapter->tx_lock); - spin_lock_init(&adapter->lock); /* remap phys address */ mem_base = pci_resource_start(pdev, 0); /* 0 is for BAR 0 */ @@ -1228,15 +1227,12 @@ static void netxen_tx_timeout_task(struct work_struct *work) { struct netxen_adapter *adapter = container_of(work, struct netxen_adapter, tx_timeout_task); - unsigned long flags; printk(KERN_ERR "%s %s: transmit timeout, resetting.\n", netxen_nic_driver_name, adapter->netdev->name); - spin_lock_irqsave(&adapter->lock, flags); netxen_nic_close(adapter->netdev); netxen_nic_open(adapter->netdev); - spin_unlock_irqrestore(&adapter->lock, flags); adapter->netdev->trans_start = jiffies; netif_wake_queue(adapter->netdev); } |