|
@@ -124,11 +124,10 @@ u8 *r8712_get_ie(u8 *pbuf, sint index, sint *len, sint limit)
|
|
|
if (*p == index) {
|
|
|
*len = *(p + 1);
|
|
|
return p;
|
|
|
- } else {
|
|
|
- tmp = *(p + 1);
|
|
|
- p += (tmp + 2);
|
|
|
- i += (tmp + 2);
|
|
|
}
|
|
|
+ tmp = *(p + 1);
|
|
|
+ p += (tmp + 2);
|
|
|
+ i += (tmp + 2);
|
|
|
if (i >= limit)
|
|
|
break;
|
|
|
}
|
|
@@ -237,10 +236,9 @@ unsigned char *r8712_get_wpa_ie(unsigned char *pie, int *wpa_ie_len, int limit)
|
|
|
goto check_next_ie;
|
|
|
*wpa_ie_len = *(pbuf + 1);
|
|
|
return pbuf;
|
|
|
- } else {
|
|
|
- *wpa_ie_len = 0;
|
|
|
- return NULL;
|
|
|
}
|
|
|
+ *wpa_ie_len = 0;
|
|
|
+ return NULL;
|
|
|
check_next_ie:
|
|
|
limit = limit - (pbuf - pie) - 2 - len;
|
|
|
if (limit <= 0)
|
|
@@ -414,7 +412,7 @@ int r8712_get_wps_ie(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps_ielen)
|
|
|
cnt += in_ie[cnt+1]+2;
|
|
|
match = true;
|
|
|
break;
|
|
|
- } else
|
|
|
+ }
|
|
|
cnt += in_ie[cnt+1]+2; /* goto next */
|
|
|
}
|
|
|
return match;
|