Skip to content

Commit

Permalink
net: ixgbe: convert to timecounter adjtime.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Richard Cochran authored and David S. Miller committed Dec 30, 2014
1 parent 5ee698e commit 826ef90
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 826ef90

Please sign in to comment.