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

Commit 90eceb3b authored by Tamizh chelvam's avatar Tamizh chelvam Committed by Kalle Valo
Browse files

ath10k: set peer MFP flag in peer assoc command 



Set peer's management frame protection flag in peer assoc command,
this setting will enable/disable encrytion of management frames in fw.

Setting of this flag is based on whether MFP is enabled/disabled at STA
and a firmware feature flag ATH10K_FW_FEATURE_MFP_SUPPORT. This is because
only firmwares 10.1.561 and above have support for MFP.

Signed-off-by: default avatarTamizh chelvam <c_traja@qti.qualcomm.com>
Signed-off-by: default avatarManikanta pubbisetty <c_mpubbi@qti.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 3fab30f7

drivers/net/wireless/ath/ath10k/core.c

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ static const char *const ath10k_core_fw_feature_str[] = { 
	[ATH10K_FW_FEATURE_SUPPORTS_SKIP_CLOCK_INIT] = "skip-clock-init",

	[ATH10K_FW_FEATURE_RAW_MODE_SUPPORT] = "raw-mode",

	[ATH10K_FW_FEATURE_SUPPORTS_ADAPTIVE_CCA] = "adaptive-cca",

	[ATH10K_FW_FEATURE_MFP_SUPPORT] = "mfp",

};



static unsigned int ath10k_core_get_fw_feature_str(char *buf,

drivers/net/wireless/ath/ath10k/core.h

+3 −0
Original line number Diff line number Diff line
@@ -513,6 +513,9 @@ enum ath10k_fw_features { 
	/* Firmware Supports Adaptive CCA*/

	ATH10K_FW_FEATURE_SUPPORTS_ADAPTIVE_CCA = 11,



	/* Firmware supports management frame protection */

	ATH10K_FW_FEATURE_MFP_SUPPORT = 12,



	/* keep last */

	ATH10K_FW_FEATURE_COUNT,

};

drivers/net/wireless/ath/ath10k/htt_tx.c

+7 −0
Original line number Diff line number Diff line
@@ -477,6 +477,13 @@ int ath10k_htt_mgmt_tx(struct ath10k_htt *htt, struct sk_buff *msdu) 


	msdu_id = res;



	if ((ieee80211_is_action(hdr->frame_control) ||

	     ieee80211_is_deauth(hdr->frame_control) ||

	     ieee80211_is_disassoc(hdr->frame_control)) &&

	     ieee80211_has_protected(hdr->frame_control)) {

		skb_put(msdu, IEEE80211_CCMP_MIC_LEN);

	}



	txdesc = ath10k_htc_alloc_skb(ar, len);

	if (!txdesc) {

		res = -ENOMEM;

drivers/net/wireless/ath/ath10k/mac.c

+7 −1
Original line number Diff line number Diff line
@@ -1968,6 +1968,7 @@ static void ath10k_peer_assoc_h_basic(struct ath10k *ar, 


static void ath10k_peer_assoc_h_crypto(struct ath10k *ar,

				       struct ieee80211_vif *vif,

				       struct ieee80211_sta *sta,

				       struct wmi_peer_assoc_complete_arg *arg)

{

	struct ieee80211_bss_conf *info = &vif->bss_conf;
@@ -2009,6 +2010,11 @@ static void ath10k_peer_assoc_h_crypto(struct ath10k *ar, 
		ath10k_dbg(ar, ATH10K_DBG_WMI, "%s: wpa ie found\n", __func__);

		arg->peer_flags |= ar->wmi.peer_flags->need_gtk_2_way;

	}



	if (sta->mfp &&

	    test_bit(ATH10K_FW_FEATURE_MFP_SUPPORT, ar->fw_features)) {

		arg->peer_flags |= ar->wmi.peer_flags->pmf;

	}

}



static void ath10k_peer_assoc_h_rates(struct ath10k *ar,
@@ -2480,7 +2486,7 @@ static int ath10k_peer_assoc_prepare(struct ath10k *ar, 
	memset(arg, 0, sizeof(*arg));



	ath10k_peer_assoc_h_basic(ar, vif, sta, arg);

	ath10k_peer_assoc_h_crypto(ar, vif, arg);

	ath10k_peer_assoc_h_crypto(ar, vif, sta, arg);

	ath10k_peer_assoc_h_rates(ar, vif, sta, arg);

	ath10k_peer_assoc_h_ht(ar, vif, sta, arg);

	ath10k_peer_assoc_h_vht(ar, vif, sta, arg);