[PATCH] ieee80211: Fix time calculation, switching to use jiffies_to_msecs
tree b9cdd7058b787807655ea6f125e2adbf8d26c863 parent 85d9b2bddfcf3ed2eb4d061947c25c6a832891ab author Zhu Yi <jketreno@io.(none)> 1124435212 -0500 committer James Ketrenos <jketreno@linux.intel.com> 1127312152 -0500 Fix time calculation, switching to use jiffies_to_msecs. Signed-off-by: James Ketrenos <jketreno@linux.intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
parent
f1bf6638af
commit
42e349fd10
|
@ -32,6 +32,7 @@
|
||||||
|
|
||||||
#include <linux/kmod.h>
|
#include <linux/kmod.h>
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
|
#include <linux/jiffies.h>
|
||||||
|
|
||||||
#include <net/ieee80211.h>
|
#include <net/ieee80211.h>
|
||||||
#include <linux/wireless.h>
|
#include <linux/wireless.h>
|
||||||
|
@ -217,8 +218,8 @@ static inline char *ipw2100_translate_scan(struct ieee80211_device *ieee,
|
||||||
iwe.cmd = IWEVCUSTOM;
|
iwe.cmd = IWEVCUSTOM;
|
||||||
p = custom;
|
p = custom;
|
||||||
p += snprintf(p, MAX_CUSTOM_LEN - (p - custom),
|
p += snprintf(p, MAX_CUSTOM_LEN - (p - custom),
|
||||||
" Last beacon: %lums ago",
|
" Last beacon: %dms ago",
|
||||||
(jiffies - network->last_scanned) / (HZ / 100));
|
jiffies_to_msecs(jiffies - network->last_scanned));
|
||||||
iwe.u.data.length = p - custom;
|
iwe.u.data.length = p - custom;
|
||||||
if (iwe.u.data.length)
|
if (iwe.u.data.length)
|
||||||
start = iwe_stream_add_point(start, stop, &iwe, custom);
|
start = iwe_stream_add_point(start, stop, &iwe, custom);
|
||||||
|
@ -248,13 +249,13 @@ int ieee80211_wx_get_scan(struct ieee80211_device *ieee,
|
||||||
ev = ipw2100_translate_scan(ieee, ev, stop, network);
|
ev = ipw2100_translate_scan(ieee, ev, stop, network);
|
||||||
else
|
else
|
||||||
IEEE80211_DEBUG_SCAN("Not showing network '%s ("
|
IEEE80211_DEBUG_SCAN("Not showing network '%s ("
|
||||||
MAC_FMT ")' due to age (%lums).\n",
|
MAC_FMT ")' due to age (%dms).\n",
|
||||||
escape_essid(network->ssid,
|
escape_essid(network->ssid,
|
||||||
network->ssid_len),
|
network->ssid_len),
|
||||||
MAC_ARG(network->bssid),
|
MAC_ARG(network->bssid),
|
||||||
(jiffies -
|
jiffies_to_msecs(jiffies -
|
||||||
network->last_scanned) / (HZ /
|
network->
|
||||||
100));
|
last_scanned));
|
||||||
}
|
}
|
||||||
|
|
||||||
spin_unlock_irqrestore(&ieee->lock, flags);
|
spin_unlock_irqrestore(&ieee->lock, flags);
|
||||||
|
|
Loading…
Reference in New Issue