ixgbe: Update ptp_overflow check comment and jiffies
authorJacob Keller <jacob.e.keller@intel.com>
Wed, 5 Dec 2012 07:24:35 +0000 (07:24 +0000)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Wed, 23 Jan 2013 22:32:57 +0000 (14:32 -0800)
This patch fixes the comment on ptp_overflow_check to match up with what is
currently used as the parameters. Also change the jiffies check to use
time_is_after_jiffies macro.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c

index 1a751c9d09c47f319e45d76a9c2bbad8573016d3..2e54e0ca8d3fafc08e28b518d7340cbb661803d0 100644 (file)
@@ -407,21 +407,21 @@ void ixgbe_ptp_check_pps_event(struct ixgbe_adapter *adapter, u32 eicr)
 
 
 /**
- * ixgbe_ptp_overflow_check - delayed work to detect SYSTIME overflow
- * @work: structure containing information about this work task
+ * ixgbe_ptp_overflow_check - watchdog task to detect SYSTIME overflow
+ * @adapter: private adapter struct
  *
- * this work function is scheduled to continue reading the timecounter
+ * this watchdog task periodically reads the timecounter
  * in order to prevent missing when the system time registers wrap
- * around. This needs to be run approximately twice a minute when no
- * PTP activity is occurring.
+ * around. This needs to be run approximately twice a minute.
  */
 void ixgbe_ptp_overflow_check(struct ixgbe_adapter *adapter)
 {
-       unsigned long elapsed_jiffies = adapter->last_overflow_check - jiffies;
+       bool timeout = time_is_before_jiffies(adapter->last_overflow_check +
+                                            IXGBE_OVERFLOW_PERIOD);
        struct timespec ts;
 
        if ((adapter->flags2 & IXGBE_FLAG2_PTP_ENABLED) &&
-           (elapsed_jiffies >= IXGBE_OVERFLOW_PERIOD)) {
+           (timeout)) {
                ixgbe_ptp_gettime(&adapter->ptp_caps, &ts);
                adapter->last_overflow_check = jiffies;
        }