summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorTamizh chelvam2015-10-07 07:10:04 +0200
committerJohannes Berg2015-10-13 10:29:11 +0200
commit93f0490e5deb9445737cabf0e436f3288a4042b7 (patch)
treeed4fd5a1730b5a4d6857cc2f6be0dc70e2f5fb33 /net/mac80211/mlme.c
parentMerge remote-tracking branch 'net-next/master' into mac80211-next (diff)
downloadkernel-qcow2-linux-93f0490e5deb9445737cabf0e436f3288a4042b7.tar.gz
kernel-qcow2-linux-93f0490e5deb9445737cabf0e436f3288a4042b7.tar.xz
kernel-qcow2-linux-93f0490e5deb9445737cabf0e436f3288a4042b7.zip
Revert "mac80211: remove exposing 'mfp' to drivers"
This reverts commit 5c48f1201744233d4f235c7dd916d5196ed20716. Some device drivers (ath10k) offload part of aggregation including AddBA/DelBA negotiations to firmware. In such scenario, the PMF configuration of the station needs to be provided to driver to enable encryption of AddBA/DelBA action frames. Signed-off-by: Tamizh chelvam <c_traja@qti.qualcomm.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 56ef9a8e151c..9c450ffdabe8 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3044,8 +3044,12 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
rate_control_rate_init(sta);
- if (ifmgd->flags & IEEE80211_STA_MFP_ENABLED)
+ if (ifmgd->flags & IEEE80211_STA_MFP_ENABLED) {
set_sta_flag(sta, WLAN_STA_MFP);
+ sta->sta.mfp = true;
+ } else {
+ sta->sta.mfp = false;
+ }
sta->sta.wme = elems.wmm_param && local->hw.queues >= IEEE80211_NUM_ACS;