summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/net/mac80211.h2
-rw-r--r--net/mac80211/cfg.c1
-rw-r--r--net/mac80211/mlme.c6
3 files changed, 1 insertions, 8 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 6b1077c2a63f..43dbddfa06c0 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -1675,7 +1675,6 @@ struct ieee80211_sta_rates {
1675 * @tdls: indicates whether the STA is a TDLS peer 1675 * @tdls: indicates whether the STA is a TDLS peer
1676 * @tdls_initiator: indicates the STA is an initiator of the TDLS link. Only 1676 * @tdls_initiator: indicates the STA is an initiator of the TDLS link. Only
1677 * valid if the STA is a TDLS peer in the first place. 1677 * valid if the STA is a TDLS peer in the first place.
1678 * @mfp: indicates whether the STA uses management frame protection or not.
1679 * @txq: per-TID data TX queues (if driver uses the TXQ abstraction) 1678 * @txq: per-TID data TX queues (if driver uses the TXQ abstraction)
1680 */ 1679 */
1681struct ieee80211_sta { 1680struct ieee80211_sta {
@@ -1693,7 +1692,6 @@ struct ieee80211_sta {
1693 struct ieee80211_sta_rates __rcu *rates; 1692 struct ieee80211_sta_rates __rcu *rates;
1694 bool tdls; 1693 bool tdls;
1695 bool tdls_initiator; 1694 bool tdls_initiator;
1696 bool mfp;
1697 1695
1698 struct ieee80211_txq *txq[IEEE80211_NUM_TIDS]; 1696 struct ieee80211_txq *txq[IEEE80211_NUM_TIDS];
1699 1697
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index bf7023f6c327..5fc7788e2ff2 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -1076,7 +1076,6 @@ static int sta_apply_parameters(struct ieee80211_local *local,
1076 } 1076 }
1077 1077
1078 if (mask & BIT(NL80211_STA_FLAG_MFP)) { 1078 if (mask & BIT(NL80211_STA_FLAG_MFP)) {
1079 sta->sta.mfp = !!(set & BIT(NL80211_STA_FLAG_MFP));
1080 if (set & BIT(NL80211_STA_FLAG_MFP)) 1079 if (set & BIT(NL80211_STA_FLAG_MFP))
1081 set_sta_flag(sta, WLAN_STA_MFP); 1080 set_sta_flag(sta, WLAN_STA_MFP);
1082 else 1081 else
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 9b2cc278ac2a..ae5d6c48272d 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3034,12 +3034,8 @@ static bool ieee80211_assoc_success(struct ieee80211_sub_if_data *sdata,
3034 3034
3035 rate_control_rate_init(sta); 3035 rate_control_rate_init(sta);
3036 3036
3037 if (ifmgd->flags & IEEE80211_STA_MFP_ENABLED) { 3037 if (ifmgd->flags & IEEE80211_STA_MFP_ENABLED)
3038 set_sta_flag(sta, WLAN_STA_MFP); 3038 set_sta_flag(sta, WLAN_STA_MFP);
3039 sta->sta.mfp = true;
3040 } else {
3041 sta->sta.mfp = false;
3042 }
3043 3039
3044 sta->sta.wme = elems.wmm_param && local->hw.queues >= IEEE80211_NUM_ACS; 3040 sta->sta.wme = elems.wmm_param && local->hw.queues >= IEEE80211_NUM_ACS;
3045 3041