diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2016-09-01 17:11:42 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2016-09-01 17:11:42 +0300 |
| commit | a9840c46ff9bb845d62d6f9592ab76c0e531c8f4 (patch) | |
| tree | 7e1de9881ef25eb2c05ebc3ebaece6bd0543ddaf /drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h | |
| parent | bb87f02b7e4ccdb614a83cbf840524de81e9b321 (diff) | |
| parent | a904a08b5fee5317ff0f7b8212aa5d0776795a52 (diff) | |
Merge tag 'iwlwifi-for-kalle-2016-08-29' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes
* Fix P2P dump trigger
* Prevent a potential null dereference in iwlmvm
* Prevent an uninitialized value from being returned in iwlmvm
* Advertise support for channel width change in AP mode
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h b/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h index f7dff7612c9c..e9f1be9da7d4 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h +++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h @@ -105,7 +105,8 @@ iwl_fw_dbg_trigger_vif_match(struct iwl_fw_dbg_trigger_tlv *trig, { u32 trig_vif = le32_to_cpu(trig->vif_type); - return trig_vif == IWL_FW_DBG_CONF_VIF_ANY || vif->type == trig_vif; + return trig_vif == IWL_FW_DBG_CONF_VIF_ANY || + ieee80211_vif_type_p2p(vif) == trig_vif; } static inline bool |