aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-12-07 06:30:07 -0500
committerJeff Garzik <jeff@garzik.org>2006-12-07 06:30:07 -0500
commit0bfdcc88df969af8de087d0fdddf8c0efa76b4b0 (patch)
treeab43180c2e1cbcd2af9c5eb22ec54eb8e39775c7 /drivers/net/netxen
parentf1ff0fdc353ca00ff43b7b039944b8070da22242 (diff)
[netdrvr] netxen: workqueue-related build fixes
Diffstat (limited to 'drivers/net/netxen')
-rw-r--r--drivers/net/netxen/netxen_nic_init.c3
-rw-r--r--drivers/net/netxen/netxen_nic_main.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 290145ec08e7..869725f0bb18 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -1023,8 +1023,7 @@ int netxen_process_cmd_ring(unsigned long data)
1023 && netif_carrier_ok(port->netdev)) 1023 && netif_carrier_ok(port->netdev))
1024 && ((jiffies - port->netdev->trans_start) > 1024 && ((jiffies - port->netdev->trans_start) >
1025 port->netdev->watchdog_timeo)) { 1025 port->netdev->watchdog_timeo)) {
1026 SCHEDULE_WORK(port->adapter->tx_timeout_task 1026 SCHEDULE_WORK(&port->adapter->tx_timeout_task);
1027 + port->portnum);
1028 } 1027 }
1029 1028
1030 last_consumer = get_next_index(last_consumer, 1029 last_consumer = get_next_index(last_consumer,
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 913e8147114f..575b71b67202 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -969,7 +969,7 @@ static void netxen_tx_timeout(struct net_device *netdev)
969{ 969{
970 struct netxen_port *port = (struct netxen_port *)netdev_priv(netdev); 970 struct netxen_port *port = (struct netxen_port *)netdev_priv(netdev);
971 971
972 SCHEDULE_WORK(port->adapter->tx_timeout_task + port->portnum); 972 SCHEDULE_WORK(&port->adapter->tx_timeout_task);
973} 973}
974 974
975static void netxen_tx_timeout_task(struct work_struct *work) 975static void netxen_tx_timeout_task(struct work_struct *work)