diff options
author | Richard Cochran <richardcochran@gmail.com> | 2014-12-21 19:47:03 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-12-30 18:29:27 -0500 |
commit | 826ef90dc4727c9f9cd999c830023e54d9ea3f58 (patch) | |
tree | e4cc069776e1b47261e85876e8517c540165e4b6 /drivers/net/ethernet/intel | |
parent | 5ee698e3677a1af8b731cc891e94be33b6572cfd (diff) | |
download | linux-stable-826ef90dc4727c9f9cd999c830023e54d9ea3f58.tar.gz linux-stable-826ef90dc4727c9f9cd999c830023e54d9ea3f58.tar.bz2 linux-stable-826ef90dc4727c9f9cd999c830023e54d9ea3f58.zip |
net: ixgbe: 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>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel')
-rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c index 5fd4b5271f9a..47c29eaaa140 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c @@ -261,18 +261,9 @@ static int ixgbe_ptp_adjtime(struct ptp_clock_info *ptp, s64 delta) struct ixgbe_adapter *adapter = container_of(ptp, struct ixgbe_adapter, ptp_caps); unsigned long flags; - u64 now; spin_lock_irqsave(&adapter->tmreg_lock, flags); - - now = timecounter_read(&adapter->tc); - now += delta; - - /* reset the timecounter */ - timecounter_init(&adapter->tc, - &adapter->cc, - now); - + timecounter_adjtime(&adapter->tc, delta); spin_unlock_irqrestore(&adapter->tmreg_lock, flags); ixgbe_ptp_setup_sdp(adapter); |