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

This commit is contained in:
Jouni Malinen 2010-01-10 22:53:36 +02:00
parent f5455a2dbd
commit 20766f2007

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)
{
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);
ie2 = wpa_bss_get_ie(bss, WLAN_EID_EXT_SUPP_RATES);
len = (ie ? ie[1] : 0) + (ie2 ? ie2[1] : 0);
*rates = os_malloc(len);
if (!*rates)
r = os_malloc(len);
if (!r)
return -1;
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++)
(*rates)[i + j] = ie2[j + 2] & 0x7f;
r[i + j] = ie2[j + 2] & 0x7f;
*rates = r;
return len;
}