From: Jeff Garzik Date: Thu, 7 Dec 2006 11:30:07 +0000 (-0500) Subject: [netdrvr] netxen: workqueue-related build fixes X-Git-Tag: v2.6.20-rc1~145^2^2~6^2~1 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0bfdcc88df969af8de087d0fdddf8c0efa76b4b0;p=linux-2.6-omap-h63xx.git [netdrvr] netxen: workqueue-related build fixes --- diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index 290145ec08e..869725f0bb1 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) && 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, diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index 913e8147114..575b71b6720 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) { 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)