Browse Source

iwlwifi: mvm: use setup_timer instead of init_timer and data fields

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

Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Wei Yongjun 9 years ago
parent
commit
72c240fed0
1 changed files with 3 additions and 5 deletions
  1. 3 5
      drivers/net/wireless/intel/iwlwifi/mvm/sta.c

+ 3 - 5
drivers/net/wireless/intel/iwlwifi/mvm/sta.c

@@ -2050,11 +2050,9 @@ int iwl_mvm_sta_rx_agg(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
 		baid_data->baid = baid;
 		baid_data->baid = baid;
 		baid_data->timeout = timeout;
 		baid_data->timeout = timeout;
 		baid_data->last_rx = jiffies;
 		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->mvm = mvm;
 		baid_data->tid = tid;
 		baid_data->tid = tid;
 		baid_data->sta_id = mvm_sta->sta_id;
 		baid_data->sta_id = mvm_sta->sta_id;