| Message ID | 20231127180425.1695427-1-nico.escande@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | wifi: ath12k: fix layout of scan_flags in struct ath12k_wmi_scan_req_arg | expand |
On 11/27/2023 10:04 AM, Nicolas Escande wrote: > There is a layout mismatch between the bitfield representing scan_flags in > struct ath12k_wmi_scan_req_arg & the bits as defined in the WMI_SCAN_XXX > macros. Fix it by making the biefield match de #define values. > > I especialy checked by adding WMI_SCAN_FLAG_FORCE_ACTIVE_ON_DFS to > scan_flags and the firmware started to unconditionnaly send probe request > on DFS channels during scan. > > Tested-on: QCN9274 hw2.0 PCI CI_WLAN.WBE.1.2.1-00148.1-QCAHKSWPL_SILICONZ-7 > > Signed-off-by: Nicolas Escande <nico.escande@gmail.com> > --- > drivers/net/wireless/ath/ath12k/wmi.h | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/ath/ath12k/wmi.h > index 629373d67421..2b5b46f8898e 100644 > --- a/drivers/net/wireless/ath/ath12k/wmi.h > +++ b/drivers/net/wireless/ath/ath12k/wmi.h > @@ -3307,17 +3307,17 @@ struct ath12k_wmi_scan_req_arg { > scan_f_filter_prb_req:1, > scan_f_bypass_dfs_chn:1, > scan_f_continue_on_err:1, > + scan_f_promisc_mode: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_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, +ath12k mailing list Repeating my same message from the ath11k patch: You are convoluting two different data structures. struct ath12k_wmi_scan_req_arg is used to represent a scan request within the host driver. This does not use the WMI_SCAN_XXX macros. struct wmi_start_scan_cmd is used to represent the scan request command sent to firmware. This struct uses the WMI_SCAN_XXX macros to fill some members of this struct in ath12k_wmi_copy_scan_event_cntrl_flags(). So your change has no effect on the driver operation and incorrectly tries to foist the firmware definition upon the host internal representation. So NAK to this patch. /jeff
diff --git a/drivers/net/wireless/ath/ath12k/wmi.h b/drivers/net/wireless/ath/ath12k/wmi.h index 629373d67421..2b5b46f8898e 100644 --- a/drivers/net/wireless/ath/ath12k/wmi.h +++ b/drivers/net/wireless/ath/ath12k/wmi.h @@ -3307,17 +3307,17 @@ struct ath12k_wmi_scan_req_arg { scan_f_filter_prb_req:1, scan_f_bypass_dfs_chn:1, scan_f_continue_on_err:1, + scan_f_promisc_mode: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_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,
There is a layout mismatch between the bitfield representing scan_flags in struct ath12k_wmi_scan_req_arg & the bits as defined in the WMI_SCAN_XXX macros. Fix it by making the biefield match de #define values. I especialy checked by adding WMI_SCAN_FLAG_FORCE_ACTIVE_ON_DFS to scan_flags and the firmware started to unconditionnaly send probe request on DFS channels during scan. Tested-on: QCN9274 hw2.0 PCI CI_WLAN.WBE.1.2.1-00148.1-QCAHKSWPL_SILICONZ-7 Signed-off-by: Nicolas Escande <nico.escande@gmail.com> --- drivers/net/wireless/ath/ath12k/wmi.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)