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

Commit 6c586644 authored by Amit S. Kale's avatar Amit S. Kale Committed by Jeff Garzik
Browse files

NetXen: work queue fixes. 



Signed-off-by: default avatarAmit S. Kale <amitkale@netxen.com>

 netxen_nic.h      |    3 +--
 netxen_nic_init.c |    2 +-
 netxen_nic_main.c |   15 +++++++--------
 3 files changed, 9 insertions(+), 11 deletions(-)
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent d2378e89

drivers/net/netxen/netxen_nic.h

+1 −2
Original line number Diff line number Diff line
@@ -852,8 +852,6 @@ struct netxen_adapter { 
	spinlock_t tx_lock;

	spinlock_t lock;

	struct work_struct watchdog_task;

	struct work_struct tx_timeout_task;

	struct net_device *netdev;

	struct timer_list watchdog_timer;



	u32 curr_window;
@@ -949,6 +947,7 @@ struct netxen_port { 
	struct pci_dev *pdev;

	struct net_device_stats net_stats;

	struct netxen_port_stats stats;

	struct work_struct tx_timeout_task;

};



#define PCI_OFFSET_FIRST_RANGE(adapter, off)    \

drivers/net/netxen/netxen_nic_init.c

+1 −1
Original line number Diff line number Diff line
@@ -1023,7 +1023,7 @@ int netxen_process_cmd_ring(unsigned long data) 
			     && netif_carrier_ok(port->netdev))

		    && ((jiffies - port->netdev->trans_start) >

			port->netdev->watchdog_timeo)) {

			SCHEDULE_WORK(&port->adapter->tx_timeout_task);

			SCHEDULE_WORK(&port->tx_timeout_task);

		}



		last_consumer = get_next_index(last_consumer,

drivers/net/netxen/netxen_nic_main.c

+7 −8
Original line number Diff line number Diff line
@@ -424,8 +424,7 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
							     netdev->dev_addr);

			}

		}

		adapter->netdev = netdev;

		INIT_WORK(&adapter->tx_timeout_task, netxen_tx_timeout_task);

		INIT_WORK(&port->tx_timeout_task, netxen_tx_timeout_task);

		netif_carrier_off(netdev);

		netif_stop_queue(netdev);
@@ -966,23 +965,23 @@ static void netxen_tx_timeout(struct net_device *netdev) 
{

	struct netxen_port *port = (struct netxen_port *)netdev_priv(netdev);



	SCHEDULE_WORK(&port->adapter->tx_timeout_task);

	SCHEDULE_WORK(&port->tx_timeout_task);

}



static void netxen_tx_timeout_task(struct work_struct *work)

{

	struct netxen_adapter *adapter =

		container_of(work, struct netxen_adapter, tx_timeout_task);

	struct net_device *netdev = adapter->netdev;

	struct netxen_port *port =

		container_of(work, struct netxen_port, tx_timeout_task);

	struct net_device *netdev = port->netdev;

	unsigned long flags;



	printk(KERN_ERR "%s %s: transmit timeout, resetting.\n",

	       netxen_nic_driver_name, netdev->name);



	spin_lock_irqsave(&adapter->lock, flags);

	spin_lock_irqsave(&port->adapter->lock, flags);

	netxen_nic_close(netdev);

	netxen_nic_open(netdev);

	spin_unlock_irqrestore(&adapter->lock, flags);

	spin_unlock_irqrestore(&port->adapter->lock, flags);

	netdev->trans_start = jiffies;

	netif_wake_queue(netdev);

}