* [PATCH -next] iwlwifi: mvm: use setup_timer instead of init_timer and data fields
@ 2016-07-12 11:40 weiyj_lk
2016-07-12 11:43 ` Grumbach, Emmanuel
0 siblings, 1 reply; 2+ messages in thread
From: weiyj_lk @ 2016-07-12 11:40 UTC (permalink / raw)
To: Johannes Berg, Emmanuel Grumbach, Luca Coelho,
Intel Linux Wireless, Kalle Valo, Sara Sharon
Cc: Wei Yongjun, linux-wireless
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Use setup_timer function instead of initializing timer with the function
and data fields
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
index f449ef9..7caad55 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
@@ -1351,11 +1351,9 @@ int iwl_mvm_sta_rx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
baid_data->baid = baid;
baid_data->timeout = timeout;
baid_data->last_rx = jiffies;
- init_timer(&baid_data->session_timer);
- baid_data->session_timer.function =
- iwl_mvm_rx_agg_session_expired;
- baid_data->session_timer.data =
- (unsigned long)&mvm->baid_map[baid];
+ setup_timer(&baid_data->session_timer,
+ iwl_mvm_rx_agg_session_expired,
+ (unsigned long)&mvm->baid_map[baid]);
baid_data->mvm = mvm;
baid_data->tid = tid;
baid_data->sta_id = mvm_sta->sta_id;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -next] iwlwifi: mvm: use setup_timer instead of init_timer and data fields
2016-07-12 11:40 [PATCH -next] iwlwifi: mvm: use setup_timer instead of init_timer and data fields weiyj_lk
@ 2016-07-12 11:43 ` Grumbach, Emmanuel
0 siblings, 0 replies; 2+ messages in thread
From: Grumbach, Emmanuel @ 2016-07-12 11:43 UTC (permalink / raw)
To: Coelho, Luciano, linuxwifi, kvalo@codeaurora.org, Sharon, Sara,
weiyj_lk@163.com, Berg, Johannes
Cc: linux-wireless@vger.kernel.org, yongjun_wei@trendmicro.com.cn
T24gVHVlLCAyMDE2LTA3LTEyIGF0IDExOjQwICswMDAwLCB3ZWl5al9sa0AxNjMuY29tIHdyb3Rl
Og0KPiBGcm9tOiBXZWkgWW9uZ2p1biA8eW9uZ2p1bl93ZWlAdHJlbmRtaWNyby5jb20uY24+DQo+
IA0KPiBVc2Ugc2V0dXBfdGltZXIgZnVuY3Rpb24gaW5zdGVhZCBvZiBpbml0aWFsaXppbmcgdGlt
ZXIgd2l0aCB0aGUNCj4gZnVuY3Rpb24NCj4gYW5kIGRhdGEgZmllbGRzDQo+IA0KPiBTaWduZWQt
b2ZmLWJ5OiBXZWkgWW9uZ2p1biA8eW9uZ2p1bl93ZWlAdHJlbmRtaWNyby5jb20uY24+DQo+IC0t
LQ0KDQpUaGFua3MgLSBJIHBpY2tlZCBpdCB1cCBhbmQgdXBsb2FkZWQgaXQgdG8gb3VyIGludGVy
bmFsIHRyZWUuDQo=
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-07-12 11:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-12 11:40 [PATCH -next] iwlwifi: mvm: use setup_timer instead of init_timer and data fields weiyj_lk
2016-07-12 11:43 ` Grumbach, Emmanuel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).