]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
wifi: ath12k: remove invalid peer create logic
authorKang Yang <quic_kangyang@quicinc.com>
Mon, 29 Apr 2024 08:15:25 +0000 (16:15 +0800)
committerKalle Valo <quic_kvalo@quicinc.com>
Tue, 7 May 2024 10:18:24 +0000 (13:18 +0300)
In ath12k_mac_op_assign_vif_chanctx(), there is a logic to
create peer using ar->mac_addr for a STA vdev. This is invalid
because a STA vdev should have a peer created using AP's
MAC address. Besides, if we run into that logic, it means a peer
has already been created earlier, we should not create it again.
So remove it.

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3

Signed-off-by: Kang Yang <quic_kangyang@quicinc.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20240429081525.983-6-quic_kangyang@quicinc.com
drivers/net/wireless/ath/ath12k/mac.c

index 1fc727b614d6616cb1ff08cf6eb23233e4373591..96dc5c2e096fbf4e0c1b383b968a5a502954b17e 100644 (file)
@@ -7270,7 +7270,6 @@ ath12k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,
        struct ath12k_base *ab;
        struct ath12k_vif *arvif = ath12k_vif_to_arvif(vif);
        int ret;
-       struct ath12k_wmi_peer_create_arg param;
 
        /* For multi radio wiphy, the vdev was not created during add_interface
         * create now since we have a channel ctx now to assign to a specific ar/fw
@@ -7306,21 +7305,6 @@ ath12k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw,
                goto out;
        }
 
-       if (ab->hw_params->vdev_start_delay &&
-           arvif->vdev_type != WMI_VDEV_TYPE_AP &&
-           arvif->vdev_type != WMI_VDEV_TYPE_MONITOR) {
-               param.vdev_id = arvif->vdev_id;
-               param.peer_type = WMI_PEER_TYPE_DEFAULT;
-               param.peer_addr = ar->mac_addr;
-
-               ret = ath12k_peer_create(ar, arvif, NULL, &param);
-               if (ret) {
-                       ath12k_warn(ab, "failed to create peer after vdev start delay: %d",
-                                   ret);
-                       goto out;
-               }
-       }
-
        if (arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) {
                ret = ath12k_mac_monitor_start(ar);
                if (ret)