From ea980c16e27c59ba0cbd397544d61861efef7c39 Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Thu, 7 Dec 2006 06:30:07 -0500 Subject: [PATCH] --- yaml --- r: 43242 b: refs/heads/master c: 0bfdcc88df969af8de087d0fdddf8c0efa76b4b0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/netxen/netxen_nic_init.c | 3 +-- trunk/drivers/net/netxen/netxen_nic_main.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 442d557f9bc1..0ad398847846 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f1ff0fdc353ca00ff43b7b039944b8070da22242 +refs/heads/master: 0bfdcc88df969af8de087d0fdddf8c0efa76b4b0 diff --git a/trunk/drivers/net/netxen/netxen_nic_init.c b/trunk/drivers/net/netxen/netxen_nic_init.c index 290145ec08e7..869725f0bb18 100644 --- a/trunk/drivers/net/netxen/netxen_nic_init.c +++ b/trunk/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/trunk/drivers/net/netxen/netxen_nic_main.c b/trunk/drivers/net/netxen/netxen_nic_main.c index 913e8147114f..575b71b67202 100644 --- a/trunk/drivers/net/netxen/netxen_nic_main.c +++ b/trunk/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)