From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from smtp.codeaurora.org ([198.145.29.96]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gt7tN-0003iz-6B for ath10k@lists.infradead.org; Mon, 11 Feb 2019 09:28:46 +0000 MIME-Version: 1.0 Subject: Re: [PATCH] ath10k: Add support to configure ftm responder role From: Kalle Valo In-Reply-To: <1549439910-9315-1-git-send-email-pradeepc@codeaurora.org> References: <1549439910-9315-1-git-send-email-pradeepc@codeaurora.org> Message-Id: <20190211092844.59CFC608D2@smtp.codeaurora.org> Date: Mon, 11 Feb 2019 09:28:44 +0000 (UTC) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "ath10k" Errors-To: ath10k-bounces+kvalo=adurom.com@lists.infradead.org To: Pradeep Kumar Chitrapu Cc: linux-wireless@vger.kernel.org, ath10k@lists.infradead.org Pradeep Kumar Chitrapu 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 > Signed-off-by: Kalle Valo 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 _______________________________________________ ath10k mailing list ath10k@lists.infradead.org http://lists.infradead.org/mailman/listinfo/ath10k