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: Nishka Dasgupta <nishkadg.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8712/ieee80211.c b/drivers/staging/rtl8712/ieee80211.c
index 5821ccd3b50d7d9044d6fa20a5b9679ca8cd4db0..b4a099169c7c8d1ac4cee68533aa2637cc5e649f 100644 (file)
--- a/drivers/staging/rtl8712/ieee80211.c
+++ b/drivers/staging/rtl8712/ieee80211.c
@@ -327,11 +327,11 @@ int r8712_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher,
 
        if (rsn_ie_len <= 0) {
                /* No RSN IE - fail silently */
-               return _FAIL;
+               return -EINVAL;
        }
        if ((*rsn_ie != _WPA2_IE_ID_) ||
            (*(rsn_ie + 1) != (u8)(rsn_ie_len - 2)))
-               return _FAIL;
+               return -EINVAL;
        pos = rsn_ie;
        pos += 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,
                pos += RSN_SELECTOR_LEN;
                left -= RSN_SELECTOR_LEN;
        } else if (left > 0) {
-               return _FAIL;
+               return -EINVAL;
        }
        /*pairwise_cipher*/
        if (left >= 2) {
@@ -349,16 +349,16 @@ int r8712_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher,
                pos += 2;
                left -= 2;
                if (count == 0 || left < count * RSN_SELECTOR_LEN)
-                       return _FAIL;
+                       return -EINVAL;
                for (i = 0; i < count; i++) {
                        *pairwise_cipher |= r8712_get_wpa2_cipher_suite(pos);
                        pos += RSN_SELECTOR_LEN;
                        left -= RSN_SELECTOR_LEN;
                }
        } 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,

diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index 88fda78be33f7b5b0e5358f47a2c9c2f4e5eaa7a..b08b9a191a3416971e19f9d45e7fb7bbb5f32582 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -503,7 +503,7 @@ static int r871x_set_wpa_ie(struct _adapter *padapter, char *pie,
                                  Ndis802_11AuthModeWPAPSK;
                }
                if (r8712_parse_wpa2_ie(buf, ielen, &group_cipher,
-                   &pairwise_cipher) == _SUCCESS) {
+                   &pairwise_cipher) == 0) {
                        padapter->securitypriv.AuthAlgrthm = 2;
                        padapter->securitypriv.ndisauthtype =
                                  Ndis802_11AuthModeWPA2PSK;