Merge tag 'drm-coc-for-v4.12-rc1' of git://people.freedesktop.org/~airlied/linux

[karo-tx-linux.git] / net / mac80211 / agg-tx.c

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++;