mirror of
https://github.com/torvalds/linux
synced 2024-09-16 00:58:07 +00:00
net: macb: Fix ptp time adjustment for large negative delta
When delta passed to gem_ptp_adjtime is negative, the sign is maintained in the ns_to_timespec64 conversion. Hence timespec_add should be used directly. timespec_sub will just subtract the negative value thus increasing the time difference. Signed-off-by: Harini Katakam <harini.katakam@xilinx.com> Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
30877961b1
commit
64d7839af8
|
@ -170,10 +170,7 @@ static int gem_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta)
|
||||||
|
|
||||||
if (delta > TSU_NSEC_MAX_VAL) {
|
if (delta > TSU_NSEC_MAX_VAL) {
|
||||||
gem_tsu_get_time(&bp->ptp_clock_info, &now);
|
gem_tsu_get_time(&bp->ptp_clock_info, &now);
|
||||||
if (sign)
|
now = timespec64_add(now, then);
|
||||||
now = timespec64_sub(now, then);
|
|
||||||
else
|
|
||||||
now = timespec64_add(now, then);
|
|
||||||
|
|
||||||
gem_tsu_set_time(&bp->ptp_clock_info,
|
gem_tsu_set_time(&bp->ptp_clock_info,
|
||||||
(const struct timespec64 *)&now);
|
(const struct timespec64 *)&now);
|
||||||
|
|
Loading…
Reference in a new issue