ath10k has a replay detection issue which was fixed in v4.14 and we would like to get this security fix also to linux-stable-4.4.But for that it depends on 3 mac80211 patches so the below mac80211 commits needs to be picked first in the same order and then apply this patchset.
f980ebc058c2 : mac80211: allow not sending MIC up from driver for HW crypto f631a77ba920 : mac80211: allow same PN for AMSDU sub-frames cef0acd4d7d4 : mac80211: Add RX flag to indicate ICV stripped
These patches should be applied in that order(commit f980ebc058c2 first) and they should apply cleanly with 3-way merge.
Sriram R (2): ath10k: Add new hw param to identify alignment for different chipsets ath10k: rebuild crypto header in rx data frames
drivers/net/wireless/ath/ath10k/core.c | 8 +++ drivers/net/wireless/ath/ath10k/core.h | 4 ++ drivers/net/wireless/ath/ath10k/htt_rx.c | 108 +++++++++++++++++++++++++----- drivers/net/wireless/ath/ath10k/rx_desc.h | 3 + 4 files changed, 107 insertions(+), 16 deletions(-)