[Madwifi-cvs] revision 3574 committed

[Matthew W. S. B. <svn...@ma...>]

Project     : madwifi
Revision    : 3574
Author      : mentor (Matthew W. S. Bell)
Date        : 2008-04-25 15:40:31 +0200 (Fri, 25 Apr 2008)

Log Message :
Initially set sc_lastcal to now. The previous code set it to INITIAL_JIFFIES 
which is the initial value at _boot_ time not module load time.

Affected Files:
* madwifi/trunk/ath/if_ath.c                          updated             


Modified: madwifi/trunk/ath/if_ath.c
===================================================================
--- madwifi/trunk/ath/if_ath.c	2008-04-24 14:10:42 UTC (rev 3573)
+++ madwifi/trunk/ath/if_ath.c	2008-04-25 13:40:31 UTC (rev 3574)
@@ -791,8 +791,8 @@
 	sc->sc_grpplq.axq_qnum = -1;
 	sc->sc_xrtxq = ath_txq_setup(sc, HAL_TX_QUEUE_DATA, HAL_XR_DATA);
 #endif
-	sc->sc_lastcal = INITIAL_JIFFIES; /* see jiffies.h */
 	sc->sc_calinterval_sec = ATH_SHORT_CALINTERVAL_SECS;
+	sc->sc_lastcal = jiffies;
 
 	/*
 	 * Special case certain configurations.  Note the
@@ -5313,9 +5313,9 @@
 			printk("%s: %s: now=%lu lastcal=%lu expires=%lu remaining=%u ms\n", 
 			       SC_DEV_NAME(sc),
 			       __FUNCTION__,
-			       jiffies - INITIAL_JIFFIES,
-			       (sc->sc_lastcal) - INITIAL_JIFFIES, 
-			       (sc->sc_lastcal + (sc->sc_calinterval_sec * HZ)) - INITIAL_JIFFIES,
+			       jiffies
+			       (sc->sc_lastcal)
+			       (sc->sc_lastcal + (sc->sc_calinterval_sec * HZ))
 			       jiffies_to_msecs(sc->sc_lastcal + (sc->sc_calinterval_sec * HZ) - jiffies));
 		}
 #endif