diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2016-07-05 15:59:54 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-07-05 15:59:54 +0300 |
| commit | df429195198e75cb0b67ce447606707a9bcc431e (patch) | |
| tree | 4f8b840ce7139d9e33f19defa7d6a94fdd1b1aa1 /drivers/net/wireless/intel/iwlwifi/mvm/sta.c | |
| parent | 535633a5ba4ea2504fa6c33176633becf0e59339 (diff) | |
| parent | 58035432d60616cc2ef6514a3d0e6d6ad01bf705 (diff) | |
| download | linux-df429195198e75cb0b67ce447606707a9bcc431e.tar.gz linux-df429195198e75cb0b67ce447606707a9bcc431e.tar.xz | |
Merge tag 'iwlwifi-next-for-kalle-2016-07-01' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
* More work on the RX path for the 9000 device series
* Some more dynamic queue allocation work
* A few bugfixes and other improvements
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/sta.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c index fea4d3437e2f..64b07b114d3c 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c @@ -819,8 +819,9 @@ int iwl_mvm_rm_sta(struct iwl_mvm *mvm, if (iwl_mvm_has_new_rx_api(mvm)) kfree(mvm_sta->dup_data); - if (vif->type == NL80211_IFTYPE_STATION && - mvmvif->ap_sta_id == mvm_sta->sta_id) { + if ((vif->type == NL80211_IFTYPE_STATION && + mvmvif->ap_sta_id == mvm_sta->sta_id) || + iwl_mvm_is_dqa_supported(mvm)){ ret = iwl_mvm_drain_sta(mvm, mvm_sta, true); if (ret) return ret; |