linux-kernel - Re: [PATCH 0/4] wifi: ath12k: add MLO CSA support

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <4629864f-010f-4524-8861-1381f4b18614@oss.qualcomm.com>
Date: Thu, 23 Jan 2025 09:50:30 -0800
From: Jeff Johnson <jeff.johnson@....qualcomm.com>
To: Aditya Kumar Singh <quic_adisi@...cinc.com>,
        Kalle Valo
 <kvalo@...nel.org>, Jeff Johnson <jjohnson@...nel.org>
Cc: linux-wireless@...r.kernel.org, ath12k@...ts.infradead.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH 0/4] wifi: ath12k: add MLO CSA support

On 12/23/2024 8:21 AM, Aditya Kumar Singh wrote:
> Patch 1 and 2 are pre-req fixes (applies to non-MLO as well)
> 
> Patch 3 basically uses arvif->link_id to enable MLO for CSA while adding
> support to update counters throughout the CSA time.
> 
> Patch 4 fixes a potential problem seen when medium is busy. Again this
> applies to both MLO and non-MLO. But this is exposed only when Patch 3 is
> there.
> 
> ---
> Aditya Kumar Singh (4):
>       wifi: ath12k: update beacon template function to use arvif structure
>       wifi: ath12k: fix handling of CSA offsets in beacon template command
>       wifi: ath12k: update the latest CSA counter
>       wifi: ath12k: prevent CSA counter to reach 0 and hit WARN_ON_ONCE
> 
>  drivers/net/wireless/ath/ath12k/core.h |  2 ++
>  drivers/net/wireless/ath/ath12k/mac.c  |  7 ++--
>  drivers/net/wireless/ath/ath12k/mac.h  |  1 +
>  drivers/net/wireless/ath/ath12k/wmi.c  | 61 +++++++++++++++++++++++++++-------
>  drivers/net/wireless/ath/ath12k/wmi.h  |  2 +-
>  5 files changed, 56 insertions(+), 17 deletions(-)
> ---
> base-commit: 09fa3b6974a1245ddd0751747609431494ba5b4f
> change-id: 20241217-ath12k_mlo_csa-35bd512a05ae

fails to apply to current ath/main

* Applying 20241223_quic_adisi_wifi_ath12k_add_mlo_csa_support.mbx 
Applying: wifi: ath12k: update beacon template function to use arvif structure
Applying: wifi: ath12k: fix handling of CSA offsets in beacon template command
Using index info to reconstruct a base tree...
M       drivers/net/wireless/ath/ath12k/mac.c
M       drivers/net/wireless/ath/ath12k/mac.h
M       drivers/net/wireless/ath/ath12k/wmi.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/wireless/ath/ath12k/wmi.c
Auto-merging drivers/net/wireless/ath/ath12k/mac.h
CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath12k/mac.h
Auto-merging drivers/net/wireless/ath/ath12k/mac.c
Recorded preimage for 'drivers/net/wireless/ath/ath12k/mac.h'
error: Failed to merge in the changes.
Patch failed at 0002 wifi: ath12k: fix handling of CSA offsets in beacon template command