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 'devicetree/next' of git://git.secretlab.ca/git/linux-2.6
[pandora-kernel.git]
/
drivers
/
net
/
ethoc.c
diff --git
a/drivers/net/ethoc.c
b/drivers/net/ethoc.c
index
a83dd31
..
0da6295
100644
(file)
--- a/
drivers/net/ethoc.c
+++ b/
drivers/net/ethoc.c
@@
-11,8
+11,10
@@
* Written by Thierry Reding <thierry.reding@avionic-design.de>
*/
* Written by Thierry Reding <thierry.reding@avionic-design.de>
*/
+#include <linux/dma-mapping.h>
#include <linux/etherdevice.h>
#include <linux/crc32.h>
#include <linux/etherdevice.h>
#include <linux/crc32.h>
+#include <linux/interrupt.h>
#include <linux/io.h>
#include <linux/mii.h>
#include <linux/phy.h>
#include <linux/io.h>
#include <linux/mii.h>
#include <linux/phy.h>
@@
-874,6
+876,7
@@
static netdev_tx_t ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev)
}
spin_unlock_irq(&priv->lock);
}
spin_unlock_irq(&priv->lock);
+ skb_tx_timestamp(skb);
out:
dev_kfree_skb(skb);
return NETDEV_TX_OK;
out:
dev_kfree_skb(skb);
return NETDEV_TX_OK;