[PATCH v6 0/3] wifi: ath12k: monitor mode cleanup and state handling

[Kang Yang]

On 4/15/2025 7:13 AM, Jeff Johnson wrote:
> On 1/6/2025 6:56 PM, Kang Yang wrote:
>> This patch-set do some cleanup and handle state variables correctly for
>> monitor mode.
>>
>> Note: The quantity of this patch set was 11 in the previous version. 8
>> of them were merged:
>> https://patchwork.kernel.org/project/linux-wireless/cover/20241022110831.974-1-quic_kangyang@quicinc.com/
>>
>> v6: update copyright for each patch.
>> v5: rebase on tag: ath/main(ath-202412191756).
>> v4: rebase on tag: ath/main(ath-202410161539).
>> v3: rebase on tag: ath/main(ath-202410111606).
>> v2: rebase on tag: ath-202410072115.
>>
>> Kang Yang (3):
>>    wifi: ath12k: optimize storage size for struct ath12k
>>    wifi: ath12k: properly handling the state variables of monitor mode
>>    wifi: ath12k: delete mon reap timer
>>
>>   drivers/net/wireless/ath/ath12k/core.c |  7 +++++-
>>   drivers/net/wireless/ath/ath12k/core.h | 27 +++++++++++------------
>>   drivers/net/wireless/ath/ath12k/dp.c   | 30 +-------------------------
>>   drivers/net/wireless/ath/ath12k/mac.c  | 13 ++++++++++-
>>   4 files changed, 32 insertions(+), 45 deletions(-)
>>
>>
>> base-commit: 09fa3b6974a1245ddd0751747609431494ba5b4f
> 
> If these changes are still applicable, can you please rebase?
> 
> Applying: wifi: ath12k: optimize storage size for struct ath12k
> Using index info to reconstruct a base tree...
> M       drivers/net/wireless/ath/ath12k/core.h
> Falling back to patching base and 3-way merge...
> Auto-merging drivers/net/wireless/ath/ath12k/core.h
> CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath12k/core.h
> Recorded preimage for 'drivers/net/wireless/ath/ath12k/core.h'
> error: Failed to merge in the changes.
> Patch failed at 0001 wifi: ath12k: optimize storage size for struct ath12k

Patch 1 just optimize storage size for struct ath12k. Seems not 
necessary, will drop.
Patch 2 already done by Karthikeyan Periyasamy, will drop.

Will send patch 3 on latest tag.


>