Re: [PATCH ath-next v2 0/2] wifi: ath12k: handle scan vdev consistently

[Jeff Johnson]

On 4/10/2025 8:16 PM, Aditya Kumar Singh wrote:
> This series of patches addresses the handling of scan links in the ath12k
> driver to improve consistency and functionality. The changes ensure that
> link ID 15 is correctly used for scan operations across both ML and non-ML
> interfaces. Additionally, the patches prevent scan failures by fetching
> link_conf only when the link ID is valid and setting appropriate default
> values for scan vdevs.
> 
> Currently, no issues have been observed; these changes are intended as a
> cleanup and to ensure proper handling. For split-mac these changes are
> pre-req change.
> 
> ---
> Changes in v2:
> - CCed linux-wireless list as well.
> - No other changes.
> 
> ---
> Aditya Kumar Singh (2):
>       wifi: ath12k: handle scan link during vdev create
>       wifi: ath12k: Use scan link ID 15 for all scan operations
> 
>  drivers/net/wireless/ath/ath12k/mac.c | 55 ++++++++++++++++-------------------
>  1 file changed, 25 insertions(+), 30 deletions(-)
> ---
> base-commit: 1a7000fb8348e04ab486513d6ebd4b6074a94be2
> change-id: 20250402-fix_scan_vdev_handling-ef5be452b949
> 

This now needs to be rebased...

Applying: wifi: ath12k: handle scan link during vdev create
Applying: wifi: ath12k: Use scan link ID 15 for all scan operations
Using index info to reconstruct a base tree...
M       drivers/net/wireless/ath/ath12k/mac.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/ath/ath12k/mac.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath12k/mac.c
Recorded preimage for 'drivers/net/wireless/ath/ath12k/mac.c'
error: Failed to merge in the changes.
Patch failed at 0002 wifi: ath12k: Use scan link ID 15 for all scan operations