Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f389c17b authored by Harini Katakam's avatar Harini Katakam Committed by Greg Kroah-Hartman
Browse files

net: macb: Fix ptp time adjustment for large negative delta 



[ Upstream commit 64d7839af8c8f67daaf9bf387135052c55d85f90 ]

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: default avatarHarini Katakam <harini.katakam@xilinx.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b364a914

drivers/net/ethernet/cadence/macb_ptp.c

+1 −4
Original line number Diff line number Diff line
@@ -170,9 +170,6 @@ 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);



		gem_tsu_set_time(&bp->ptp_clock_info,