p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cfg80211: add missing constraint for user-supplied VHT mask 

Do a logical vht_capa &= vht_capa_mask of user-supplied VHT mask with
the driver-supplied mask of modifiable VHT capabilities.
Fix whitespaces and comment typos.

Signed-off-by: Sergey Matyukevich <sergey.matyukevich.os@quantenna.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Sergey Matyukevich 2018-10-19 15:40:13 +00:00 committed by Johannes Berg
parent a1881c9b8a
commit 81c5dce2cd
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/wireless/mlme.c
View File

@ -272,11 +272,11 @@ void cfg80211_oper_and_ht_capa(struct ieee80211_ht_cap *ht_capa,
p1 = (u8*)(ht_capa); p1 = (u8*)(ht_capa);
p2 = (u8*)(ht_capa_mask); p2 = (u8*)(ht_capa_mask);
for (i = 0; i<sizeof(*ht_capa); i++) for (i = 0; i < sizeof(*ht_capa); i++)
p1[i] &= p2[i]; p1[i] &= p2[i];
} }
/* Do a logical ht_capa &= ht_capa_mask. */ /* Do a logical vht_capa &= vht_capa_mask. */
void cfg80211_oper_and_vht_capa(struct ieee80211_vht_cap *vht_capa, void cfg80211_oper_and_vht_capa(struct ieee80211_vht_cap *vht_capa,
const struct ieee80211_vht_cap *vht_capa_mask) const struct ieee80211_vht_cap *vht_capa_mask)
{ {

2
net/wireless/sme.c
View File

@ -1171,6 +1171,8 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev,
cfg80211_oper_and_ht_capa(&connect->ht_capa_mask, cfg80211_oper_and_ht_capa(&connect->ht_capa_mask,
rdev->wiphy.ht_capa_mod_mask); rdev->wiphy.ht_capa_mod_mask);
cfg80211_oper_and_vht_capa(&connect->vht_capa_mask,
rdev->wiphy.vht_capa_mod_mask);
if (connkeys && connkeys->def >= 0) { if (connkeys && connkeys->def >= 0) {
int idx; int idx;