wifi: ath12k: Do not use scan_flags from struct ath12k_wmi_scan_req_arg

As discussed in [1] to fix the mismatch between the WMI_SCAN_XXX macros &
their corresponding scan_f_xxx bitfield equivalent, lets stop using the
scan_flags in the union altogether.

[1] https://lore.kernel.org/all/4be7d62e-cb59-462d-aac2-94e27efc22ff@quicinc.com/

Tested-on: QCN9274 hw2.0 PCI CI_WLAN.WBE.1.3-02907.1-QCAHKSWPL_SILICONZ-10

Signed-off-by: Nicolas Escande <nico.escande@gmail.com>
Acked-by: Jeff Johnson <quic_jjohnson@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://msgid.link/20240211145548.1939610-2-nico.escande@gmail.com

diff --git a/drivers/net/wireless/ath/ath12k/mac.c b/drivers/net/wireless/ath/ath12k/mac.c
index a737a09a0b9c2e742e482cda8dde4a5827651476..7d3f5321a36df7b74c212fcf3450a18eb6eaf338 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -3201,7 +3201,7 @@ static int ath12k_mac_op_hw_scan(struct ieee80211_hw *hw,
                for (i = 0; i < arg.num_ssids; i++)
                        arg.ssid[i] = req->ssids[i];
        } else {
-               arg.scan_flags |= WMI_SCAN_FLAG_PASSIVE;
+               arg.scan_f_passive = 1;
        }
 
        if (req->n_channels) {
@@ -7555,7 +7555,7 @@ static int ath12k_mac_op_remain_on_channel(struct ieee80211_hw *hw,
        arg.dwell_time_active = scan_time_msec;
        arg.dwell_time_passive = scan_time_msec;
        arg.max_scan_time = scan_time_msec;
-       arg.scan_flags |= WMI_SCAN_FLAG_PASSIVE;
+       arg.scan_f_passive = 1;
        arg.burst_duration = duration;
 
        ret = ath12k_start_scan(ar, &arg);

diff --git a/drivers/net/wireless/ath/ath12k/wmi.c b/drivers/net/wireless/ath/ath12k/wmi.c
index 84d7d6584fba7d5b33a7bc2a609f3919d552c679..2c2a010d88df07d6fd24e0db2d95f2297d3819e6 100644 (file)
--- a/drivers/net/wireless/ath/ath12k/wmi.c
+++ b/drivers/net/wireless/ath/ath12k/wmi.c
@@ -2194,7 +2194,7 @@ void ath12k_wmi_start_scan_init(struct ath12k *ar,
                                  WMI_SCAN_EVENT_BSS_CHANNEL |
                                  WMI_SCAN_EVENT_FOREIGN_CHAN |
                                  WMI_SCAN_EVENT_DEQUEUED;
-       arg->scan_flags |= WMI_SCAN_CHAN_STAT_EVENT;
+       arg->scan_f_chan_stat_evnt = 1;
        arg->num_bssid = 1;
 
        /* fill bssid_list[0] with 0xff, otherwise bssid and RA will be