leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fix P2P dump trigger

Browse Source 
* 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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJXxI0iAAoJEKFHnKIaPMX6khcP/juONl46efZCnu3aOU4AtR2V
 ohZ/6vAlRC1PjT1vcPl7tzuVtMNc9EjI9zJ3XtpKSkitlk6Vg50ScKjQpWSGR7WI
 Ke7Pnl/HFnb3rqKggv/l3EzLWDjuxKgZoAlBBhwUDuPKLviapMpiqRJuZzHZB2qE
 BKKtfbfgVlAhKLqs9z7QonnWDvnnv4BowQLP3jzsr+Km+QTaLuaMMoMTOzZafNwM
 rZeTRP8NxIID7kUxAT5MT8dRqldmGH6TamIk7ggfJCvdnpWokIY4142p4SCND5Bv
 cT0v0N6MCxhOue2jjjMKayFIPTUEuT70LCgNgF44wY/ke/1/1n7wH+SpnMS6fEJ9
 OL1+KckZlvq2q5Oq+GUqI97pZx7lRY3Lv4UwVytoDHbWRjOZ+IlEc7Zht0TjJdX4
 TZSImUsBtqJZqW5/gfIyizG0oce6OqtnJ/wzev3LE1bDVq6ldP2Prlk00RhZYKFs
 PD1akdql0D3JJyODFP/iyiCbScX8JDIlKO/WsgQEgejA38T7Vzm7zIKw2oXz3vmT
 /EYIg4FZ9IcBv2B4zkng0tWvxI/lLO9sqZGS/7bwtKI9KCvNnLJcMBNKd8OjP6bp
 bK6wIi83DNOmmRzcgAFpe0UtH1dHQE1Gu0QWwkKfxQgfM8CEoTL5GF3Zl0Uh42/A
 6Uf9IV0gYxBM8BxvwL9n
 =Oq0j
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Kalle Valo 2016-09-01 17:11:42 +03:00
commit a9840c46ff
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.c
View File

@ -960,5 +960,6 @@ int iwl_mvm_start_fw_dbg_conf(struct iwl_mvm *mvm, u8 conf_id)
}
mvm->fw_dbg_conf = conf_id;
return ret;
return 0;
}

3
drivers/net/wireless/intel/iwlwifi/mvm/fw-dbg.h
View File

@ -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

1
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
View File

@ -624,6 +624,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
hw->wiphy->features |= NL80211_FEATURE_P2P_GO_CTWIN |
NL80211_FEATURE_LOW_PRIORITY_SCAN |
NL80211_FEATURE_P2P_GO_OPPPS |
NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE |
NL80211_FEATURE_DYNAMIC_SMPS |
NL80211_FEATURE_STATIC_SMPS |
NL80211_FEATURE_SUPPORTS_WMM_ADMISSION;

2
drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
View File

@ -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;
}