summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2019-03-01 08:05:30 -0800
committerGerrit - the friendly Code Review server <code-review@localhost>2019-03-01 08:05:30 -0800
commitd8573fb4851c84d8f3eea89215b4eabc1114e622 (patch)
tree1fb8d39707a85b86572b7cd9e194966caedfdc6d /net
parenteb22a637c8fd7d24f72a4d020ca5d1e33b02a4e8 (diff)
parent5b10e4728d1affe12399d3ca85d17e7a4f9ecd20 (diff)
Merge "nl80211: Allow set/del pmksa operations for AP"
Diffstat (limited to 'net')
-rw-r--r--net/wireless/nl80211.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 563b400b5301..dfce235942a1 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -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) {