Skip to content

Commit

Permalink
drivers/net/wireless/atmel.c: Use time_* macros
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
S.Çağlar Onur authored and John W. Linville committed Feb 29, 2008
1 parent ab46623 commit 6e33e30
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/net/wireless/atmel.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
#include <linux/device.h>
#include <linux/moduleparam.h>
#include <linux/firmware.h>
#include <linux/jiffies.h>
#include <net/ieee80211.h>
#include "atmel.h"

Expand Down Expand Up @@ -516,7 +517,7 @@ struct atmel_private {
SITE_SURVEY_IN_PROGRESS,
SITE_SURVEY_COMPLETED
} site_survey_state;
time_t last_survey;
unsigned long last_survey;

int station_was_associated, station_is_associated;
int fast_scan;
Expand Down Expand Up @@ -2283,7 +2284,7 @@ static int atmel_set_scan(struct net_device *dev,
return -EAGAIN;

/* 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->last_survey = jiffies;

Expand Down

0 comments on commit 6e33e30

Please sign in to comment.