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 git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
drivers
/
net
/
eepro.c
diff --git
a/drivers/net/eepro.c
b/drivers/net/eepro.c
index
eed65d8
..
8d97f16
100644
(file)
--- a/
drivers/net/eepro.c
+++ b/
drivers/net/eepro.c
@@
-1161,8
+1161,7
@@
static netdev_tx_t eepro_send_packet(struct sk_buff *skb,
/* we won't wake queue here because we're out of space */
dev->stats.tx_dropped++;
else {
- dev->stats.tx_bytes+=skb->len;
- dev->trans_start = jiffies;
+ dev->stats.tx_bytes+=skb->len;
netif_wake_queue(dev);
}