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

Commit d8573fb4 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "nl80211: Allow set/del pmksa operations for AP"

parents eb22a637 5b10e472

include/uapi/linux/nl80211.h

+4 −0
Original line number Diff line number Diff line
@@ -4932,6 +4932,9 @@ enum nl80211_feature_flags { 
 *	fairness for transmitted packets and has enabled airtime fairness

 *	scheduling.

 *

 * @NL80211_EXT_FEATURE_AP_PMKSA_CACHING: Driver/device supports PMKSA caching

 *	(set/del PMKSA operations) in AP mode.

 *

 * @NUM_NL80211_EXT_FEATURES: number of extended features.

 * @MAX_NL80211_EXT_FEATURES: highest extended feature index.

 */
@@ -4972,6 +4975,7 @@ enum nl80211_ext_feature_index { 
	NL80211_EXT_FEATURE_CAN_REPLACE_PTK0,

	NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER,

	NL80211_EXT_FEATURE_AIRTIME_FAIRNESS,

	NL80211_EXT_FEATURE_AP_PMKSA_CACHING,



	/* add new features before the definition below */

	NUM_NL80211_EXT_FEATURES,

net/wireless/nl80211.c

+4 −1
Original line number Diff line number Diff line
@@ -8783,7 +8783,10 @@ static int nl80211_setdel_pmksa(struct sk_buff *skb, struct genl_info *info) 
	}



	if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION &&

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_CLIENT)

	    dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_CLIENT &&

	    !(dev->ieee80211_ptr->iftype == NL80211_IFTYPE_AP &&

	      wiphy_ext_feature_isset(&rdev->wiphy,

				      NL80211_EXT_FEATURE_AP_PMKSA_CACHING)))

		return -EOPNOTSUPP;



	switch (info->genlhdr->cmd) {