From: Peter Oh Date: Thu, 3 Dec 2015 17:50:55 +0000 (-0800) Subject: ath10k: allow Mesh Point to install peer security key X-Git-Tag: android-x86-7.1-r1~1864^2~401^2~35^2 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7c97b72a623cf7f7cfede9caed531b2679556cca;p=android-x86%2Fkernel.git ath10k: allow Mesh Point to install peer security key Mesh Point requires peer security key install when running in secured mode since it's a type of peer links, otherwise peer link will be removed due to key install failure. MFP feature set is required to run Mesh in secured mode and QCA988X firmware, 10.2.4.70.14-2 and above, is the only one supporting secured Mesh at this moment. Signed-off-by: Peter Oh Signed-off-by: Kalle Valo --- diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 8ae5216fd188..a4c5c1de3806 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -250,7 +250,8 @@ static int ath10k_install_peer_wep_keys(struct ath10k_vif *arvif, lockdep_assert_held(&ar->conf_mutex); if (WARN_ON(arvif->vif->type != NL80211_IFTYPE_AP && - arvif->vif->type != NL80211_IFTYPE_ADHOC)) + arvif->vif->type != NL80211_IFTYPE_ADHOC && + arvif->vif->type != NL80211_IFTYPE_MESH_POINT)) return -EINVAL; spin_lock_bh(&ar->data_lock);