On 10/8/2024 12:35 AM, Kang Yang wrote: > This patch set does some fixes and clean up for monitor mode. > > v2: rebase on tag: ath-202410072115. > > Kang Yang (11): > wifi: ath12k: remove unused variable monitor_present > wifi: ath12k: optimize storage size for struct ath12k > wifi: ath12k: fix struct hal_rx_ppdu_end_user_stats > wifi: ath12k: fix struct hal_rx_ppdu_start > wifi: ath12k: fix struct hal_rx_phyrx_rssi_legacy_info > wifi: ath12k: fix struct hal_rx_mpdu_start > wifi: ath12k: properly handling the state variables of monitor mode > wifi: ath12k: delete NSS and TX power setting for monitor vdev > wifi: ath12k: use tail MSDU to get MSDU information > wifi: ath12k: fix A-MSDU indication in monitor mode > wifi: ath12k: delete mon reap timer > > drivers/net/wireless/ath/ath12k/core.c | 5 ++ > drivers/net/wireless/ath/ath12k/core.h | 23 +++-- > drivers/net/wireless/ath/ath12k/dp.c | 25 ------ > drivers/net/wireless/ath/ath12k/dp_mon.c | 108 ++++++++++++----------- > drivers/net/wireless/ath/ath12k/hal_rx.h | 53 ++++++----- > drivers/net/wireless/ath/ath12k/mac.c | 24 +++-- > 6 files changed, 114 insertions(+), 124 deletions(-) > > > base-commit: b9545f4570fcfebe982439de7c9106e55b4bf756 Applying: wifi: ath12k: remove unused variable monitor_present 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 Patch failed at 0001 wifi: ath12k: remove unused variable monitor_present Please rebase on current ath/main
