On 1/21/2025 2:45 AM, Kang Yang wrote: > This patch-set mainly does four things: > 1. Add handler to send WMI_SET_CURRENT_COUNTRY_CMDID to firmware. > 2. Implement 11d scan offload, and report country code to firmware by > WMI command WMI_SET_CURRENT_COUNTRY_CMDID. > 3. Use WMI_SET_CURRENT_COUNTRY_CMDID to set country code for WCN7850. > 4. Store country code, and update it to firmware after device recovery. > > With this patch-set, WCN7850 can do 11d offload scan and update country > code to firmware successfully. > > Note: This patch-set is an old patch-set in public review written by > Wen Gong. Just resend it for him. > Link: https://patchwork.kernel.org/project/linux-wireless/cover/20230914090746.23560-1-quic_wgong@xxxxxxxxxxx/ > > v9: update copy right in patch #1, #2, #3. > v8: rebase on tag: ath/main(ath-202501172342). > v7: > 1. rebase on tag: ath/main(ath-202412191756). > 2. rewrite commit message for patch#2. > v6: rebase on tag: ath/main(ath-202410161539). > v5: rebase on tag: ath/main(ath-202410111606). > v4: rebase on tag: ath-202410072115. > v3: > 1. use wiphy::mtx lock instead of adding a new lock(patch#2). > 2. rename struct according to wmi naming convention(patch#1, #2). > 3. update copyright in reg.h > 4. modifiy patch#3, #4 due to struct name change. > v2: change per Jeff. > 1. change alpha2 length from 3 to 2. > 2. change wmi_11d_new_cc_ev to wmi_11d_new_cc_event. > > Wen Gong (4): > wifi: ath12k: add configure country code for WCN7850 > wifi: ath12k: add 11d scan offload support > wifi: ath12k: use correct WMI command to set country code for WCN7850 > wifi: ath12k: store and send country code to firmware after recovery > > drivers/net/wireless/ath/ath12k/core.c | 34 ++++- > drivers/net/wireless/ath/ath12k/core.h | 17 +++ > drivers/net/wireless/ath/ath12k/hw.c | 8 +- > drivers/net/wireless/ath/ath12k/hw.h | 3 +- > drivers/net/wireless/ath/ath12k/mac.c | 167 ++++++++++++++++++++++++- > drivers/net/wireless/ath/ath12k/mac.h | 9 +- > drivers/net/wireless/ath/ath12k/reg.c | 72 ++++++++--- > drivers/net/wireless/ath/ath12k/reg.h | 4 +- > drivers/net/wireless/ath/ath12k/wmi.c | 160 ++++++++++++++++++++++- > drivers/net/wireless/ath/ath12k/wmi.h | 40 +++++- > 10 files changed, 486 insertions(+), 28 deletions(-) > > > base-commit: e7ef944b3e2c31b608800925e784f67596375770 Can you please rebase again? CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath12k/wmi.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath12k/mac.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath12k/core.h
