[LV-kern-commit] CVS: kernel-2.4/drivers/net vaxlance.c,1.6,1.7

[Dave A. <ai...@us...>]

Update of /cvsroot/linux-vax/kernel-2.4/drivers/net
In directory usw-pr-cvs1:/tmp/cvs-serv25606/drivers/net

Modified Files:
	vaxlance.c 
Log Message:
bring up 2.4.2 level


Index: vaxlance.c
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.4/drivers/net/vaxlance.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- vaxlance.c	2001/02/22 23:24:29	1.6
+++ vaxlance.c	2001/02/26 18:11:26	1.7
@@ -39,6 +39,7 @@
 #include <linux/string.h>
 #include <linux/unistd.h>
 #include <linux/ptrace.h>
+#include <linux/slab.h>
 #include <linux/malloc.h>
 #include <linux/user.h>
 #include <linux/utsname.h>
@@ -485,6 +486,7 @@
 					 len);
 			skb->protocol = eth_type_trans(skb, dev);
 			netif_rx(skb);
+			dev->last_rx=jiffies;
 			lp->stats.rx_packets++;
 		}
 
@@ -1051,20 +1053,21 @@
 	  #endif
 	*/
 #endif
-	/*
+
+#if 0
+	  vsbus_enable_int(lp->vsbus_int);
 	  writereg(&ll->rap, LE_CSR0);
 	  writereg(&ll->rdp, LE_C0_STOP);
 	  lp->busmaster_regval=0;
 	  lance_init_ring(dev);
 	  
-	  dev->tbusy = 0;
-	  dev->interrupt = 0;
-	  dev->start = 1;
+	  netif_start_queue(dev);
 	  load_csrs(lp);
 	  init_restart_lance(lp);
-	*/
+
 	/* I'll try fecking something out from the card here soon - D.A. */
-	/*       	vax_lance_test_xmit(dev);*/
+	    	vax_lance_test_xmit(dev);
+#endif
 	return 0;
 
 err_out:
@@ -1119,7 +1122,7 @@
 unsigned char tx_block[30];
 
 #if 0
-static int vax_lance_test_xmit(struct device *dev)
+static int vax_lance_test_xmit(struct net_device *dev)
 {
   struct lance_private *lp = (struct lance_private *) dev->priv;
   volatile struct lance_regs *ll = lp->ll;
@@ -1139,11 +1142,6 @@
   skblen = 16;
   save_flags(flags);
   cli();
-  if (!TX_BUFFS_AVAIL) {
-    restore_flags(flags);
-    printk("Return TX_BUF_AVAIL\n");
-    return -1;
-  }
   len = (skblen <= ETH_ZLEN) ? ETH_ZLEN : skblen;
   
   lp->stats.tx_bytes += len;
@@ -1162,8 +1160,8 @@
   writereg(&ll->rdp, LE_C0_INEA | LE_C0_TDMD);
   dev->trans_start = jiffies;
   
-  if (TX_BUFFS_AVAIL)
-    dev->tbusy = 0;
+  if (TX_BUFFS_AVAIL<=0)
+	netif_stop_queue(dev);
   
   restore_flags(flags);
   return status;