wifi: ath11k: Remove scan_flags union from struct scan_req_params

Now that we do not use scan_flags directly with WMI_SCAN_XXX macros anymore but
only the bitfield scan_f_xxx, lets remove the scan_flags & the underlying union.

This will prevent further problems as some entries in the scan_f_xxx bitfield
don't match their corresponding WMI_SCAN_XXX flags as seen in [1]

[1] https://lore.kernel.org/all/20231127180559.1696041-1-nico.escande@gmail.com/

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/20240209113536.266822-3-nico.escande@gmail.com

diff --git a/drivers/net/wireless/ath/ath11k/wmi.h b/drivers/net/wireless/ath/ath11k/wmi.h
index 6dcd147005708893d6dacb29f743622e03c0acfb..bc7adf7f13fb87880ea70777823fed64f75f3d8c 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/wmi.h
+++ b/drivers/net/wireless/ath/ath11k/wmi.h
@@ -3394,36 +3394,31 @@ struct scan_req_params {
        u32 idle_time;
        u32 max_scan_time;
        u32 probe_delay;
-       union {
-               struct {
-                       u32 scan_f_passive:1,
-                           scan_f_bcast_probe:1,
-                           scan_f_cck_rates:1,
-                           scan_f_ofdm_rates:1,
-                           scan_f_chan_stat_evnt:1,
-                           scan_f_filter_prb_req:1,
-                           scan_f_bypass_dfs_chn:1,
-                           scan_f_continue_on_err:1,
-                           scan_f_offchan_mgmt_tx:1,
-                           scan_f_offchan_data_tx:1,
-                           scan_f_promisc_mode:1,
-                           scan_f_capture_phy_err:1,
-                           scan_f_strict_passive_pch:1,
-                           scan_f_half_rate:1,
-                           scan_f_quarter_rate:1,
-                           scan_f_force_active_dfs_chn:1,
-                           scan_f_add_tpc_ie_in_probe:1,
-                           scan_f_add_ds_ie_in_probe:1,
-                           scan_f_add_spoofed_mac_in_probe:1,
-                           scan_f_add_rand_seq_in_probe:1,
-                           scan_f_en_ie_whitelist_in_probe:1,
-                           scan_f_forced:1,
-                           scan_f_2ghz:1,
-                           scan_f_5ghz:1,
-                           scan_f_80mhz:1;
-               };
-               u32 scan_flags;
-       };
+       u32 scan_f_passive:1,
+           scan_f_bcast_probe:1,
+           scan_f_cck_rates:1,
+           scan_f_ofdm_rates:1,
+           scan_f_chan_stat_evnt:1,
+           scan_f_filter_prb_req:1,
+           scan_f_bypass_dfs_chn:1,
+           scan_f_continue_on_err:1,
+           scan_f_offchan_mgmt_tx:1,
+           scan_f_offchan_data_tx:1,
+           scan_f_promisc_mode:1,
+           scan_f_capture_phy_err:1,
+           scan_f_strict_passive_pch:1,
+           scan_f_half_rate:1,
+           scan_f_quarter_rate:1,
+           scan_f_force_active_dfs_chn:1,
+           scan_f_add_tpc_ie_in_probe:1,
+           scan_f_add_ds_ie_in_probe:1,
+           scan_f_add_spoofed_mac_in_probe:1,
+           scan_f_add_rand_seq_in_probe:1,
+           scan_f_en_ie_whitelist_in_probe:1,
+           scan_f_forced:1,
+           scan_f_2ghz:1,
+           scan_f_5ghz:1,
+           scan_f_80mhz:1;
        enum scan_dwelltime_adaptive_mode adaptive_dwell_time_mode;
        u32 burst_duration;
        u32 num_chan;