staging: rtl8712: r8712_parse_wpa_ie(): Change return values

Change return values of function r8712_parse_wpa_ie from _SUCCESS/_FAIL
to 0/-EINVAL. Modify call site accordingly.

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 fe94e5c15836b758169b791797e0a2641f3183c1..5821ccd3b50d7d9044d6fa20a5b9679ca8cd4db0 100644 (file)
--- a/drivers/staging/rtl8712/ieee80211.c
+++ b/drivers/staging/rtl8712/ieee80211.c
@@ -283,12 +283,12 @@ int r8712_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher,
 
        if (wpa_ie_len <= 0) {
                /* No WPA IE - fail silently */
-               return _FAIL;
+               return -EINVAL;
        }
        if ((*wpa_ie != _WPA_IE_ID_) ||
            (*(wpa_ie + 1) != (u8)(wpa_ie_len - 2)) ||
            (memcmp(wpa_ie + 2, (void *)WPA_OUI_TYPE, WPA_SELECTOR_LEN)))
-               return _FAIL;
+               return -EINVAL;
        pos = wpa_ie;
        pos += 8;
        left = wpa_ie_len - 8;
@@ -298,7 +298,7 @@ int r8712_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher,
                pos += WPA_SELECTOR_LEN;
                left -= WPA_SELECTOR_LEN;
        } else if (left > 0) {
-               return _FAIL;
+               return -EINVAL;
        }
        /*pairwise_cipher*/
        if (left >= 2) {
@@ -306,16 +306,16 @@ int r8712_parse_wpa_ie(u8 *wpa_ie, int wpa_ie_len, int *group_cipher,
                pos += 2;
                left -= 2;
                if (count == 0 || left < count * WPA_SELECTOR_LEN)
-                       return _FAIL;
+                       return -EINVAL;
                for (i = 0; i < count; i++) {
                        *pairwise_cipher |= r8712_get_wpa_cipher_suite(pos);
                        pos += WPA_SELECTOR_LEN;
                        left -= WPA_SELECTOR_LEN;
                }
        } else if (left == 1) {
-               return _FAIL;
+               return -EINVAL;
        }
-       return _SUCCESS;
+       return 0;
 }
 
 int r8712_parse_wpa2_ie(u8 *rsn_ie, int rsn_ie_len, int *group_cipher,

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