diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-24 10:07:21 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-24 10:07:21 +1100 |
| commit | 9156ad48338e0306e508ead5c0d9986050744475 (patch) | |
| tree | 37f3a90e38190052ecf3cdf9171dfdddd37b56fd /net/mac80211/sta_info.c | |
| parent | fa28237cfcc5827553044cbd6ee52e33692b0faa (diff) | |
| parent | 8f7b3d156d348b6766833cd4e272d0d19b501e64 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'net/mac80211/sta_info.c')
| -rw-r--r-- | net/mac80211/sta_info.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index e8491554a5dc..cfd8ee9adad0 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -14,6 +14,7 @@ #include <linux/slab.h> #include <linux/skbuff.h> #include <linux/if_arp.h> +#include <linux/timer.h> #include <net/mac80211.h> #include "ieee80211_i.h" @@ -306,7 +307,8 @@ static void sta_info_cleanup(unsigned long data) } read_unlock_bh(&local->sta_lock); - local->sta_cleanup.expires = jiffies + STA_INFO_CLEANUP_INTERVAL; + local->sta_cleanup.expires = + round_jiffies(jiffies + STA_INFO_CLEANUP_INTERVAL); add_timer(&local->sta_cleanup); } @@ -345,7 +347,8 @@ void sta_info_init(struct ieee80211_local *local) INIT_LIST_HEAD(&local->sta_list); init_timer(&local->sta_cleanup); - local->sta_cleanup.expires = jiffies + STA_INFO_CLEANUP_INTERVAL; + local->sta_cleanup.expires = + round_jiffies(jiffies + STA_INFO_CLEANUP_INTERVAL); local->sta_cleanup.data = (unsigned long) local; local->sta_cleanup.function = sta_info_cleanup; |