Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9840c46 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-for-kalle-2016-08-29' of... 

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
parents bb87f02b a904a08b

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

+2 −1
Original line number Diff line number Diff line
@@ -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;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+2 −0
Original line number Diff line number Diff line
@@ -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;

}