diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-11-16 10:16:28 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-11-16 10:16:28 +0100 |
commit | 0acbc7aa4713b450ff46f9c9f6ce0060ea6947b1 (patch) | |
tree | 480508a78b7d9e9c0da0ffbd33b40e0b4e076a16 /drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | |
parent | 353c50ebe329daaf2c94dc41c1c481cbba2a31fd (diff) | |
parent | 81bcfe5e48f9b8c42cf547f1c74c7f60c44c34c8 (diff) |
Merge branch 'linus' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/mvm.h')
-rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h index d17cbf603f7c..c60703e0c246 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h @@ -937,6 +937,7 @@ struct iwl_mvm { /* sync d0i3_tx queue and IWL_MVM_STATUS_IN_D0I3 status flag */ spinlock_t d0i3_tx_lock; wait_queue_head_t d0i3_exit_waitq; + wait_queue_head_t rx_sync_waitq; /* BT-Coex */ struct iwl_bt_coex_profile_notif last_bt_notif; |