patch-2.3.47 linux/drivers/net/skeleton.c

Next file: linux/drivers/net/skfp/Makefile
Previous file: linux/drivers/net/sk98lin/skge.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.46/linux/drivers/net/skeleton.c linux/drivers/net/skeleton.c
@@ -416,7 +416,7 @@
 	spin_lock_irq(&np->lock);
 
 	add_to_tx_ring(np, skb, length);
-	dev->trans_start = jiffied;
+	dev->trans_start = jiffies;
 
 	/* If we just used up the very last entry in the
 	 * TX ring on this device, tell the queueing
@@ -482,8 +482,7 @@
 	 * condition, and space has now been made available,
 	 * wake up the queue.
 	 */
-	if (test_bit(LINK_STATE_XOFF, &dev->state) &&
-	    ! tx_full(dev))
+	if (netif_queue_stopped(dev) && ! tx_full(dev))
 		netif_wake_queue(dev);
 
 	spin_unlock(&np->lock);

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)