diff options
Diffstat (limited to 'drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c')
| -rw-r--r-- | drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c | 13 | 
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c index 5fd4b5271f9a..79c00f57d3e7 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); @@ -802,7 +793,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter)  	memset(&adapter->cc, 0, sizeof(adapter->cc));  	adapter->cc.read = ixgbe_ptp_read; -	adapter->cc.mask = CLOCKSOURCE_MASK(64); +	adapter->cc.mask = CYCLECOUNTER_MASK(64);  	adapter->cc.shift = shift;  	adapter->cc.mult = 1;  | 

