Pradeep Kumar Chitrapu <pradeepc@xxxxxxxxxxxxxx> wrote: > Configure fine timing measurement (FTM) responder role from the > ftm_responder bss param sent by mac80211. With FTM functionality offloaded > to firmware, adding the interface allows userspace to enable or disable > FTM responder functionality. ath10k disables it at the time of interface > creation. > > Supported FW: 10.4 > > Tested on IPQ4019 with firmware: 10.4-3.2.1.1-00022 > > Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@xxxxxxxxxxxxxx> > Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxxxxxx> I had to fix some conflicts, please carefully check my resolution in the pending branch: https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=a3e53eb1c7c58b131ebc0581aa44b0912809e430 $ git am -s -3 10798883.mbox Applying: ath10k: Add support to configure ftm responder role Using index info to reconstruct a base tree... M drivers/net/wireless/ath/ath10k/core.h M drivers/net/wireless/ath/ath10k/mac.c M drivers/net/wireless/ath/ath10k/wmi.c M drivers/net/wireless/ath/ath10k/wmi.h Falling back to patching base and 3-way merge... Auto-merging drivers/net/wireless/ath/ath10k/wmi.h CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi.h Auto-merging drivers/net/wireless/ath/ath10k/wmi.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/wmi.c Auto-merging drivers/net/wireless/ath/ath10k/mac.c CONFLICT (content): Merge conflict in drivers/net/wireless/ath/ath10k/mac.c Auto-merging drivers/net/wireless/ath/ath10k/core.h Recorded preimage for 'drivers/net/wireless/ath/ath10k/mac.c' Recorded preimage for 'drivers/net/wireless/ath/ath10k/wmi.c' Recorded preimage for 'drivers/net/wireless/ath/ath10k/wmi.h' error: Failed to merge in the changes. Patch failed at 0001 ath10k: Add support to configure ftm responder role -- https://patchwork.kernel.org/patch/10798883/ https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
