[PATCH 2/2] ath10k: set peer MFP flag in peer assoc command

[Kalle Valo]

"Raja, Tamizh Chelvam" <c_traja at qti.qualcomm.com> writes:

>>> From: Tamizh chelvam <c_traja at 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 at qti.qualcomm.com>
>>> Signed-off-by: Manikanta pubbisetty <c_mpubbi at 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