diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-07-12 23:19:58 +0300 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-07-12 23:19:58 +0300 |
| commit | c6bb11147eb09bd39f316c6062455b88c905ab6e (patch) | |
| tree | 5a1a6ec2970daef5fa8546741ced3ef3924bf807 /drivers/net/ethernet/cadence/macb_ptp.c | |
| parent | a8802d97e73346bc81609df9dfba7d3306f40d87 (diff) | |
| parent | b061c7a513afe14a68af41cec7c3476befc40e95 (diff) | |
| download | linux-c6bb11147eb09bd39f316c6062455b88c905ab6e.tar.xz | |
Merge branch 'fortglx/4.19/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
Pull timekeeping updates from John Stultz:
- Make the timekeeping update more precise when NTP frequency is set
directly by updating the multiplier.
- Adjust selftests
Diffstat (limited to 'drivers/net/ethernet/cadence/macb_ptp.c')
| -rw-r--r-- | drivers/net/ethernet/cadence/macb_ptp.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/cadence/macb_ptp.c b/drivers/net/ethernet/cadence/macb_ptp.c index 2220c771092b..678835136bf8 100644 --- a/drivers/net/ethernet/cadence/macb_ptp.c +++ b/drivers/net/ethernet/cadence/macb_ptp.c @@ -170,10 +170,7 @@ static int gem_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta) if (delta > TSU_NSEC_MAX_VAL) { gem_tsu_get_time(&bp->ptp_clock_info, &now); - if (sign) - now = timespec64_sub(now, then); - else - now = timespec64_add(now, then); + now = timespec64_add(now, then); gem_tsu_set_time(&bp->ptp_clock_info, (const struct timespec64 *)&now); |