AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

cfg80211: fix ieee80211_get_vht_max_nss()

Browse Source 
Fix two bugs in ieee80211_get_vht_max_nss():
 * the spec says we should round down
   (reported by Nissim)
 * there's a double condition, the first one is wrong,
   supp_width == 0 / ext_nss_bw == 2 is valid in 80+80
   (found by smatch)

Fixes: b0aa75f0b1 ("ieee80211: add new VHT capability fields/parsing")
Reported-by: Nissim Bendanan <nissimx.bendanan@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Johannes Berg 2018-12-15 11:03:16 +02:00
parent efc38dd7d5
commit 93bc8ac49e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
net/wireless/util.c
View File

@ -2013,33 +2013,32 @@ int ieee80211_get_vht_max_nss(struct ieee80211_vht_cap *cap,
case IEEE80211_VHT_CHANWIDTH_160MHZ:
if (supp_width == 0 &&
(ext_nss_bw == 1 || ext_nss_bw == 2))
return DIV_ROUND_UP(max_vht_nss, 2);
return max_vht_nss / 2;
if (supp_width == 0 &&
ext_nss_bw == 3)
return DIV_ROUND_UP(3 * max_vht_nss, 4);
return (3 * max_vht_nss) / 4;
if (supp_width == 1 &&
ext_nss_bw == 3)
return 2 * max_vht_nss;
break;
case IEEE80211_VHT_CHANWIDTH_80P80MHZ:
if (supp_width == 0 &&
(ext_nss_bw == 1 || ext_nss_bw == 2))
if (supp_width == 0 && ext_nss_bw == 1)
return 0; /* not possible */
if (supp_width == 0 &&
ext_nss_bw == 2)
return DIV_ROUND_UP(max_vht_nss, 2);
return max_vht_nss / 2;
if (supp_width == 0 &&
ext_nss_bw == 3)
return DIV_ROUND_UP(3 * max_vht_nss, 4);
return (3 * max_vht_nss) / 4;
if (supp_width == 1 &&
ext_nss_bw == 0)
return 0; /* not possible */
if (supp_width == 1 &&
ext_nss_bw == 1)
return DIV_ROUND_UP(max_vht_nss, 2);
return max_vht_nss / 2;
if (supp_width == 1 &&
ext_nss_bw == 2)
return DIV_ROUND_UP(3 * max_vht_nss, 4);
return (3 * max_vht_nss) / 4;
break;
}