[Gc-linux-cvs] linux/drivers/net gc-net.c,1.20,1.21

[<ham...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/net
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21630/linux/drivers/net

Modified Files:
	gc-net.c 
Log Message:
added timeout for TX lock


Index: gc-net.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/net/gc-net.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- gc-net.c	29 Feb 2004 08:36:29 -0000	1.20
+++ gc-net.c	1 Mar 2004 09:05:17 -0000	1.21
@@ -22,6 +22,9 @@
  * $Id$
  *
  * $Log$
+ * Revision 1.21  2004/03/01 09:05:17  hamtitampti
+ * added timeout for TX lock
+ *
  * Revision 1.20  2004/02/29 08:36:29  hamtitampti
  * improofed internal structure, read comment in file
  *
@@ -543,6 +546,8 @@
 	netif_stop_queue(dev);	
 		
 	if (priv->tx_lock) {
+		if ((dev->trans_start + 2*HZ)< jiffies) priv->tx_lock = 0;
+		
 		priv->stats.tx_dropped++;
 		udelay(1000);
 		netif_wake_queue(dev);