2016-07-12 11:41:16

by weiyj_lk

Subject: [PATCH -next] iwlwifi: mvm: use setup_timer instead of init_timer and data fields

From: Wei Yongjun <[email protected]>

Use setup_timer function instead of initializing timer with the function
and data fields

Signed-off-by: Wei Yongjun <[email protected]>
---
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;

2016-07-12 11:43:33

by Grumbach, Emmanuel

Subject: Re: [PATCH -next] iwlwifi: mvm: use setup_timer instead of init_timer and data fields

T24gVHVlLCAyMDE2LTA3LTEyIGF0IDExOjQwICswMDAwLCB3ZWl5al9sa0AxNjMuY29tIHdyb3Rl
Og0KPiBGcm9tOiBXZWkgWW9uZ2p1biA8eW9uZ2p1bl93ZWlAdHJlbmRtaWNyby5jb20uY24+DQo+
IA0KPiBVc2Ugc2V0dXBfdGltZXIgZnVuY3Rpb24gaW5zdGVhZCBvZiBpbml0aWFsaXppbmcgdGlt
ZXIgd2l0aCB0aGUNCj4gZnVuY3Rpb24NCj4gYW5kIGRhdGEgZmllbGRzDQo+IA0KPiBTaWduZWQt
b2ZmLWJ5OiBXZWkgWW9uZ2p1biA8eW9uZ2p1bl93ZWlAdHJlbmRtaWNyby5jb20uY24+DQo+IC0t
LQ0KDQpUaGFua3MgLSBJIHBpY2tlZCBpdCB1cCBhbmQgdXBsb2FkZWQgaXQgdG8gb3VyIGludGVy
bmFsIHRyZWUuDQo=