From: Kalle Valo <kvalo@qca.qualcomm.com>
To: "Raja, Tamizh Chelvam" <c_traja@qti.qualcomm.com>
Cc: "johannes@sipsolutions.net" <johannes@sipsolutions.net>,
"linux-wireless@vger.kernel.org" <linux-wireless@vger.kernel.org>,
"ath10k@lists.infradead.org" <ath10k@lists.infradead.org>
Subject: Re: [PATCH 2/2] ath10k: set peer MFP flag in peer assoc command
Date: Wed, 4 Nov 2015 09:57:20 +0200 [thread overview]
Message-ID: <87egg6dwnz.fsf@kamboji.qca.qualcomm.com> (raw)
In-Reply-To: <39ba89200efb4ef0a2f5ccd5aca878a6@aphydexm01b.ap.qualcomm.com> (Tamizh Chelvam Raja's message of "Wed, 4 Nov 2015 05:20:43 +0000")
"Raja, Tamizh Chelvam" <c_traja@qti.qualcomm.com> writes:
>>> From: Tamizh chelvam <c_traja@qti.qualcomm.com>
>>>
>>> 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 <c_traja@qti.qualcomm.com>
>>> Signed-off-by: Manikanta pubbisetty <c_mpubbi@qti.qualcomm.com>
>
>>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:
I don't know what you are trying to do, but I apply the patches from the
pending branch to ath-next. You might get a conflict if you apply the
patch to another branch.
--
Kalle Valo
prev parent reply other threads:[~2015-11-04 7:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-07 5:16 [PATCH 2/2] ath10k: set peer MFP flag in peer assoc command c_traja
2015-10-07 5:34 ` kbuild test robot
2015-10-07 8:22 ` Kalle Valo
2015-10-07 8:59 ` Raja, Tamizh Chelvam
2015-10-31 9:38 ` Kalle Valo
2015-11-04 5:20 ` Raja, Tamizh Chelvam
2015-11-04 7:57 ` Kalle Valo [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87egg6dwnz.fsf@kamboji.qca.qualcomm.com \
--to=kvalo@qca.qualcomm.com \
--cc=ath10k@lists.infradead.org \
--cc=c_traja@qti.qualcomm.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).