| Message ID | 20161109055015.GA27416@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Luca Coelho |
| Headers | show |
(removed Erarn Harary from the Cc list, since this email is not valid anymore) Hi Kirtika, Just a couple of nitpicks, nothing important, so no need to resend. On Tue, 2016-11-08 at 21:50 -0800, Kirtika Ruchandani wrote: > mvmvif is defined and set in rs_mimo_allow but not used. Compiling > iwlwifi with W=1 gives the following warning, remove it. mvmsta is used only to > obtain mvmvif so remove it as well. > > iwlwifi/mvm/rs.c: In function 'rs_mimo_allow': > iwlwifi/mvm/rs.c:165:22: warning: variable 'mvmvif' set but not used.[-Wunused-but-set-variable] > > This fix removes calls to iwl_mvm_sta_from_mac & iwl_mvm_vif_from_mac. They are > both accessors, and do not have any side-effects. > Commit e621c2282 removed a workaround that disabled MIMO on P2P, 'mvmvif' was > used for that workaround, but not removed with it. > > Fixes: e621c2282e31 ("iwlwifi: rs: Remove workaround that disables MIMO on P2P") > Usually the Fixes: tag is together with the other tags (such as Cc, Signed-off-by), i.e. no empty line here. > Signed-off-by: Kirtika Ruchandani <kirtika@google.com> > Cc: Alexander Bondar <alexander.bondar@intel.com> > Cc: Emmanuel Grumbach <emmmanuel.grumbach@intel.com> And the Signed-off-by tag is usually the last one here, after all Cc's and stuff. But it doesn't matter much. -- Cheers, Luca.
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs.c b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c index 227c5ed..0b79f4a 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/rs.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c @@ -161,9 +161,6 @@ static bool rs_mimo_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta, struct rs_rate *rate, const struct rs_tx_column *next_col) { - struct iwl_mvm_sta *mvmsta; - struct iwl_mvm_vif *mvmvif; - if (!sta->ht_cap.ht_supported) return false; @@ -176,9 +173,6 @@ static bool rs_mimo_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta, if (!iwl_mvm_bt_coex_is_mimo_allowed(mvm, sta)) return false; - mvmsta = iwl_mvm_sta_from_mac80211(sta); - mvmvif = iwl_mvm_vif_from_mac80211(mvmsta->vif); - if (mvm->nvm_data->sku_cap_mimo_disabled) return false;
mvmvif is defined and set in rs_mimo_allow but not used. Compiling iwlwifi with W=1 gives the following warning, remove it. mvmsta is used only to obtain mvmvif so remove it as well. iwlwifi/mvm/rs.c: In function 'rs_mimo_allow': iwlwifi/mvm/rs.c:165:22: warning: variable 'mvmvif' set but not used.[-Wunused-but-set-variable] This fix removes calls to iwl_mvm_sta_from_mac & iwl_mvm_vif_from_mac. They are both accessors, and do not have any side-effects. Commit e621c2282 removed a workaround that disabled MIMO on P2P, 'mvmvif' was used for that workaround, but not removed with it. Fixes: e621c2282e31 ("iwlwifi: rs: Remove workaround that disables MIMO on P2P") Signed-off-by: Kirtika Ruchandani <kirtika@google.com> Cc: Alexander Bondar <alexander.bondar@intel.com> Cc: Emmanuel Grumbach <emmmanuel.grumbach@intel.com> --- drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 6 ------ 1 file changed, 6 deletions(-)