xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nl80211: support S1G capability overrides in assoc

Browse Source 
NL80211_ATTR_S1G_CAPABILITY can be passed along with
NL80211_ATTR_S1G_CAPABILITY_MASK to NL80211_CMD_ASSOCIATE
to indicate S1G capabilities which should override the
hardware capabilities in eg. the association request.

Signed-off-by: Thomas Pedersen <thomas@adapt-ip.com>
Link: https://lore.kernel.org/r/20200922022818.15855-4-thomas@adapt-ip.com
[johannes: always require both attributes together, commit message]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Thomas Pedersen
2020-09-21 19:28:04 -07:00
committed by Johannes Berg
parent 75b1593533
commit d2b7588a47
4 changed files with 34 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
net/wireless/nl80211.c
View File

@@ -704,6 +704,10 @@ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
NLA_POLICY_NESTED(nl80211_fils_discovery_policy),
[NL80211_ATTR_UNSOL_BCAST_PROBE_RESP] =
NLA_POLICY_NESTED(nl80211_unsol_bcast_probe_resp_policy),
[NL80211_ATTR_S1G_CAPABILITY] =
NLA_POLICY_EXACT_LEN(IEEE80211_S1G_CAPABILITY_LEN),
[NL80211_ATTR_S1G_CAPABILITY_MASK] =
NLA_POLICY_EXACT_LEN(IEEE80211_S1G_CAPABILITY_LEN),
};
/* policy for the key attributes */
@@ -9792,6 +9796,22 @@ static int nl80211_associate(struct sk_buff *skb, struct genl_info *info)
nla_data(info->attrs[NL80211_ATTR_FILS_NONCES]);
}
if (info->attrs[NL80211_ATTR_S1G_CAPABILITY_MASK]) {
if (!info->attrs[NL80211_ATTR_S1G_CAPABILITY])
return -EINVAL;
memcpy(&req.s1g_capa_mask,
nla_data(info->attrs[NL80211_ATTR_S1G_CAPABILITY_MASK]),
sizeof(req.s1g_capa_mask));
}
if (info->attrs[NL80211_ATTR_S1G_CAPABILITY]) {
if (!info->attrs[NL80211_ATTR_S1G_CAPABILITY_MASK])
return -EINVAL;
memcpy(&req.s1g_capa,
nla_data(info->attrs[NL80211_ATTR_S1G_CAPABILITY]),
sizeof(req.s1g_capa));
}
err = nl80211_crypto_settings(rdev, info, &req.crypto, 1);
if (!err) {
wdev_lock(dev->ieee80211_ptr);