Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c48f120 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: remove exposing 'mfp' to drivers 



There's no driver using this, so remove it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f760b87f

include/net/mac80211.h

+0 −2
Original line number Diff line number Diff line
@@ -1675,7 +1675,6 @@ struct ieee80211_sta_rates { 
 * @tdls: indicates whether the STA is a TDLS peer

 * @tdls_initiator: indicates the STA is an initiator of the TDLS link. Only

 *	valid if the STA is a TDLS peer in the first place.

 * @mfp: indicates whether the STA uses management frame protection or not.

 * @txq: per-TID data TX queues (if driver uses the TXQ abstraction)

 */

struct ieee80211_sta {
@@ -1693,7 +1692,6 @@ struct ieee80211_sta { 
	struct ieee80211_sta_rates __rcu *rates;

	bool tdls;

	bool tdls_initiator;

	bool mfp;



	struct ieee80211_txq *txq[IEEE80211_NUM_TIDS];

net/mac80211/cfg.c

+0 −1
Original line number Diff line number Diff line
@@ -1076,7 +1076,6 @@ static int sta_apply_parameters(struct ieee80211_local *local, 
	}



	if (mask & BIT(NL80211_STA_FLAG_MFP)) {

		sta->sta.mfp = !!(set & BIT(NL80211_STA_FLAG_MFP));

		if (set & BIT(NL80211_STA_FLAG_MFP))

			set_sta_flag(sta, WLAN_STA_MFP);

		else

net/mac80211/mlme.c

+1 −5
Original line number Diff line number Diff line
@@ -3034,12 +3034,8 @@ 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;