summaryrefslogtreecommitdiffstats
path: root/arch/um/drivers
diff options
context:
space:
mode:
authorPaul Chavent <Paul.Chavent@onera.fr>2012-12-06 16:25:05 +0100
committerRichard Weinberger <richard@nod.at>2013-03-11 10:08:02 +0100
commit55ea1cfab24e37a347f1beae9f0b6724cad18f6b (patch)
treefceb7b8b631c112aa31fe099fa438ce958be5c47 /arch/um/drivers
parentbc077320f8f6449197f4010d6774afab7bb998b2 (diff)
downloadlinux-stable-55ea1cfab24e37a347f1beae9f0b6724cad18f6b.tar.gz
linux-stable-55ea1cfab24e37a347f1beae9f0b6724cad18f6b.tar.bz2
linux-stable-55ea1cfab24e37a347f1beae9f0b6724cad18f6b.zip
net : enable tx time stamping in the vde driver.
This new version moves the skb_tx_timestamp in the main uml driver. This should avoid the need to call this function in each transport (vde, slirp, tuntap, ...). It also add support for ethtool get_ts_info. Signed-off-by: Paul Chavent <paul.chavent@onera.fr> Acked-by: Richard Cochran <richardcochran@gmail.com> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/drivers')
-rw-r--r--arch/um/drivers/net_kern.c2
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)