mac80211: Use setup_timer instead of init_timer

Use setup_timer() and setup_deferrable_timer() to set the data and
function timer fields. It makes the code cleaner and will allow for
easier change of the timer struct internals.

Signed-off-by: Ondřej Lysoněk <ondrej.lysonek@seznam.cz>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Johannes Berg <johannes@sipsolutions.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: <linux-wireless@vger.kernel.org>
Cc: <netdev@vger.kernel.org>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/agg-rx.c b/net/mac80211/agg-rx.c
index 4456559cb056d1e32a621351120327cf27541bf7..1b7a4daf283c5191c19eaa4f3571d316c866906a 100644 (file)
--- a/net/mac80211/agg-rx.c
+++ b/net/mac80211/agg-rx.c
@@ -357,14 +357,14 @@ void __ieee80211_start_rx_ba_session(struct sta_info *sta,
        spin_lock_init(&tid_agg_rx->reorder_lock);
 
        /* rx timer */
-       tid_agg_rx->session_timer.function = sta_rx_agg_session_timer_expired;
-       tid_agg_rx->session_timer.data = (unsigned long)&sta->timer_to_tid[tid];
-       init_timer_deferrable(&tid_agg_rx->session_timer);
+       setup_deferrable_timer(&tid_agg_rx->session_timer,
+                              sta_rx_agg_session_timer_expired,
+                              (unsigned long)&sta->timer_to_tid[tid]);
 
        /* rx reorder timer */
-       tid_agg_rx->reorder_timer.function = sta_rx_agg_reorder_timer_expired;
-       tid_agg_rx->reorder_timer.data = (unsigned long)&sta->timer_to_tid[tid];
-       init_timer(&tid_agg_rx->reorder_timer);
+       setup_timer(&tid_agg_rx->reorder_timer,
+                   sta_rx_agg_reorder_timer_expired,
+                   (unsigned long)&sta->timer_to_tid[tid]);
 
        /* prepare reordering buffer */
        tid_agg_rx->reorder_buf =

diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index 45319cc01121a9eb17d49185a07a9675e7b2995d..60e2a62f7bef2fbb014f3a40403cf498a75d429c 100644 (file)
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -670,14 +670,14 @@ int ieee80211_start_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid,
        tid_tx->timeout = timeout;
 
        /* response timer */
-       tid_tx->addba_resp_timer.function = sta_addba_resp_timer_expired;
-       tid_tx->addba_resp_timer.data = (unsigned long)&sta->timer_to_tid[tid];
-       init_timer(&tid_tx->addba_resp_timer);
+       setup_timer(&tid_tx->addba_resp_timer,
+                   sta_addba_resp_timer_expired,
+                   (unsigned long)&sta->timer_to_tid[tid]);
 
        /* tx timer */
-       tid_tx->session_timer.function = sta_tx_agg_session_timer_expired;
-       tid_tx->session_timer.data = (unsigned long)&sta->timer_to_tid[tid];
-       init_timer_deferrable(&tid_tx->session_timer);
+       setup_deferrable_timer(&tid_tx->session_timer,
+                              sta_tx_agg_session_timer_expired,
+                              (unsigned long)&sta->timer_to_tid[tid]);
 
        /* assign a dialog token */
        sta->ampdu_mlme.dialog_token_allocator++;