]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
wifi: ath12k: Clear auth flag only for actual association in security mode
authorThiraviyam Mariyappan <thiraviyam.mariyappan@oss.qualcomm.com>
Sun, 8 Jun 2025 14:56:51 +0000 (20:26 +0530)
committerJeff Johnson <jeff.johnson@oss.qualcomm.com>
Thu, 26 Jun 2025 23:10:49 +0000 (16:10 -0700)
When setting a new bitrate, WMI peer association command is sent from
the host without the peer authentication bit set in peer_flags for
security mode, which causes ping failure.

The firmware handles peer_flags when the client is associating, as the
peer authentication bit in peer_flags is set after the key exchange.
When the WMI peer association command is sent from the host to update
the new bitrate for an associated STA, the firmware expects the WMI
peer authentication bit to be set in peer_flags.

Fix this issue by ensuring that the WMI peer auth bit is set in
peer_flags in WMI peer association command when updating the new
bitrate.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.4.1-00199-QCAHKSWPL_SILICONZ-1

Fixes: d889913205cf ("wifi: ath12k: driver for Qualcomm Wi-Fi 7 devices")
Signed-off-by: Thiraviyam Mariyappan <thiraviyam.mariyappan@oss.qualcomm.com>
Signed-off-by: Ramasamy Kaliappan <ramasamy.kaliappan@oss.qualcomm.com>
Link: https://patch.msgid.link/20250608145651.1735236-1-ramasamy.kaliappan@oss.qualcomm.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>
drivers/net/wireless/ath/ath12k/mac.c
drivers/net/wireless/ath/ath12k/wmi.c

index 1b9dd3ac280fd5d5d71c8239f9d553346380127f..f565db7b7b441d4cbc35b75c619753b66c0da8d4 100644 (file)
@@ -3250,6 +3250,7 @@ static void ath12k_bss_assoc(struct ath12k *ar,
 
        rcu_read_unlock();
 
+       peer_arg->is_assoc = true;
        ret = ath12k_wmi_send_peer_assoc_cmd(ar, peer_arg);
        if (ret) {
                ath12k_warn(ar->ab, "failed to run peer assoc for %pM vdev %i: %d\n",
@@ -5354,6 +5355,8 @@ static int ath12k_mac_station_assoc(struct ath12k *ar,
                            "invalid peer NSS %d\n", peer_arg->peer_nss);
                return -EINVAL;
        }
+
+       peer_arg->is_assoc = true;
        ret = ath12k_wmi_send_peer_assoc_cmd(ar, peer_arg);
        if (ret) {
                ath12k_warn(ar->ab, "failed to run peer assoc for STA %pM vdev %i: %d\n",
@@ -5600,6 +5603,7 @@ static void ath12k_sta_rc_update_wk(struct wiphy *wiphy, struct wiphy_work *wk)
                        ath12k_peer_assoc_prepare(ar, arvif, arsta,
                                                  peer_arg, true);
 
+                       peer_arg->is_assoc = false;
                        err = ath12k_wmi_send_peer_assoc_cmd(ar, peer_arg);
                        if (err)
                                ath12k_warn(ar->ab, "failed to run peer assoc for STA %pM vdev %i: %d\n",
index 12bea62dc3d047108b6fc55619e0ed63b3f455a2..d6efbea2e724402063b79c237035ff83dd7642b0 100644 (file)
@@ -2152,7 +2152,7 @@ static void ath12k_wmi_copy_peer_flags(struct wmi_peer_assoc_complete_cmd *cmd,
                cmd->peer_flags |= cpu_to_le32(WMI_PEER_AUTH);
        if (arg->need_ptk_4_way) {
                cmd->peer_flags |= cpu_to_le32(WMI_PEER_NEED_PTK_4_WAY);
-               if (!hw_crypto_disabled)
+               if (!hw_crypto_disabled && arg->is_assoc)
                        cmd->peer_flags &= cpu_to_le32(~WMI_PEER_AUTH);
        }
        if (arg->need_gtk_2_way)