Message ID | 1354807505-21222-1-git-send-email-paul.chavent@onera.fr |
---|---|
State | Not Applicable, archived |
Delegated to: | David Miller |
Headers | show |
On Thu, Dec 06, 2012 at 04:25:05PM +0100, Paul Chavent wrote: > 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> -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Richard Cochran <richardcochran@gmail.com> schrieb: >On Thu, Dec 06, 2012 at 04:25:05PM +0100, Paul Chavent wrote: >> 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> Queued for 3.8. Thanks, //richard -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c index b1314eb..5aa8696 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_timestampns(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)
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> --- arch/um/drivers/net_kern.c | 2 ++ 1 file changed, 2 insertions(+)