<[email protected]> writes:

> From: Tamizh chelvam <[email protected]>
>
> 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 <[email protected]>
> Signed-off-by: Manikanta pubbisetty <[email protected]>

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

-- 
Kalle Valo

_______________________________________________
ath10k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath10k

Reply via email to