]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[netdrvr] netxen: workqueue-related build fixes
authorJeff Garzik <jeff@garzik.org>
Thu, 7 Dec 2006 11:30:07 +0000 (06:30 -0500)
committerJeff Garzik <jeff@garzik.org>
Thu, 7 Dec 2006 11:30:07 +0000 (06:30 -0500)
drivers/net/netxen/netxen_nic_init.c
drivers/net/netxen/netxen_nic_main.c

index 290145ec08e7b12e89ed4225bc070771db2473ae..869725f0bb1861cda3e726664c7e3c23f9e7b507 100644 (file)
@@ -1023,8 +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
-                                     + port->portnum);
+                       SCHEDULE_WORK(&port->adapter->tx_timeout_task);
                }
 
                last_consumer = get_next_index(last_consumer,
index 913e8147114fb466c0f7818cf98e0f79aee945ff..575b71b672028e4896cc347efe76cbb2a3ef7103 100644 (file)
@@ -969,7 +969,7 @@ 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 + port->portnum);
+       SCHEDULE_WORK(&port->adapter->tx_timeout_task);
 }
 
 static void netxen_tx_timeout_task(struct work_struct *work)