diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-10-27 13:35:59 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-10-27 13:35:59 -0400 |
| commit | fad1dbc8efb4e51e121c745a99c0fb22b420a5c6 (patch) | |
| tree | edf9654bae7d9bda79e6c358225970fed02f49fb /drivers/net/wireless/iwlwifi/mvm/time-event.c | |
| parent | 08054200117a95afc14c3d2ed3a38bf4e345bf78 (diff) | |
| parent | 7f2ac8fb31896c9fb70dbd2a2e6642b79996fc13 (diff) | |
Merge tag 'iwlwifi-for-john-2014-10-23' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
Emmanuel Grumbach <egrumbach@gmail.com> says:
"I revert here a patch that caused interoperability issues.
dvm gets a fix for a bug that was reported by many users.
Two minor fixes for BT Coex and platform power fix that helps
reducing latency when the PCIe link goes to low power states."
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/time-event.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/time-event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/time-event.c b/drivers/net/wireless/iwlwifi/mvm/time-event.c index b7f9e61d14e..6dfad230be5 100644 --- a/drivers/net/wireless/iwlwifi/mvm/time-event.c +++ b/drivers/net/wireless/iwlwifi/mvm/time-event.c @@ -305,8 +305,8 @@ static int iwl_mvm_aux_roc_te_handle_notif(struct iwl_mvm *mvm, te_data->running = false; te_data->vif = NULL; te_data->uid = 0; + te_data->id = TE_MAX; } else if (le32_to_cpu(notif->action) == TE_V2_NOTIF_HOST_EVENT_START) { - set_bit(IWL_MVM_STATUS_ROC_RUNNING, &mvm->status); set_bit(IWL_MVM_STATUS_ROC_AUX_RUNNING, &mvm->status); te_data->running = true; ieee80211_ready_on_channel(mvm->hw); /* Start TE */ |