aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic.h
diff options
context:
space:
mode:
authorAmit S. Kale <amitkale@netxen.com>2006-12-18 08:53:36 -0500
committerJeff Garzik <jeff@garzik.org>2006-12-26 16:46:05 -0500
commit6c5866441669ab71f6297556ea281a6bcbfd13db (patch)
tree6deccde9df7c483d8c2a0172b3a45b76d836c249 /drivers/net/netxen/netxen_nic.h
parentd2378e89720f364ccf3a57b26f1827923d3464f2 (diff)
NetXen: work queue fixes.
Signed-off-by: Amit 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: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/netxen/netxen_nic.h')
-rw-r--r--drivers/net/netxen/netxen_nic.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 421a07425442..86dcd52683da 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -852,8 +852,6 @@ struct netxen_adapter {
852 spinlock_t tx_lock; 852 spinlock_t tx_lock;
853 spinlock_t lock; 853 spinlock_t lock;
854 struct work_struct watchdog_task; 854 struct work_struct watchdog_task;
855 struct work_struct tx_timeout_task;
856 struct net_device *netdev;
857 struct timer_list watchdog_timer; 855 struct timer_list watchdog_timer;
858 856
859 u32 curr_window; 857 u32 curr_window;
@@ -949,6 +947,7 @@ struct netxen_port {
949 struct pci_dev *pdev; 947 struct pci_dev *pdev;
950 struct net_device_stats net_stats; 948 struct net_device_stats net_stats;
951 struct netxen_port_stats stats; 949 struct netxen_port_stats stats;
950 struct work_struct tx_timeout_task;
952}; 951};
953 952
954#define PCI_OFFSET_FIRST_RANGE(adapter, off) \ 953#define PCI_OFFSET_FIRST_RANGE(adapter, off) \