lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 21 Dec 2014 19:47:04 +0100 From: Richard Cochran <richardcochran@...il.com> To: <netdev@...r.kernel.org> Cc: <linux-kernel@...r.kernel.org>, Amir Vadai <amirv@...lanox.com>, Ariel Elior <ariel.elior@...gic.com>, Carolyn Wyborny <carolyn.wyborny@...el.com>, David Miller <davem@...emloft.net>, Frank Li <Frank.Li@...escale.com>, Jeff Kirsher <jeffrey.t.kirsher@...el.com>, John Stultz <john.stultz@...aro.org>, Matthew Vick <matthew.vick@...el.com>, Miroslav Lichvar <mlichvar@...hat.com>, Mugunthan V N <mugunthanvnm@...com>, Or Gerlitz <ogerlitz@...lanox.com>, Thomas Gleixner <tglx@...utronix.de>, Tom Lendacky <thomas.lendacky@....com> Subject: [PATCH net-next 09/11] 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@...il.com> --- drivers/net/ethernet/mellanox/mlx4/en_clock.c | 5 +---- 1 file changed, 1 insertion(+), 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; -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists