diff options
author | Johannes Berg <johannes.berg@intel.com> | 2015-06-17 03:58:06 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2015-07-17 09:37:52 -0400 |
commit | 5c48f1201744233d4f235c7dd916d5196ed20716 (patch) | |
tree | b77710efbc9861a9fb8a597d1c96bdd09fdeb281 /net | |
parent | f760b87f8f12eb262f14603e65042996fe03720e (diff) |
mac80211: remove exposing 'mfp' to drivers
There's no driver using this, so remove it.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
-rw-r--r-- | net/mac80211/cfg.c | 1 | ||||
-rw-r--r-- | net/mac80211/mlme.c | 6 |
2 files changed, 1 insertions, 6 deletions
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 | ||