Return-path: Received: from sabertooth01.qualcomm.com ([65.197.215.72]:45690 "EHLO sabertooth01.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751105AbbKDFUv convert rfc822-to-8bit (ORCPT ); Wed, 4 Nov 2015 00:20:51 -0500 From: "Raja, Tamizh Chelvam" To: "Valo, Kalle" CC: "johannes@sipsolutions.net" , "ath10k@lists.infradead.org" , "linux-wireless@vger.kernel.org" Subject: RE: [PATCH 2/2] ath10k: set peer MFP flag in peer assoc command Date: Wed, 4 Nov 2015 05:20:43 +0000 Message-ID: <39ba89200efb4ef0a2f5ccd5aca878a6@aphydexm01b.ap.qualcomm.com> (sfid-20151104_062054_232695_43941BC9) References: <1444194961-12777-1-git-send-email-c_traja@qti.qualcomm.com> <87pozvidiu.fsf@kamboji.qca.qualcomm.com> In-Reply-To: <87pozvidiu.fsf@kamboji.qca.qualcomm.com> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org List-ID: >> From: Tamizh chelvam >> >> Set peer's management frame protection flag in peer assoc command, >> this setting will enable/disable encrytion of management frames in fw. >> >> Setting of this flag is based on whether MFP is enabled/disabled at >> STA and a firmware feature flag ATH10K_FW_FEATURE_MFP_SUPPORT. This is >> because only firmwares 10.1.561 and above have support for MFP. >> >> Signed-off-by: Tamizh chelvam >> Signed-off-by: Manikanta pubbisetty >There was a trivial conflict, please check my conflict resolution in the pending branch: >https://git.kernel.org/cgit/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=c33d4ded1d2db2166c14afe602fe7ef645a5b16b When I try to apply this patch. I got following conflict. Checking patch drivers/net/wireless/ath/ath10k/core.c... Checking patch drivers/net/wireless/ath/ath10k/core.h... Hunk #1 succeeded at 512 (offset -1 lines). Checking patch drivers/net/wireless/ath/ath10k/htt_tx.c... Checking patch drivers/net/wireless/ath/ath10k/mac.c... error: while searching for: ath10k_dbg(ar, ATH10K_DBG_WMI, "%s: wpa ie found\n", __func__); arg->peer_flags |= ar->wmi.peer_flags->need_gtk_2_way; } } static void ath10k_peer_assoc_h_rates(struct ath10k *ar, error: patch failed: drivers/net/wireless/ath/ath10k/mac.c:2009 Hunk #3 succeeded at 2480 (offset -6 lines). Applied patch drivers/net/wireless/ath/ath10k/core.c cleanly. Applied patch drivers/net/wireless/ath/ath10k/core.h cleanly. Applied patch drivers/net/wireless/ath/ath10k/htt_tx.c cleanly. Applying patch drivers/net/wireless/ath/ath10k/mac.c with 1 rejects... Hunk #1 applied cleanly. Rejected hunk #2. Hunk #3 applied cleanly.