git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6
[safe/jmp/linux-2.6]
/
drivers
/
net
/
wireless
/
libertas
/
tx.c
diff --git
a/drivers/net/wireless/libertas/tx.c
b/drivers/net/wireless/libertas/tx.c
index
52d244e
..
a9bf658
100644
(file)
--- a/
drivers/net/wireless/libertas/tx.c
+++ b/
drivers/net/wireless/libertas/tx.c
@@
-147,8
+147,6
@@
netdev_tx_t lbs_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
dev->stats.tx_packets++;
dev->stats.tx_bytes += skb->len;
- dev->trans_start = jiffies;
-
if (priv->monitormode) {
/* Keep the skb to echo it back once Tx feedback is
received from FW */