Merge branch 'fortglx/3.10/time' of git://git.linaro.org/people/jstultz/linux into timers/core

1 files changed, 2 insertions, 0 deletions

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index d8926c303629..39f186252e02 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -218,6 +218,7 @@ static int uml_net_start_xmit(struct sk_buff *skb, struct net_device *dev)
         spin_lock_irqsave(&lp->lock, flags);
 
         len = (*lp->write)(lp->fd, skb, lp);
+        skb_tx_timestamp(skb);
 
         if (len == skb->len) {
                 dev->stats.tx_packets++;
@@ -281,6 +282,7 @@ static void uml_net_get_drvinfo(struct net_device *dev,
 static const struct ethtool_ops uml_net_ethtool_ops = {
         .get_drvinfo    = uml_net_get_drvinfo,
         .get_link       = ethtool_op_get_link,
+        .get_ts_info    = ethtool_op_get_ts_info,
 };
 
 static void uml_net_user_timer_expire(unsigned long _conn)