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/mvm.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/mvm.h')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h index b4fc86d5d7ef..6a615bb73042 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h @@ -467,6 +467,8 @@ struct iwl_mvm_vif { static inline struct iwl_mvm_vif * iwl_mvm_vif_from_mac80211(struct ieee80211_vif *vif) { + if (!vif) + return NULL; return (void *)vif->drv_priv; } |