Wen Gong <wgong@xxxxxxxxxxxxxx> writes: > On 2021-11-18 18:25, Wen Gong wrote: >> On 2021-11-17 16:54, Kalle Valo wrote: >>> Wen Gong <wgong@xxxxxxxxxxxxxx> wrote: >>> >>>> This is to read variant from SMBIOS such as read from DT, the variant >>>> string will be used to one part of string which used to search board >>>> data from board-2.bin. >>>> >>>> Tested-on: WCN6855 hw2.0 PCI >>>> WLAN.HSP.1.1-01720.1-QCAHSPSWPL_V1_V2_SILICONZ_LITE-1 >>>> >>>> Signed-off-by: Wen Gong <wgong@xxxxxxxxxxxxxx> >>> >>> I'm dropping all patches listed below in one go. I didn't manage to >>> apply any of these without conflicts, please remember to always use >>> ath.git master branch as the baseline to avoid conflicts. >>> >>> 9 patches set to Changes Requested. >>> >>> 12549401 ath11k: add read variant from SMBIOS for download board data >>> 12549415 ath11k: add wait operation for tx management packets for >>> flush from mac80211 >>> 12549419 ath11k: change to treat alpha code na as world wide regdomain >>> 12549431 ath11k: report rssi of each chain to mac80211 >>> 12549433 ath11k: Add signal report to mac80211 for QCA6390 and WCN6855 >>> 12549449 ath11k: report tx bitrate for iw wlan station dump >>> 12554953 ath11k: add support for hardware rfkill for QCA6390 >>> 12583807 ath11k: add 11d scan offload support >>> 12583809 ath11k: calculate the correct NSS of peer for HE capabilities >> >> I have rebased to latest ath.git master ath-202111170737 and resend v2 >> for below patches: >> [v2] ath11k: report rssi of each chain to mac80211 >> [v2,0/2] ath11k: add 11d scan offload support for QCA6390/WCN6855 >> [v2] ath11k: add read variant from SMBIOS for download board data >> [v2] ath11k: skip sending vdev down for channel switch >> [v2] ath11k: fix read fail for htt_stats and htt_peer_stats for >> single pdev >> [v2] ath11k: calculate the correct NSS of peer for HE capabilities >> [v2] ath11k: add wait operation for tx management packets for flush >> from mac80211 >> [v2] ath11k: change to treat alpha code na as world wide regdomain >> >> I will rebase the left patches after these patches upstream, otherwise >> the left patches will have conflict with these patches >> because they change same location but actually have no logic relation. > > Hi Kalle, > > I have tested in my local git, all the above v2 patches only have one > conflict > between "[v2,2/2] ath11k: add 11d scan offload support" > and "[v2] ath11k: report rssi of each chain to mac80211" > in wmi_tlv_policies of wmi.c because they both add a item in the struct. > patch -p1 -i xxx.patch will auto fix this type conflict. > > + [WMI_TAG_11D_NEW_COUNTRY_EVENT] = { > + .min_len = sizeof(struct wmi_11d_new_cc_ev) }, > > + [WMI_TAG_PER_CHAIN_RSSI_STATS] = { > + .min_len = sizeof(struct wmi_per_chain_rssi_stats) }, Thanks, this was very helpful. I have the patches now in the pending branch, I'll test and review them next week. -- https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches