aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/atmel.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index 63ec7a70ee76..ef2da4023d68 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -66,6 +66,7 @@
66#include <linux/device.h> 66#include <linux/device.h>
67#include <linux/moduleparam.h> 67#include <linux/moduleparam.h>
68#include <linux/firmware.h> 68#include <linux/firmware.h>
69#include <linux/jiffies.h>
69#include <net/ieee80211.h> 70#include <net/ieee80211.h>
70#include "atmel.h" 71#include "atmel.h"
71 72
@@ -516,7 +517,7 @@ struct atmel_private {
516 SITE_SURVEY_IN_PROGRESS, 517 SITE_SURVEY_IN_PROGRESS,
517 SITE_SURVEY_COMPLETED 518 SITE_SURVEY_COMPLETED
518 } site_survey_state; 519 } site_survey_state;
519 time_t last_survey; 520 unsigned long last_survey;
520 521
521 int station_was_associated, station_is_associated; 522 int station_was_associated, station_is_associated;
522 int fast_scan; 523 int fast_scan;
@@ -2283,7 +2284,7 @@ static int atmel_set_scan(struct net_device *dev,
2283 return -EAGAIN; 2284 return -EAGAIN;
2284 2285
2285 /* Timeout old surveys. */ 2286 /* Timeout old surveys. */
2286 if ((jiffies - priv->last_survey) > (20 * HZ)) 2287 if (time_after(jiffies, priv->last_survey + 20 * HZ))
2287 priv->site_survey_state = SITE_SURVEY_IDLE; 2288 priv->site_survey_state = SITE_SURVEY_IDLE;
2288 priv->last_survey = jiffies; 2289 priv->last_survey = jiffies;
2289 2290