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 linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sun, 21 Dec 2014 19:47:01 +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 06/11] net: e1000e: convert to timecounter adjtime. This patch changes the driver to use the new and improved method for adjusting the offset of a timecounter. Signed-off-by: Richard Cochran <richardcochran@...il.com> --- drivers/net/ethernet/intel/e1000e/ptp.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/ethernet/intel/e1000e/ptp.c b/drivers/net/ethernet/intel/e1000e/ptp.c index fb1a914..978ef9c 100644 --- a/drivers/net/ethernet/intel/e1000e/ptp.c +++ b/drivers/net/ethernet/intel/e1000e/ptp.c @@ -90,12 +90,9 @@ static int e1000e_phc_adjtime(struct ptp_clock_info *ptp, s64 delta) struct e1000_adapter *adapter = container_of(ptp, struct e1000_adapter, ptp_clock_info); unsigned long flags; - s64 now; spin_lock_irqsave(&adapter->systim_lock, flags); - now = timecounter_read(&adapter->tc); - now += delta; - timecounter_init(&adapter->tc, &adapter->cc, now); + timecounter_adjtime(&adapter->tc, delta); spin_unlock_irqrestore(&adapter->systim_lock, flags); return 0; -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists