jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make wpa_bss_get_max_rate() a bit more readable with a local variable

Browse source
This commit is contained in:
Jouni Malinen 2010-01-10 22:53:36 +02:00
parent f5455a2dbd
commit 20766f2007
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
wpa_supplicant/bss.c
View file

@ -570,22 +570,25 @@ int wpa_bss_get_max_rate(const struct wpa_bss *bss)
int wpa_bss_get_bit_rates(const struct wpa_bss *bss, u8 **rates) int wpa_bss_get_bit_rates(const struct wpa_bss *bss, u8 **rates)
{ {
const u8 *ie, *ie2; const u8 *ie, *ie2;
int i, j, len; int i, j;
unsigned int len;
u8 *r;
ie = wpa_bss_get_ie(bss, WLAN_EID_SUPP_RATES); ie = wpa_bss_get_ie(bss, WLAN_EID_SUPP_RATES);
ie2 = wpa_bss_get_ie(bss, WLAN_EID_EXT_SUPP_RATES); ie2 = wpa_bss_get_ie(bss, WLAN_EID_EXT_SUPP_RATES);
len = (ie ? ie[1] : 0) + (ie2 ? ie2[1] : 0); len = (ie ? ie[1] : 0) + (ie2 ? ie2[1] : 0);
*rates = os_malloc(len); r = os_malloc(len);
if (!*rates) if (!r)
return -1; return -1;
for (i = 0; ie && i < ie[1]; i++) for (i = 0; ie && i < ie[1]; i++)
(*rates)[i] = ie[i + 2] & 0x7f; r[i] = ie[i + 2] & 0x7f;
for (j = 0; ie2 && j < ie2[1]; j++) for (j = 0; ie2 && j < ie2[1]; j++)
(*rates)[i + j] = ie2[j + 2] & 0x7f; r[i + j] = ie2[j + 2] & 0x7f;
*rates = r;
return len; return len;
} }