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

Commit 17a7b16d authored by Aarthi Thiruvengadam's avatar Aarthi Thiruvengadam Committed by Kalle Valo
Browse files

ath6kl: Fix merge error in ath6kl_set_ies() 



Portion of the commit id 080eec4f ("ath6kl: Clear the IE in firmware
if not set") was overwritten by mistake due to a merge
conflict. This patch fixes the code back to how it should be.

kvalo: more details to the commit log

Signed-off-by: default avatarAarthi Thiruvengadam <athiruve@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent b51f92e0

drivers/net/wireless/ath/ath6kl/cfg80211.c

+21 −24
Original line number Diff line number Diff line
@@ -2366,30 +2366,27 @@ static int ath6kl_set_ies(struct ath6kl_vif *vif, 
	struct ath6kl *ar = vif->ar;

	int res;



	if (info->beacon_ies) {

	/* this also clears IE in fw if it's not set */

	res = ath6kl_wmi_set_appie_cmd(ar->wmi, vif->fw_vif_idx,

				       WMI_FRAME_BEACON,

				       info->beacon_ies,

				       info->beacon_ies_len);

	if (res)

		return res;

	}



	if (info->proberesp_ies) {

	/* this also clears IE in fw if it's not set */

	res = ath6kl_set_ap_probe_resp_ies(vif, info->proberesp_ies,

					   info->proberesp_ies_len);

	if (res)

		return res;

	}



	if (info->assocresp_ies) {

	/* this also clears IE in fw if it's not set */

	res = ath6kl_wmi_set_appie_cmd(ar->wmi, vif->fw_vif_idx,

				       WMI_FRAME_ASSOC_RESP,

				       info->assocresp_ies,

				       info->assocresp_ies_len);

	if (res)

		return res;

	}



	return 0;

}