patch-2.4.2 linux/drivers/net/skfp/skfddi.c
Next file: linux/drivers/net/slip.c
Previous file: linux/drivers/net/sk_mca.c
Back to the patch index
Back to the overall index
- Lines: 25
- Date:
Tue Feb 13 13:15:05 2001
- Orig file:
v2.4.1/linux/drivers/net/skfp/skfddi.c
- Orig date:
Thu Oct 12 14:19:32 2000
diff -u --recursive --new-file v2.4.1/linux/drivers/net/skfp/skfddi.c linux/drivers/net/skfp/skfddi.c
@@ -84,7 +84,7 @@
#include <linux/ptrace.h>
#include <linux/errno.h>
#include <linux/ioport.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
#include <linux/interrupt.h>
#include <linux/pci.h>
#include <linux/delay.h>
@@ -1958,6 +1958,7 @@
skb->dev = bp->dev; /* pass up device pointer */
netif_rx(skb);
+ bp->dev->last_rx = jiffies;
HWM_RX_CHECK(smc, RX_LOW_WATERMARK);
return;
@@ -2215,6 +2216,7 @@
// deliver frame to system
skb->protocol = fddi_type_trans(skb, ((skfddi_priv *) & smc->os)->dev);
+ skb->dev->last_rx = jiffies;
netif_rx(skb);
return (0);
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)