wifi: ath12k: rename CAC_RUNNING flag

Rename the flag ATH12K_CAC_RUNNING to ATH12K_FLAG_CAC_RUNNING to correct
the naming inconsistency in the enum ath12k_dev_flags.

No functionality changes.

Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.3.1-00173-QCAHKSWPL_SILICONZ-1

Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
Acked-by: Kalle Valo <kvalo@kernel.org>
Link: https://patch.msgid.link/20241218-ath12k_mlo_dfs-v1-1-058e783bcfc7@quicinc.com
Signed-off-by: Jeff Johnson <jeff.johnson@oss.qualcomm.com>

diff --git a/drivers/net/wireless/ath/ath12k/core.h b/drivers/net/wireless/ath/ath12k/core.h
index b789b375b891c87a4c00374ba81ea12ef0f994f9..3dd01ad100c56d2b9330d9a963acba021e4d571b 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/core.h
+++ b/drivers/net/wireless/ath/ath12k/core.h
@@ -223,7 +223,7 @@ enum ath12k_hw_group_flags {
 };
 
 enum ath12k_dev_flags {
-       ATH12K_CAC_RUNNING,
+       ATH12K_FLAG_CAC_RUNNING,
        ATH12K_FLAG_CRASH_FLUSH,
        ATH12K_FLAG_RAW_MODE,
        ATH12K_FLAG_HW_CRYPTO_DISABLED,

diff --git a/drivers/net/wireless/ath/ath12k/dp_rx.c b/drivers/net/wireless/ath/ath12k/dp_rx.c
index 5c5a3aae393be52a241c048c5a60c57d1f8cea92..dad35bfd83f6271253361c618534933e83e7f7fb 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/dp_rx.c
+++ b/drivers/net/wireless/ath/ath12k/dp_rx.c
@@ -2632,7 +2632,7 @@ static void ath12k_dp_rx_process_received_packets(struct ath12k_base *ab,
                        continue;
                }
 
-               if (test_bit(ATH12K_CAC_RUNNING, &ar->dev_flags)) {
+               if (test_bit(ATH12K_FLAG_CAC_RUNNING, &ar->dev_flags)) {
                        dev_kfree_skb_any(msdu);
                        continue;
                }
@@ -3484,7 +3484,7 @@ ath12k_dp_process_rx_err_buf(struct ath12k *ar, struct hal_reo_dest_ring *desc,
                goto exit;
        }
 
-       if (test_bit(ATH12K_CAC_RUNNING, &ar->dev_flags)) {
+       if (test_bit(ATH12K_FLAG_CAC_RUNNING, &ar->dev_flags)) {
                dev_kfree_skb_any(msdu);
                goto exit;
        }
@@ -4037,7 +4037,7 @@ int ath12k_dp_rx_process_wbm_err(struct ath12k_base *ab,
                        continue;
                }
 
-               if (test_bit(ATH12K_CAC_RUNNING, &ar->dev_flags)) {
+               if (test_bit(ATH12K_FLAG_CAC_RUNNING, &ar->dev_flags)) {
                        dev_kfree_skb_any(msdu);
                        continue;
                }

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index 6f10813d937820476afe8084ec4030b8eb9548a0..095e9c91cc16b870fe179af9c265cb8fd56e8fc2 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -1323,8 +1323,8 @@ int ath12k_mac_vdev_stop(struct ath12k_link_vif *arvif)
        ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "vdev %pM stopped, vdev_id %d\n",
                   ahvif->vif->addr, arvif->vdev_id);
 
-       if (test_bit(ATH12K_CAC_RUNNING, &ar->dev_flags)) {
-               clear_bit(ATH12K_CAC_RUNNING, &ar->dev_flags);
+       if (test_bit(ATH12K_FLAG_CAC_RUNNING, &ar->dev_flags)) {
+               clear_bit(ATH12K_FLAG_CAC_RUNNING, &ar->dev_flags);
                ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "CAC Stopped for vdev %d\n",
                           arvif->vdev_id);
        }
@@ -7475,7 +7475,7 @@ static void ath12k_mac_stop(struct ath12k *ar)
                ath12k_err(ar->ab, "failed to clear rx_filter for monitor status ring: (%d)\n",
                           ret);
 
-       clear_bit(ATH12K_CAC_RUNNING, &ar->dev_flags);
+       clear_bit(ATH12K_FLAG_CAC_RUNNING, &ar->dev_flags);
 
        cancel_delayed_work_sync(&ar->scan.timeout);
        wiphy_work_cancel(ath12k_ar_to_hw(ar)->wiphy, &ar->scan.vdev_clean_wk);
@@ -8794,7 +8794,7 @@ ath12k_mac_vdev_start_restart(struct ath12k_link_vif *arvif,
        if (arvif->ahvif->vdev_type == WMI_VDEV_TYPE_AP &&
            chandef->chan->dfs_cac_ms &&
            chandef->chan->dfs_state == NL80211_DFS_USABLE) {
-               set_bit(ATH12K_CAC_RUNNING, &ar->dev_flags);
+               set_bit(ATH12K_FLAG_CAC_RUNNING, &ar->dev_flags);
                ath12k_dbg(ab, ATH12K_DBG_MAC,
                           "CAC Started in chan_freq %d for vdev %d\n",
                           arg.freq, arg.vdev_id);

diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c
index 562b0615ed065d094f5d7709cafeb22c41f02d17..d0ae7f142c11ab4720bf95c0c95990ff40bd2815 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wmi.c
+++ b/drivers/net/wireless/ath/ath12k/wmi.c
@@ -6212,7 +6212,7 @@ static void ath12k_mgmt_rx_event(struct ath12k_base *ab, struct sk_buff *skb)
                goto exit;
        }
 
-       if ((test_bit(ATH12K_CAC_RUNNING, &ar->dev_flags)) ||
+       if ((test_bit(ATH12K_FLAG_CAC_RUNNING, &ar->dev_flags)) ||
            (rx_ev.status & (WMI_RX_STATUS_ERR_DECRYPT |
                             WMI_RX_STATUS_ERR_KEY_CACHE_MISS |
                             WMI_RX_STATUS_ERR_CRC))) {