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

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.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 3e67274a

drivers/staging/rtl8712/rtl871x_ioctl_set.c

+3 −3
Original line number Diff line number Diff line
@@ -320,10 +320,10 @@ u8 r8712_set_802_11_authentication_mode(struct _adapter *padapter, 
	psecuritypriv->ndisauthtype = authmode;

	if (psecuritypriv->ndisauthtype > 3)

		psecuritypriv->AuthAlgrthm = 2; /* 802.1x */

	if (r8712_set_auth(padapter, psecuritypriv) == _SUCCESS)

		ret = true;

	else

	if (r8712_set_auth(padapter, psecuritypriv))

		ret = false;

	else

		ret = true;

	return ret;

}

drivers/staging/rtl8712/rtl871x_mlme.c

+5 −5
Original line number Diff line number Diff line
@@ -1144,7 +1144,7 @@ ask_for_joinbss: 
	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 cmd_priv	*pcmdpriv = &adapter->cmdpriv;
@@ -1153,12 +1153,12 @@ sint r8712_set_auth(struct _adapter *adapter, 


	pcmd = kmalloc(sizeof(*pcmd), GFP_ATOMIC);

	if (!pcmd)

		return _FAIL;

		return -ENOMEM;



	psetauthparm = kzalloc(sizeof(*psetauthparm), GFP_ATOMIC);

	if (!psetauthparm) {

		kfree(pcmd);

		return _FAIL;

		return -ENOMEM;

	}

	psetauthparm->mode = (u8)psecuritypriv->AuthAlgrthm;

	pcmd->cmdcode = _SetAuth_CMD_;
@@ -1168,7 +1168,7 @@ sint r8712_set_auth(struct _adapter *adapter, 
	pcmd->rspsz = 0;

	INIT_LIST_HEAD(&pcmd->list);

	r8712_enqueue_cmd(pcmdpriv, pcmd);

	return _SUCCESS;

	return 0;

}



sint r8712_set_key(struct _adapter *adapter,

drivers/staging/rtl8712/rtl871x_mlme.h

+2 −2
Original line number Diff line number Diff line
@@ -175,7 +175,7 @@ void r8712_free_mlme_priv(struct mlme_priv *pmlmepriv); 
int r8712_select_and_join_from_scan(struct mlme_priv *pmlmepriv);

sint r8712_set_key(struct _adapter *adapter,

		   struct security_priv *psecuritypriv, sint keyid);

sint r8712_set_auth(struct _adapter *adapter,

int r8712_set_auth(struct _adapter *adapter,

		   struct security_priv *psecuritypriv);

uint r8712_get_wlan_bssid_ex_sz(struct wlan_bssid_ex *bss);

void r8712_generate_random_ibss(u8 *pibss);

CRA Git | Maintained and supported by SUSTech CRA and CCSE