patch-2.4.2 linux/drivers/net/myri_sbus.c

Next file: linux/drivers/net/natsemi.c
Previous file: linux/drivers/net/mvme147.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.4.1/linux/drivers/net/myri_sbus.c linux/drivers/net/myri_sbus.c
@@ -17,7 +17,7 @@
 #include <linux/ptrace.h>
 #include <linux/ioport.h>
 #include <linux/in.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -531,7 +531,9 @@
 		DRX(("prot[%04x] netif_rx ", skb->protocol));
 		netif_rx(skb);
 
+		dev->last_rx = jiffies;
 		mp->enet_stats.rx_packets++;
+		mp->enet_stats.rx_bytes += len;
 	next:
 		DRX(("NEXT\n"));
 		entry = NEXT_RX(entry);
@@ -592,7 +594,7 @@
 
 	mp->enet_stats.tx_errors++;
 	myri_init(mp, 0);
-	netif_start_queue(dev);
+	netif_wake_queue(dev);
 }
 
 static int myri_start_xmit(struct sk_buff *skb, struct net_device *dev)

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