diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2017-10-16 17:06:54 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2017-10-16 17:09:24 +0300 |
| commit | 0fac9e2dff00a2344ffc81d82749181ffae408a2 (patch) | |
| tree | 1399ce5ce12955c971c4727dd70bc8b4db2754f1 /drivers/net/wireless/intel/iwlwifi/mvm/rs.c | |
| parent | a39644b235c1a45f84d6e16603cacb93740ed2d4 (diff) | |
| parent | a6127b4440d1f74f26b64006b2f50c9dc6d66efc (diff) | |
| download | talos-op-linux-0fac9e2dff00a2344ffc81d82749181ffae408a2.tar.gz talos-op-linux-0fac9e2dff00a2344ffc81d82749181ffae408a2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
Mark Brown reported that there are conflicts in iwlwifi between the two trees
so fix those now.
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/rs.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/rs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs.c b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c index ba7bd049d3d4..0fe723ca844e 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/rs.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/rs.c @@ -661,7 +661,8 @@ static void rs_tl_turn_on_agg(struct iwl_mvm *mvm, struct iwl_mvm_sta *mvmsta, (lq_sta->tx_agg_tid_en & BIT(tid)) && (tid_data->tx_count_last >= IWL_MVM_RS_AGG_START_THRESHOLD)) { IWL_DEBUG_RATE(mvm, "try to aggregate tid %d\n", tid); - rs_tl_turn_on_agg_for_tid(mvm, lq_sta, tid, sta); + if (rs_tl_turn_on_agg_for_tid(mvm, lq_sta, tid, sta) == 0) + tid_data->state = IWL_AGG_QUEUED; } } |
