diff options
author | Pavel Emelyanov <xemul@openvz.org> | 2008-01-24 00:20:07 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:53:35 -0500 |
commit | b24b8a247ff65c01b252025926fe564209fae4fc (patch) | |
tree | 8a9e0ea1e24b4733d8b9433d41877659505e9da4 /net/mac80211/sta_info.c | |
parent | a92aa318b4b369091fd80433c80e62838db8bc1c (diff) |
[NET]: Convert init_timer into setup_timer
Many-many code in the kernel initialized the timer->function
and timer->data together with calling init_timer(timer). There
is already a helper for this. Use it for networking code.
The patch is HUGE, but makes the code 130 lines shorter
(98 insertions(+), 228 deletions(-)).
Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/sta_info.c')
-rw-r--r-- | net/mac80211/sta_info.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index cfd8ee9adad0..ffe8a49d8927 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c | |||
@@ -346,11 +346,10 @@ void sta_info_init(struct ieee80211_local *local) | |||
346 | rwlock_init(&local->sta_lock); | 346 | rwlock_init(&local->sta_lock); |
347 | INIT_LIST_HEAD(&local->sta_list); | 347 | INIT_LIST_HEAD(&local->sta_list); |
348 | 348 | ||
349 | init_timer(&local->sta_cleanup); | 349 | setup_timer(&local->sta_cleanup, sta_info_cleanup, |
350 | (unsigned long)local); | ||
350 | local->sta_cleanup.expires = | 351 | local->sta_cleanup.expires = |
351 | round_jiffies(jiffies + STA_INFO_CLEANUP_INTERVAL); | 352 | round_jiffies(jiffies + STA_INFO_CLEANUP_INTERVAL); |
352 | local->sta_cleanup.data = (unsigned long) local; | ||
353 | local->sta_cleanup.function = sta_info_cleanup; | ||
354 | 353 | ||
355 | #ifdef CONFIG_MAC80211_DEBUGFS | 354 | #ifdef CONFIG_MAC80211_DEBUGFS |
356 | INIT_WORK(&local->sta_debugfs_add, sta_info_debugfs_add_task); | 355 | INIT_WORK(&local->sta_debugfs_add, sta_info_debugfs_add_task); |