git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into perfcounters/core
[pandora-kernel.git]
/
drivers
/
net
/
7990.c
diff --git
a/drivers/net/7990.c
b/drivers/net/7990.c
index
ad6b8a5
..
7a331ac
100644
(file)
--- a/
drivers/net/7990.c
+++ b/
drivers/net/7990.c
@@
-336,7
+336,6
@@
static int lance_rx (struct net_device *dev)
len);
skb->protocol = eth_type_trans (skb, dev);
netif_rx (skb);
len);
skb->protocol = eth_type_trans (skb, dev);
netif_rx (skb);
- dev->last_rx = jiffies;
dev->stats.rx_packets++;
dev->stats.rx_bytes += len;
}
dev->stats.rx_packets++;
dev->stats.rx_bytes += len;
}