diff options
| author |   Harini Katakam <harini.katakam@xilinx.com> | 2018-06-20 17:04:20 +0530 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-06-21 15:01:06 +0900 |
| commit | 64d7839af8c8f67daaf9bf387135052c55d85f90 (patch) | |
| tree | 7d59de6ffe0b966393e97ad77dff7944c9b158e5 /drivers/net/ethernet/cadence | |
| parent | ipvlan: fix IFLA_MTU ignored on NEWLINK (diff) | |
| download | linux-dev-64d7839af8c8f67daaf9bf387135052c55d85f90.tar.xz linux-dev-64d7839af8c8f67daaf9bf387135052c55d85f90.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/cadence')
| -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); |