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/ieee80211 | |
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/ieee80211')
-rw-r--r-- | net/ieee80211/ieee80211_module.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/ieee80211/ieee80211_module.c b/net/ieee80211/ieee80211_module.c index 69cb6aad25be..3bca97f55d47 100644 --- a/net/ieee80211/ieee80211_module.c +++ b/net/ieee80211/ieee80211_module.c | |||
@@ -181,9 +181,8 @@ struct net_device *alloc_ieee80211(int sizeof_priv) | |||
181 | ieee->ieee802_1x = 1; /* Default to supporting 802.1x */ | 181 | ieee->ieee802_1x = 1; /* Default to supporting 802.1x */ |
182 | 182 | ||
183 | INIT_LIST_HEAD(&ieee->crypt_deinit_list); | 183 | INIT_LIST_HEAD(&ieee->crypt_deinit_list); |
184 | init_timer(&ieee->crypt_deinit_timer); | 184 | setup_timer(&ieee->crypt_deinit_timer, ieee80211_crypt_deinit_handler, |
185 | ieee->crypt_deinit_timer.data = (unsigned long)ieee; | 185 | (unsigned long)ieee); |
186 | ieee->crypt_deinit_timer.function = ieee80211_crypt_deinit_handler; | ||
187 | ieee->crypt_quiesced = 0; | 186 | ieee->crypt_quiesced = 0; |
188 | 187 | ||
189 | spin_lock_init(&ieee->lock); | 188 | spin_lock_init(&ieee->lock); |