diff options
Diffstat (limited to 'drivers/net/ethernet/tile/tilegx.c')
-rw-r--r-- | drivers/net/ethernet/tile/tilegx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/tile/tilegx.c b/drivers/net/ethernet/tile/tilegx.c index 0a15acc075b3..11213a38c795 100644 --- a/drivers/net/ethernet/tile/tilegx.c +++ b/drivers/net/ethernet/tile/tilegx.c | |||
@@ -462,7 +462,7 @@ static void tile_tx_timestamp(struct sk_buff *skb, int instance) | |||
462 | if (unlikely((shtx->tx_flags & SKBTX_HW_TSTAMP) != 0)) { | 462 | if (unlikely((shtx->tx_flags & SKBTX_HW_TSTAMP) != 0)) { |
463 | struct mpipe_data *md = &mpipe_data[instance]; | 463 | struct mpipe_data *md = &mpipe_data[instance]; |
464 | struct skb_shared_hwtstamps shhwtstamps; | 464 | struct skb_shared_hwtstamps shhwtstamps; |
465 | struct timespec ts; | 465 | struct timespec64 ts; |
466 | 466 | ||
467 | shtx->tx_flags |= SKBTX_IN_PROGRESS; | 467 | shtx->tx_flags |= SKBTX_IN_PROGRESS; |
468 | gxio_mpipe_get_timestamp(&md->context, &ts); | 468 | gxio_mpipe_get_timestamp(&md->context, &ts); |
@@ -886,9 +886,9 @@ static struct ptp_clock_info ptp_mpipe_caps = { | |||
886 | /* Sync mPIPE's timestamp up with Linux system time and register PTP clock. */ | 886 | /* Sync mPIPE's timestamp up with Linux system time and register PTP clock. */ |
887 | static void register_ptp_clock(struct net_device *dev, struct mpipe_data *md) | 887 | static void register_ptp_clock(struct net_device *dev, struct mpipe_data *md) |
888 | { | 888 | { |
889 | struct timespec ts; | 889 | struct timespec64 ts; |
890 | 890 | ||
891 | getnstimeofday(&ts); | 891 | ktime_get_ts64(&ts); |
892 | gxio_mpipe_set_timestamp(&md->context, &ts); | 892 | gxio_mpipe_set_timestamp(&md->context, &ts); |
893 | 893 | ||
894 | mutex_init(&md->ptp_lock); | 894 | mutex_init(&md->ptp_lock); |