drivers/net/wireless/atmel.c: Use time_* macros
The functions time_before, time_before_eq, time_after, and time_after_eq are more robust for comparing jiffies against other values. So following patch implements usage of the time_after() macro, defined at linux/jiffies.h, which deals with wrapping correctly Cc: linux-wireless@vger.kernel.org Signed-off-by: S.Çağlar Onur <caglar@pardus.org.tr> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
ab46623ec1
commit
6e33e30d7a
|
@ -66,6 +66,7 @@
|
||||||
#include <linux/device.h>
|
#include <linux/device.h>
|
||||||
#include <linux/moduleparam.h>
|
#include <linux/moduleparam.h>
|
||||||
#include <linux/firmware.h>
|
#include <linux/firmware.h>
|
||||||
|
#include <linux/jiffies.h>
|
||||||
#include <net/ieee80211.h>
|
#include <net/ieee80211.h>
|
||||||
#include "atmel.h"
|
#include "atmel.h"
|
||||||
|
|
||||||
|
@ -516,7 +517,7 @@ struct atmel_private {
|
||||||
SITE_SURVEY_IN_PROGRESS,
|
SITE_SURVEY_IN_PROGRESS,
|
||||||
SITE_SURVEY_COMPLETED
|
SITE_SURVEY_COMPLETED
|
||||||
} site_survey_state;
|
} site_survey_state;
|
||||||
time_t last_survey;
|
unsigned long last_survey;
|
||||||
|
|
||||||
int station_was_associated, station_is_associated;
|
int station_was_associated, station_is_associated;
|
||||||
int fast_scan;
|
int fast_scan;
|
||||||
|
@ -2283,7 +2284,7 @@ static int atmel_set_scan(struct net_device *dev,
|
||||||
return -EAGAIN;
|
return -EAGAIN;
|
||||||
|
|
||||||
/* Timeout old surveys. */
|
/* Timeout old surveys. */
|
||||||
if ((jiffies - priv->last_survey) > (20 * HZ))
|
if (time_after(jiffies, priv->last_survey + 20 * HZ))
|
||||||
priv->site_survey_state = SITE_SURVEY_IDLE;
|
priv->site_survey_state = SITE_SURVEY_IDLE;
|
||||||
priv->last_survey = jiffies;
|
priv->last_survey = jiffies;
|
||||||
|
|
||||||
|
|
Reference in New Issue