From ca3f78a4fae09213fd73cb9a5f8c0a9fad8512f4 Mon Sep 17 00:00:00 2001 From: Paul Chavent Date: Thu, 6 Dec 2012 16:25:05 +0100 Subject: [PATCH] --- yaml --- r: 361029 b: refs/heads/master c: 55ea1cfab24e37a347f1beae9f0b6724cad18f6b h: refs/heads/master i: 361027: a92c89ae9afb2e5651dc2cb71813f8a5c665e73b v: v3 --- [refs] | 2 +- trunk/arch/um/drivers/net_kern.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 0a8efb6364e9..fede4d5a235a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bc077320f8f6449197f4010d6774afab7bb998b2 +refs/heads/master: 55ea1cfab24e37a347f1beae9f0b6724cad18f6b diff --git a/trunk/arch/um/drivers/net_kern.c b/trunk/arch/um/drivers/net_kern.c index d8926c303629..39f186252e02 100644 --- a/trunk/arch/um/drivers/net_kern.c +++ b/trunk/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)