|
@@ -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;
|
|
|
|
|