aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen
diff options
context:
space:
mode:
authorDhananjay Phadke <dhananjay@netxen.com>2007-07-27 13:42:11 -0400
committerJeff Garzik <jeff@garzik.org>2007-07-30 15:52:00 -0400
commit2c6a3f72688acbc640b3be8083dac0e90354f0cf (patch)
tree72bcc21e9f0d176f7299ddfc2117c1acd7455358 /drivers/net/netxen
parente01872af1d05cf4327c8e519b14e368b72921ccf (diff)
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 'drivers/net/netxen')
-rw-r--r--drivers/net/netxen/netxen_nic_main.c4
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)
335 adapter->ahw.pdev = pdev; 335 adapter->ahw.pdev = pdev;
336 adapter->ahw.pci_func = pci_func_id; 336 adapter->ahw.pci_func = pci_func_id;
337 spin_lock_init(&adapter->tx_lock); 337 spin_lock_init(&adapter->tx_lock);
338 spin_lock_init(&adapter->lock);
339 338
340 /* remap phys address */ 339 /* remap phys address */
341 mem_base = pci_resource_start(pdev, 0); /* 0 is for BAR 0 */ 340 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)
1228{ 1227{
1229 struct netxen_adapter *adapter = 1228 struct netxen_adapter *adapter =
1230 container_of(work, struct netxen_adapter, tx_timeout_task); 1229 container_of(work, struct netxen_adapter, tx_timeout_task);
1231 unsigned long flags;
1232 1230
1233 printk(KERN_ERR "%s %s: transmit timeout, resetting.\n", 1231 printk(KERN_ERR "%s %s: transmit timeout, resetting.\n",
1234 netxen_nic_driver_name, adapter->netdev->name); 1232 netxen_nic_driver_name, adapter->netdev->name);
1235 1233
1236 spin_lock_irqsave(&adapter->lock, flags);
1237 netxen_nic_close(adapter->netdev); 1234 netxen_nic_close(adapter->netdev);
1238 netxen_nic_open(adapter->netdev); 1235 netxen_nic_open(adapter->netdev);
1239 spin_unlock_irqrestore(&adapter->lock, flags);
1240 adapter->netdev->trans_start = jiffies; 1236 adapter->netdev->trans_start = jiffies;
1241 netif_wake_queue(adapter->netdev); 1237 netif_wake_queue(adapter->netdev);
1242} 1238}