diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2011-07-25 13:59:46 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2011-07-25 14:53:52 -0400 |
| commit | 5f00bcb38ef9a980a33c6dbdc0044964b05f22dd (patch) | |
| tree | 3175fb9375aecb50bde1be0bf4fa8aa8155131d6 /drivers/net/ethoc.c | |
| parent | 34006cee28f7344f9557a4be3816c7891b1bbab1 (diff) | |
| parent | b6844e8f64920cdee620157252169ba63afb0c89 (diff) | |
Merge branch 'master' into devel and apply fixup from Stephen Rothwell:
vfs/nfs: fixup for nfs_open_context change
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'drivers/net/ethoc.c')
| -rw-r--r-- | drivers/net/ethoc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/ethoc.c b/drivers/net/ethoc.c index a83dd312c3a..0da6295d9da 100644 --- a/drivers/net/ethoc.c +++ b/drivers/net/ethoc.c @@ -11,8 +11,10 @@ * Written by Thierry Reding <thierry.reding@avionic-design.de> */ +#include <linux/dma-mapping.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> @@ -874,6 +876,7 @@ static netdev_tx_t ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev) } spin_unlock_irq(&priv->lock); + skb_tx_timestamp(skb); out: dev_kfree_skb(skb); return NETDEV_TX_OK; |