Commit a9836cbb authored by Arnd Bergmann's avatar Arnd Bergmann Committed by David S. Miller

net: tilegx: use correct timespec64 type

The conversion to the 64-bit time based ptp methods left two instances
of 'struct timespec' in place. This is harmless because 64-bit
architectures define timespec64 as timespec, and this driver is
not used on 32-bit machines.

However, using 'struct timespec64' directly is obviously the right
thing to do, and will help us remove 'struct timespec' in the future.
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Fixes: b9acf24f ("ptp: tilegx: convert to the 64 bit get/set time methods.")
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b47ac27a
...@@ -462,7 +462,7 @@ static void tile_tx_timestamp(struct sk_buff *skb, int instance) ...@@ -462,7 +462,7 @@ static void tile_tx_timestamp(struct sk_buff *skb, int instance)
if (unlikely((shtx->tx_flags & SKBTX_HW_TSTAMP) != 0)) { if (unlikely((shtx->tx_flags & SKBTX_HW_TSTAMP) != 0)) {
struct mpipe_data *md = &mpipe_data[instance]; struct mpipe_data *md = &mpipe_data[instance];
struct skb_shared_hwtstamps shhwtstamps; struct skb_shared_hwtstamps shhwtstamps;
struct timespec ts; struct timespec64 ts;
shtx->tx_flags |= SKBTX_IN_PROGRESS; shtx->tx_flags |= SKBTX_IN_PROGRESS;
gxio_mpipe_get_timestamp(&md->context, &ts); gxio_mpipe_get_timestamp(&md->context, &ts);
...@@ -886,9 +886,9 @@ static struct ptp_clock_info ptp_mpipe_caps = { ...@@ -886,9 +886,9 @@ static struct ptp_clock_info ptp_mpipe_caps = {
/* Sync mPIPE's timestamp up with Linux system time and register PTP clock. */ /* Sync mPIPE's timestamp up with Linux system time and register PTP clock. */
static void register_ptp_clock(struct net_device *dev, struct mpipe_data *md) static void register_ptp_clock(struct net_device *dev, struct mpipe_data *md)
{ {
struct timespec ts; struct timespec64 ts;
getnstimeofday(&ts); ktime_get_ts64(&ts);
gxio_mpipe_set_timestamp(&md->context, &ts); gxio_mpipe_set_timestamp(&md->context, &ts);
mutex_init(&md->ptp_lock); mutex_init(&md->ptp_lock);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment