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:02 +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 07/11] net: igb: 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/igb/igb_ptp.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/net/ethernet/intel/igb/igb_ptp.c b/drivers/net/ethernet/intel/igb/igb_ptp.c index 794c139..1d27f2d 100644 --- a/drivers/net/ethernet/intel/igb/igb_ptp.c +++ b/drivers/net/ethernet/intel/igb/igb_ptp.c @@ -256,14 +256,9 @@ static int igb_ptp_adjtime_82576(struct ptp_clock_info *ptp, s64 delta) struct igb_adapter *igb = container_of(ptp, struct igb_adapter, ptp_caps); unsigned long flags; - s64 now; spin_lock_irqsave(&igb->tmreg_lock, flags); - - now = timecounter_read(&igb->tc); - now += delta; - timecounter_init(&igb->tc, &igb->cc, now); - + timecounter_adjtime(&igb->tc, delta); spin_unlock_irqrestore(&igb->tmreg_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