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

staging: rtl8712: r8712_set_auth(): Change return values

Change return values of r8712_set_auth from _SUCCESS/_FAIL to 0/-ENOMEM
respectively. Modify call site accordingly. Also change return type of
the function from sint to int.
Signed-off-by: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190722092341.21030-2-nishkadg.linux@gmail.comSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3e67274a
...@@ -320,10 +320,10 @@ u8 r8712_set_802_11_authentication_mode(struct _adapter *padapter, ...@@ -320,10 +320,10 @@ u8 r8712_set_802_11_authentication_mode(struct _adapter *padapter,
psecuritypriv->ndisauthtype = authmode; psecuritypriv->ndisauthtype = authmode;
if (psecuritypriv->ndisauthtype > 3) if (psecuritypriv->ndisauthtype > 3)
psecuritypriv->AuthAlgrthm = 2; /* 802.1x */ psecuritypriv->AuthAlgrthm = 2; /* 802.1x */
if (r8712_set_auth(padapter, psecuritypriv) == _SUCCESS) if (r8712_set_auth(padapter, psecuritypriv))
ret = true;
else
ret = false; ret = false;
else
ret = true;
return ret; return ret;
} }
......
...@@ -1144,7 +1144,7 @@ int r8712_select_and_join_from_scan(struct mlme_priv *pmlmepriv) ...@@ -1144,7 +1144,7 @@ int r8712_select_and_join_from_scan(struct mlme_priv *pmlmepriv)
return r8712_joinbss_cmd(adapter, pnetwork); return r8712_joinbss_cmd(adapter, pnetwork);
} }
sint r8712_set_auth(struct _adapter *adapter, int r8712_set_auth(struct _adapter *adapter,
struct security_priv *psecuritypriv) struct security_priv *psecuritypriv)
{ {
struct cmd_priv *pcmdpriv = &adapter->cmdpriv; struct cmd_priv *pcmdpriv = &adapter->cmdpriv;
...@@ -1153,12 +1153,12 @@ sint r8712_set_auth(struct _adapter *adapter, ...@@ -1153,12 +1153,12 @@ sint r8712_set_auth(struct _adapter *adapter,
pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC); pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);
if (!pcmd) if (!pcmd)
return _FAIL; return -ENOMEM;
psetauthparm = kzalloc(sizeof(*psetauthparm), GFP_ATOMIC); psetauthparm = kzalloc(sizeof(*psetauthparm), GFP_ATOMIC);
if (!psetauthparm) { if (!psetauthparm) {
kfree(pcmd); kfree(pcmd);
return _FAIL; return -ENOMEM;
} }
psetauthparm->mode = (u8)psecuritypriv->AuthAlgrthm; psetauthparm->mode = (u8)psecuritypriv->AuthAlgrthm;
pcmd->cmdcode = _SetAuth_CMD_; pcmd->cmdcode = _SetAuth_CMD_;
...@@ -1168,7 +1168,7 @@ sint r8712_set_auth(struct _adapter *adapter, ...@@ -1168,7 +1168,7 @@ sint r8712_set_auth(struct _adapter *adapter,
pcmd->rspsz = 0; pcmd->rspsz = 0;
INIT_LIST_HEAD(&pcmd->list); INIT_LIST_HEAD(&pcmd->list);
r8712_enqueue_cmd(pcmdpriv, pcmd); r8712_enqueue_cmd(pcmdpriv, pcmd);
return _SUCCESS; return 0;
} }
sint r8712_set_key(struct _adapter *adapter, sint r8712_set_key(struct _adapter *adapter,
......
...@@ -175,7 +175,7 @@ void r8712_free_mlme_priv(struct mlme_priv *pmlmepriv); ...@@ -175,7 +175,7 @@ void r8712_free_mlme_priv(struct mlme_priv *pmlmepriv);
int r8712_select_and_join_from_scan(struct mlme_priv *pmlmepriv); int r8712_select_and_join_from_scan(struct mlme_priv *pmlmepriv);
sint r8712_set_key(struct _adapter *adapter, sint r8712_set_key(struct _adapter *adapter,
struct security_priv *psecuritypriv, sint keyid); struct security_priv *psecuritypriv, sint keyid);
sint r8712_set_auth(struct _adapter *adapter, int r8712_set_auth(struct _adapter *adapter,
struct security_priv *psecuritypriv); struct security_priv *psecuritypriv);
uint r8712_get_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss); uint r8712_get_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss);
void r8712_generate_random_ibss(u8 *pibss); void r8712_generate_random_ibss(u8 *pibss);
......
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