]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
can: peak_usb: fix hwtstamp assignment
authorOliver Hartkopp <socketcan@hartkopp.net>
Wed, 21 Nov 2012 21:43:59 +0000 (22:43 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 3 Dec 2012 19:38:00 +0000 (11:38 -0800)
commit4735a28cf102492dde4c036f74b0c2d8318ed004
treef11dba8dbcec91d43d053b5013ff26e2ac9d757d
parent0314f284eb000d55ccbac67a9b1fce4912d86937
can: peak_usb: fix hwtstamp assignment

commit c9faaa09e2a1335678f09c70a0d0eda095564bab upstream.

The skb->tstamp is set to the hardware timestamp when available in the USB
urb message. This leads to user visible timestamps which contain the 'uptime'
of the USB adapter - and not the usual system generated timestamp.

Fix this wrong assignment by applying the available hardware timestamp to the
skb_shared_hwtstamps data structure - which is intended for this purpose.

Signed-off-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/net/can/usb/peak_usb/pcan_usb.c
drivers/net/can/usb/peak_usb/pcan_usb_pro.c