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

Commit 64a8cef4 authored Mar 02, 2015 by SenthilKumar Jegadeesan Committed by Johannes Berg Mar 04, 2015

mac80211: provide station PMF configuration to driver



Some device drivers 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: SenthilKumar Jegadeesan <sjegadee@qti.qualcomm.com>
[fix commit log, documentation]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 3384d757

include/net/mac80211.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -1491,6 +1491,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.
		*/
		struct ieee80211_sta {
		u32 supp_rates[IEEE80211_NUM_BANDS];
		@@ -1507,6 +1508,7 @@ struct ieee80211_sta {
		struct ieee80211_sta_rates __rcu *rates;
		bool tdls;
		bool tdls_initiator;
		bool mfp;

		/* must be last */
		u8 drv_priv[0] __aligned(sizeof(void *));

net/mac80211/cfg.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -1068,6 +1068,7 @@ static int sta_apply_parameters(struct ieee80211_local *local,
		sta->sta.wme = set & BIT(NL80211_STA_FLAG_WME);

		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
		@@ -2966,8 +2966,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;