patch-2.4.2 linux/drivers/net/appletalk/cops.c

• Lines: 28
• Date: Tue Feb 13 13:15:05 2001
• Orig file: v2.4.1/linux/drivers/net/appletalk/cops.c
• Orig date: Sat Dec 30 11:23:13 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/net/appletalk/cops.c linux/drivers/net/appletalk/cops.c
@@ -16,7 +16,7 @@
  *      Director, National Security Agency.
  *
  *      This software may be used and distributed according to the terms
- *      of the GNU Public License, incorporated herein by reference.
+ *      of the GNU General Public License, incorporated herein by reference.
  *
  *	Changes:
  *	19970608	Alan Cox	Allowed dual card type support
@@ -59,7 +59,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 <asm/system.h>
 #include <asm/bitops.h>
@@ -851,8 +851,7 @@
 
         /* Send packet to a higher place. */
         netif_rx(skb);
-
-        return;
+	dev->last_rx = jiffies;
 }
 
 static void cops_timeout(struct net_device *dev)