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

Commit 2c6a3f72 authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by Jeff Garzik
Browse files

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: default avatarJeff Garzik <jeff@garzik.org>
parent e01872af

drivers/net/netxen/netxen_nic_main.c

+0 −4
Original line number Diff line number Diff line
@@ -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);

}