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

• Lines: 25
• Date: Fri Feb 9 11:40:02 2001
• Orig file: v2.4.1/linux/drivers/net/de4x5.c
• Orig date: Wed Nov 8 17:09:50 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/net/de4x5.c linux/drivers/net/de4x5.c
@@ -445,7 +445,7 @@
 #include <linux/ptrace.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -1662,6 +1662,7 @@
 	    STOP_DE4X5;
 	    printk("%s: Fatal bus error occurred, sts=%#8x, device stopped.\n",
 		   dev->name, sts);
+	    spin_unlock(&lp->lock);
 	    return;
 	}
     }
@@ -1733,6 +1734,7 @@
 		    netif_rx(skb);
 		    
 		    /* Update stats */
+		    dev->last_rx = jiffies;
 		    lp->stats.rx_packets++;
  		    lp->stats.rx_bytes += pkt_len;
 		    de4x5_local_stats(dev, skb->data, pkt_len);