Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0bfdcc88 authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[netdrvr] netxen: workqueue-related build fixes

parent f1ff0fdc

drivers/net/netxen/netxen_nic_init.c

+1 −2
Original line number Diff line number Diff line
@@ -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,

drivers/net/netxen/netxen_nic_main.c

+1 −1
Original line number Diff line number Diff line
@@ -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)