diff options
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/rs.c | 7 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/rs.h | 4 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/sta.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/tt.c | 3 |
4 files changed, 8 insertions, 9 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.c b/drivers/net/wireless/iwlwifi/mvm/rs.c index b328a988c130..3856c285c69a 100644 --- a/drivers/net/wireless/iwlwifi/mvm/rs.c +++ b/drivers/net/wireless/iwlwifi/mvm/rs.c | |||
@@ -3193,13 +3193,14 @@ void iwl_mvm_rate_control_unregister(void) | |||
3193 | * iwl_mvm_tx_protection - Gets LQ command, change it to enable/disable | 3193 | * iwl_mvm_tx_protection - Gets LQ command, change it to enable/disable |
3194 | * Tx protection, according to this rquest and previous requests, | 3194 | * Tx protection, according to this rquest and previous requests, |
3195 | * and send the LQ command. | 3195 | * and send the LQ command. |
3196 | * @lq: The LQ command | ||
3197 | * @mvmsta: The station | 3196 | * @mvmsta: The station |
3198 | * @enable: Enable Tx protection? | 3197 | * @enable: Enable Tx protection? |
3199 | */ | 3198 | */ |
3200 | int iwl_mvm_tx_protection(struct iwl_mvm *mvm, struct iwl_lq_cmd *lq, | 3199 | int iwl_mvm_tx_protection(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta, |
3201 | struct iwl_mvm_sta *mvmsta, bool enable) | 3200 | bool enable) |
3202 | { | 3201 | { |
3202 | struct iwl_lq_cmd *lq = &mvmsta->lq_sta.lq; | ||
3203 | |||
3203 | lockdep_assert_held(&mvm->mutex); | 3204 | lockdep_assert_held(&mvm->mutex); |
3204 | 3205 | ||
3205 | if (enable) { | 3206 | if (enable) { |
diff --git a/drivers/net/wireless/iwlwifi/mvm/rs.h b/drivers/net/wireless/iwlwifi/mvm/rs.h index cff4f6da7733..29d699ac07c9 100644 --- a/drivers/net/wireless/iwlwifi/mvm/rs.h +++ b/drivers/net/wireless/iwlwifi/mvm/rs.h | |||
@@ -404,7 +404,7 @@ extern void iwl_mvm_rate_control_unregister(void); | |||
404 | 404 | ||
405 | struct iwl_mvm_sta; | 405 | struct iwl_mvm_sta; |
406 | 406 | ||
407 | int iwl_mvm_tx_protection(struct iwl_mvm *mvm, struct iwl_lq_cmd *lq, | 407 | int iwl_mvm_tx_protection(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta, |
408 | struct iwl_mvm_sta *mvmsta, bool enable); | 408 | bool enable); |
409 | 409 | ||
410 | #endif /* __rs__ */ | 410 | #endif /* __rs__ */ |
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.c b/drivers/net/wireless/iwlwifi/mvm/sta.c index 62fe5209093b..0321bd37aa02 100644 --- a/drivers/net/wireless/iwlwifi/mvm/sta.c +++ b/drivers/net/wireless/iwlwifi/mvm/sta.c | |||
@@ -807,8 +807,7 @@ int iwl_mvm_sta_tx_agg_oper(struct iwl_mvm *mvm, struct ieee80211_vif *vif, | |||
807 | * method for HT traffic | 807 | * method for HT traffic |
808 | * this function also sends the LQ command | 808 | * this function also sends the LQ command |
809 | */ | 809 | */ |
810 | return iwl_mvm_tx_protection(mvm, &mvmsta->lq_sta.lq, | 810 | return iwl_mvm_tx_protection(mvm, mvmsta, true); |
811 | mvmsta, true); | ||
812 | /* | 811 | /* |
813 | * TODO: remove the TLC_RTS flag when we tear down the last | 812 | * TODO: remove the TLC_RTS flag when we tear down the last |
814 | * AGG session (agg_tids_count in DVM) | 813 | * AGG session (agg_tids_count in DVM) |
diff --git a/drivers/net/wireless/iwlwifi/mvm/tt.c b/drivers/net/wireless/iwlwifi/mvm/tt.c index d6ae7f16ac11..f5ba185f09b1 100644 --- a/drivers/net/wireless/iwlwifi/mvm/tt.c +++ b/drivers/net/wireless/iwlwifi/mvm/tt.c | |||
@@ -391,8 +391,7 @@ static void iwl_mvm_tt_tx_protection(struct iwl_mvm *mvm, bool enable) | |||
391 | mvmsta = (void *)sta->drv_priv; | 391 | mvmsta = (void *)sta->drv_priv; |
392 | if (enable == mvmsta->tt_tx_protection) | 392 | if (enable == mvmsta->tt_tx_protection) |
393 | continue; | 393 | continue; |
394 | err = iwl_mvm_tx_protection(mvm, &mvmsta->lq_sta.lq, | 394 | err = iwl_mvm_tx_protection(mvm, mvmsta, enable); |
395 | mvmsta, enable); | ||
396 | if (err) { | 395 | if (err) { |
397 | IWL_ERR(mvm, "Failed to %s Tx protection\n", | 396 | IWL_ERR(mvm, "Failed to %s Tx protection\n", |
398 | enable ? "enable" : "disable"); | 397 | enable ? "enable" : "disable"); |