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 'ixp4xx' of git://git.kernel.org/pub/scm/linux/kernel/git/chris/linux-2.6
[pandora-kernel.git]
/
drivers
/
net
/
wan
/
ixp4xx_hss.c
diff --git
a/drivers/net/wan/ixp4xx_hss.c
b/drivers/net/wan/ixp4xx_hss.c
index
31b0b4d
..
6c571e1
100644
(file)
--- a/
drivers/net/wan/ixp4xx_hss.c
+++ b/
drivers/net/wan/ixp4xx_hss.c
@@
-891,7
+891,6
@@
static int hss_hdlc_xmit(struct sk_buff *skb, struct net_device *dev)
wmb();
queue_put_desc(queue_ids[port->id].tx, tx_desc_phys(port, n), desc);
- dev->trans_start = jiffies;
if (qmgr_stat_below_low_watermark(txreadyq)) { /* empty */
#if DEBUG_TX