]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: ath12k: delete NSS and TX power setting for monitor vdev
authorKang Yang <quic_kangyang@quicinc.com>
Tue, 22 Oct 2024 11:08:29 +0000 (19:08 +0800)
committerJeff Johnson <quic_jjohnson@quicinc.com>
Wed, 23 Oct 2024 17:16:01 +0000 (10:16 -0700)
ath12k_mac_monitor_vdev_create() will set NSS and TX power to
firmware for monitor vdev.

But firmware doesn't need them for monitor mode.

So delete them as a cleanup.

Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3
Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1

Signed-off-by: Kang Yang <quic_kangyang@quicinc.com>
Link: https://patch.msgid.link/20241022110831.974-7-quic_kangyang@quicinc.com
Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
drivers/net/wireless/ath/ath12k/mac.c

index f5f96a8b1d61182473cc51280e25e657c64f5d49..67b2131136f012136aedb1f224a5ef7577cbe5d6 100644 (file)
@@ -1091,7 +1091,6 @@ static int ath12k_mac_monitor_vdev_create(struct ath12k *ar)
        struct ath12k_wmi_vdev_create_arg arg = {};
        int bit, ret;
        u8 tmp_addr[6];
-       u16 nss;
 
        lockdep_assert_wiphy(ath12k_ar_to_hw(ar)->wiphy);
 
@@ -1131,19 +1130,6 @@ static int ath12k_mac_monitor_vdev_create(struct ath12k *ar)
                return ret;
        }
 
-       nss = hweight32(ar->cfg_tx_chainmask) ? : 1;
-       ret = ath12k_wmi_vdev_set_param_cmd(ar, ar->monitor_vdev_id,
-                                           WMI_VDEV_PARAM_NSS, nss);
-       if (ret) {
-               ath12k_warn(ar->ab, "failed to set vdev %d chainmask 0x%x, nss %d :%d\n",
-                           ar->monitor_vdev_id, ar->cfg_tx_chainmask, nss, ret);
-               return ret;
-       }
-
-       ret = ath12k_mac_txpower_recalc(ar);
-       if (ret)
-               return ret;
-
        ar->allocated_vdev_map |= 1LL << ar->monitor_vdev_id;
        ar->ab->free_vdev_map &= ~(1LL << ar->monitor_vdev_id);
        ar->num_created_vdevs++;