diff options
| author | Richard Cochran <richardcochran@gmail.com> | 2014-12-21 19:47:04 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-12-30 18:29:27 -0500 |
| commit | ce51ff0937bd5596aeafd67f5a60d36016d5e040 (patch) | |
| tree | f77d22a7bfc6f0632393892cab048f5f59847a15 /drivers/net/ethernet/mellanox/mlx4/en_clock.c | |
| parent | 826ef90dc4727c9f9cd999c830023e54d9ea3f58 (diff) | |
| download | op-kernel-dev-ce51ff0937bd5596aeafd67f5a60d36016d5e040.zip op-kernel-dev-ce51ff0937bd5596aeafd67f5a60d36016d5e040.tar.gz | |
net: mlx4: convert to timecounter adjtime.
This patch changes the driver to use the new and improved method
for adjusting the offset of a timecounter.
Compile tested only.
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/en_clock.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_clock.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_clock.c b/drivers/net/ethernet/mellanox/mlx4/en_clock.c index 9990144..df35d0e 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_clock.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_clock.c @@ -147,12 +147,9 @@ static int mlx4_en_phc_adjtime(struct ptp_clock_info *ptp, s64 delta) struct mlx4_en_dev *mdev = container_of(ptp, struct mlx4_en_dev, ptp_clock_info); unsigned long flags; - s64 now; write_lock_irqsave(&mdev->clock_lock, flags); - now = timecounter_read(&mdev->clock); - now += delta; - timecounter_init(&mdev->clock, &mdev->cycles, now); + timecounter_adjtime(&mdev->clock, delta); write_unlock_irqrestore(&mdev->clock_lock, flags); return 0; |
