Commit f5e5eaef authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Greg Kroah-Hartman

staging: rtl8712: r8712_parse_wpa2_ie(): Change return values

Change return values of function r8712_parse_wpa2_ie from
_SUCCESS/_FAIL to 0/-EINVAL.
Signed-off-by: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1ef20d57
...@@ -327,11 +327,11 @@ int r8712_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, ...@@ -327,11 +327,11 @@ int r8712_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher,
if (rsn_ie_len <= 0) { if (rsn_ie_len <= 0) {
/* No RSN IE - fail silently */ /* No RSN IE - fail silently */
return _FAIL; return -EINVAL;
} }
if ((*rsn_ie != _WPA2_IE_ID_) || if ((*rsn_ie != _WPA2_IE_ID_) ||
(*(rsn_ie + 1) != (u8)(rsn_ie_len - 2))) (*(rsn_ie + 1) != (u8)(rsn_ie_len - 2)))
return _FAIL; return -EINVAL;
pos = rsn_ie; pos = rsn_ie;
pos += 4; pos += 4;
left = rsn_ie_len - 4; left = rsn_ie_len - 4;
...@@ -341,7 +341,7 @@ int r8712_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, ...@@ -341,7 +341,7 @@ int r8712_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher,
pos += RSN_SELECTOR_LEN; pos += RSN_SELECTOR_LEN;
left -= RSN_SELECTOR_LEN; left -= RSN_SELECTOR_LEN;
} else if (left > 0) { } else if (left > 0) {
return _FAIL; return -EINVAL;
} }
/*pairwise_cipher*/ /*pairwise_cipher*/
if (left >= 2) { if (left >= 2) {
...@@ -349,16 +349,16 @@ int r8712_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher, ...@@ -349,16 +349,16 @@ int r8712_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher,
pos += 2; pos += 2;
left -= 2; left -= 2;
if (count == 0 || left < count * RSN_SELECTOR_LEN) if (count == 0 || left < count * RSN_SELECTOR_LEN)
return _FAIL; return -EINVAL;
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
*pairwise_cipher |= r8712_get_wpa2_cipher_suite(pos); *pairwise_cipher |= r8712_get_wpa2_cipher_suite(pos);
pos += RSN_SELECTOR_LEN; pos += RSN_SELECTOR_LEN;
left -= RSN_SELECTOR_LEN; left -= RSN_SELECTOR_LEN;
} }
} else if (left == 1) { } else if (left == 1) {
return _FAIL; return -EINVAL;
} }
return _SUCCESS; return 0;
} }
int r8712_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len, int r8712_get_sec_ie(u8 *in_ie, uint in_len, u8 *rsn_ie, u16 *rsn_len,
......
...@@ -503,7 +503,7 @@ static int r871x_set_wpa_ie(struct _adapter *padapter, char *pie, ...@@ -503,7 +503,7 @@ static int r871x_set_wpa_ie(struct _adapter *padapter, char *pie,
Ndis802_11AuthModeWPAPSK; Ndis802_11AuthModeWPAPSK;
} }
if (r8712_parse_wpa2_ie(buf, ielen, &group_cipher, if (r8712_parse_wpa2_ie(buf, ielen, &group_cipher,
&pairwise_cipher) == _SUCCESS) { &pairwise_cipher) == 0) {
padapter->securitypriv.AuthAlgrthm = 2; padapter->securitypriv.AuthAlgrthm = 2;
padapter->securitypriv.ndisauthtype = padapter->securitypriv.ndisauthtype =
Ndis802_11AuthModeWPA2PSK; Ndis802_11AuthModeWPA2PSK;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment