Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8f118ce authored by Ondřej Lysoněk's avatar Ondřej Lysoněk Committed by Johannes Berg
Browse files

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: default avatarOndřej Lysoněk <ondrej.lysonek@seznam.cz>
Signed-off-by: default avatarJiri 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: default avatarJohannes Berg <johannes.berg@intel.com>
parent 85bbd803

net/mac80211/agg-rx.c

+6 −6
Original line number Diff line number Diff line
@@ -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 =

net/mac80211/agg-tx.c

+6 −6
Original line number Diff line number Diff line
@@ -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++;