Kang Yang <quic_kangyang@xxxxxxxxxxx> writes: > On 2/2/2024 9:53 PM, Kalle Valo wrote: >> Kang Yang <quic_kangyang@xxxxxxxxxxx> writes: >> >>> The NoA(Notice of Absence) attribute is used by the P2P Group Owner to >>> signal its absence due to power save timing, concurrent operation, or >>> off-channel scanning. It is also used in the P2P Presence Request-Response >>> mechanism. >>> >>> The NoA attribute shall be present in the P2P IE in the beacon frames >>> transmitted by a P2P Group Owner when a NoA schedule is being advertised, >>> or when the CTWindow is non-zero. >>> >>> So add support to update P2P information after P2P GO is up through >>> event WMI_P2P_NOA_EVENTID, and always put it in probe resp. >>> >>> Create p2p.c and p2p.h for P2P related functions and definitions. >>> >>> Tested-on: WCN7850 hw2.0 PCI WLAN.HMT.1.0.c5-00481-QCAHMTSWPL_V1.0_V2.0_SILICONZ-3 >>> Tested-on: QCN9274 hw2.0 PCI WLAN.WBE.1.0.1-00029-QCAHKSWPL_SILICONZ-1 >>> >>> Signed-off-by: Kang Yang <quic_kangyang@xxxxxxxxxxx> >> This patch 5 had simple conflicts in wmi.c, please check: >> https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=cbcb45c458a93d32a48b9280c13294e0853fa5dd >> > > Sorry for late reply, I am in Spring Festival holiday. No worries, enjoy the holidays! > It seems i have conflict in adding WMI event, because you merge TWT > patch-set before. Correct, that's pretty normal as we have several patches in patchwork at the same time. > Do i need to send a new version ? In this case no need to send a new version. In general I usually try to fix the simple conflicts myself (like here). If the conflicts are too difficult when I might ask for the author to fix the conflicts and submit a new version. -- https://patchwork.kernel.org/project/linux-wireless/list/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches