Commit c802b6d7 authored by Rameshkumar Sundaram's avatar Rameshkumar Sundaram Committed by Kalle Valo
Browse files

ath11k: Clear auth flag only for actual association in security mode 



AUTH flag is needed when peer assoc command is sent from host in
security mode for non-assoc cases. Firmware will handle AUTH flag
when client is associating as AUTH flag will be set after key exchange.
For internally provided peer assoc commands from host, there won't be
any key exchange, so AUTH flag is expected to be set in host.

Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.4.0.1-01838-QCAHKSWPL_SILICONZ-1

Co-developed-by: default avatarLavanya Suresh <lavaks@codeaurora.org>
Signed-off-by: default avatarLavanya Suresh <lavaks@codeaurora.org>
Signed-off-by: default avatarRameshkumar Sundaram <quic_ramess@quicinc.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1635177786-20854-1-git-send-email-quic_ramess@quicinc.com
parent 16a2c3d5

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

+3 −0
Original line number Diff line number Diff line
@@ -2495,6 +2495,7 @@ static void ath11k_bss_assoc(struct ieee80211_hw *hw, 


	rcu_read_unlock();



	peer_arg.is_assoc = true;

	ret = ath11k_wmi_send_peer_assoc_cmd(ar, &peer_arg);

	if (ret) {

		ath11k_warn(ar->ab, "failed to run peer assoc for %pM vdev %i: %d\n",
@@ -3772,6 +3773,7 @@ static int ath11k_station_assoc(struct ath11k *ar, 


	ath11k_peer_assoc_prepare(ar, vif, sta, &peer_arg, reassoc);



	peer_arg.is_assoc = true;

	ret = ath11k_wmi_send_peer_assoc_cmd(ar, &peer_arg);

	if (ret) {

		ath11k_warn(ar->ab, "failed to run peer assoc for STA %pM vdev %i: %d\n",
@@ -3983,6 +3985,7 @@ static void ath11k_sta_rc_update_wk(struct work_struct *wk) 
			ath11k_peer_assoc_prepare(ar, arvif->vif, sta,

						  &peer_arg, true);



			peer_arg.is_assoc = false;

			err = ath11k_wmi_send_peer_assoc_cmd(ar, &peer_arg);

			if (err)

				ath11k_warn(ar->ab, "failed to run peer assoc for STA %pM vdev %i: %d\n",

drivers/net/wireless/ath/ath11k/wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -1763,7 +1763,7 @@ ath11k_wmi_copy_peer_flags(struct wmi_peer_assoc_complete_cmd *cmd, 
		cmd->peer_flags |= WMI_PEER_AUTH;

	if (param->need_ptk_4_way) {

		cmd->peer_flags |= WMI_PEER_NEED_PTK_4_WAY;

		if (!hw_crypto_disabled)

		if (!hw_crypto_disabled && param->is_assoc)

			cmd->peer_flags &= ~WMI_PEER_AUTH;

	}

	if (param->need_gtk_2_way)

drivers/net/wireless/ath/ath11k/wmi.h

+1 −0
Original line number Diff line number Diff line
@@ -3617,6 +3617,7 @@ struct peer_assoc_params { 
	u32 peer_he_tx_mcs_set[WMI_HOST_MAX_HE_RATE_SET];

	bool twt_responder;

	bool twt_requester;

	bool is_assoc;

	struct ath11k_ppe_threshold peer_ppet;

};