Merge "nl80211: Allow SAE Authentication for NL80211_CMD_CONNECT" (c059ef28) · Commits · e / devices / android_kernel_sony_msm8998

net/wireless/nl80211.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -3678,8 +3678,8 @@ static bool nl80211_valid_auth_type(struct cfg80211_registered_device *rdev,
		return false;
		return true;
		case NL80211_CMD_CONNECT:
		/* SAE not supported yet */
		if (auth_type == NL80211_AUTHTYPE_SAE)
		if (!(rdev->wiphy.features & NL80211_FEATURE_SAE) &&
		auth_type == NL80211_AUTHTYPE_SAE)
		return false;
		/* FILS with SK PFS or PK not supported yet */
		if (auth_type == NL80211_AUTHTYPE_FILS_SK_PFS \|\|
		@@ -8594,6 +8594,7 @@ static int nl80211_connect(struct sk_buff skb, struct genl_info info)

		if (nla_get_flag(info->attrs[NL80211_ATTR_EXTERNAL_AUTH_SUPPORT])) {
		if (!info->attrs[NL80211_ATTR_SOCKET_OWNER]) {
		kzfree(connkeys);
		return -EINVAL;
		}
		connect.flags \|= CONNECT_REQ_EXTERNAL_AUTH_SUPPORT;