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 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind...
[pandora-kernel.git]
/
drivers
/
net
/
atlx
/
atl2.c
diff --git
a/drivers/net/atlx/atl2.c
b/drivers/net/atlx/atl2.c
index
fee9cf6
..
8da8738
100644
(file)
--- a/
drivers/net/atlx/atl2.c
+++ b/
drivers/net/atlx/atl2.c
@@
-892,7
+892,6
@@
static netdev_tx_t atl2_xmit_frame(struct sk_buff *skb,
(adapter->txd_write_ptr >> 2));
mmiowb();
- netdev->trans_start = jiffies;
dev_kfree_skb_any(skb);
return NETDEV_TX_OK;
}