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

Commit 2cdce425 authored by Mohammed Shafi Shajakhan's avatar Mohammed Shafi Shajakhan Committed by Kalle Valo
Browse files

ath10k: Fix broken NULL func data frame status for 10.4 



Older firmware with HTT delivers incorrect tx status for null func
frames to driver, but this fixed in 10.2 and 10.4 firmware versions.
Also this workaround results in reporting of incorrect null func status
for 10.4. Fix this is by introducing a firmware feature flag for 10.4
so that this workaround is skipped and proper tx status for null func
frames are reported

Signed-off-by: default avatarTamizh chelvam <c_traja@qti.qualcomm.com>
Signed-off-by: default avatarMohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 749bc03a

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

+1 −0
Original line number Diff line number Diff line
@@ -308,6 +308,7 @@ static const char *const ath10k_core_fw_feature_str[] = { 
	[ATH10K_FW_FEATURE_MFP_SUPPORT] = "mfp",

	[ATH10K_FW_FEATURE_PEER_FLOW_CONTROL] = "peer-flow-ctrl",

	[ATH10K_FW_FEATURE_BTCOEX_PARAM] = "btcoex-param",

	[ATH10K_FW_FEATURE_SKIP_NULL_FUNC_WAR] = "skip-null-func-war",

};



static unsigned int ath10k_core_get_fw_feature_str(char *buf,

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

+7 −0
Original line number Diff line number Diff line
@@ -552,6 +552,13 @@ enum ath10k_fw_features { 
	 */

	ATH10K_FW_FEATURE_BTCOEX_PARAM = 14,



	/* Older firmware with HTT delivers incorrect tx status for null func

	 * frames to driver, but this fixed in 10.2 and 10.4 firmware versions.

	 * Also this workaround results in reporting of incorrect null func

	 * status for 10.4. This flag is used to skip the workaround.

	 */

	ATH10K_FW_FEATURE_SKIP_NULL_FUNC_WAR = 15,



	/* keep last */

	ATH10K_FW_FEATURE_COUNT,

};

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

+2 −0
Original line number Diff line number Diff line
@@ -3255,6 +3255,8 @@ ath10k_mac_tx_h_get_txmode(struct ath10k *ar, 
	if (ar->htt.target_version_major < 3 &&

	    (ieee80211_is_nullfunc(fc) || ieee80211_is_qos_nullfunc(fc)) &&

	    !test_bit(ATH10K_FW_FEATURE_HAS_WMI_MGMT_TX,

		      ar->running_fw->fw_file.fw_features) &&

	    !test_bit(ATH10K_FW_FEATURE_SKIP_NULL_FUNC_WAR,

		      ar->running_fw->fw_file.fw_features))

		return ATH10K_HW_TXRX_MGMT;