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

Commit 93f0490e authored by Tamizh chelvam's avatar Tamizh chelvam Committed by Johannes Berg
Browse files

Revert "mac80211: remove exposing 'mfp' to drivers" 



This reverts commit 5c48f120.

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: default avatarTamizh chelvam <c_traja@qti.qualcomm.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 985f2c87

include/net/mac80211.h

+2 −0
Original line number Diff line number Diff line
@@ -1683,6 +1683,7 @@ 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 {
@@ -1700,6 +1701,7 @@ 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

+1 −0
Original line number Diff line number Diff line
@@ -1138,6 +1138,7 @@ 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

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