Commit 34ef8dbe authored by Nishka Dasgupta's avatar Nishka Dasgupta Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: r8712_set_802_11_add_wep(): Change return values 



Change call sites of r8712_set_802_11_add_wep to check for 0 and
non-zero values (e.g -EINVAL, -ENOMEM) instead of for _SUCCESS and
_FAIL.
Change return values of r8712_set_802_11_add_wep from true and false and
_SUCCESS to -EINVAL and the return value of r8712_set_key.
Change return type from u8 to int to accommodate these new return
values.

Signed-off-by: default avatarNishka Dasgupta <nishkadg.linux@gmail.com>
Link: https://lore.kernel.org/r/20190722092341.21030-6-nishkadg.linux@gmail.com


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

drivers/staging/rtl8712/rtl871x_ioctl_linux.c

+2 −3
Original line number Diff line number Diff line
@@ -419,8 +419,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, 
		pwep->KeyIndex |= 0x80000000;

		memcpy(pwep->KeyMaterial, param->u.crypt.key, pwep->KeyLength);

		if (param->u.crypt.set_tx) {

			if (r8712_set_802_11_add_wep(padapter, pwep) ==

			    (u8)_FAIL)

			if (r8712_set_802_11_add_wep(padapter, pwep))

				ret = -EOPNOTSUPP;

		} else {

			/* don't update "psecuritypriv->PrivacyAlgrthm" and
@@ -1585,7 +1584,7 @@ static int r8711_wx_set_enc(struct net_device *dev, 
	}

	wep.KeyIndex |= 0x80000000;	/* transmit key */

	memcpy(wep.KeyMaterial, keybuf, wep.KeyLength);

	if (r8712_set_802_11_add_wep(padapter, &wep) == _FAIL)

	if (r8712_set_802_11_add_wep(padapter, &wep))

		return -EOPNOTSUPP;

	return 0;

}

drivers/staging/rtl8712/rtl871x_ioctl_set.c

+4 −6
Original line number Diff line number Diff line
@@ -327,7 +327,7 @@ u8 r8712_set_802_11_authentication_mode(struct _adapter *padapter, 
	return ret;

}



u8 r8712_set_802_11_add_wep(struct _adapter *padapter,

int r8712_set_802_11_add_wep(struct _adapter *padapter,

			     struct NDIS_802_11_WEP *wep)

{

	sint	keyid;
@@ -335,7 +335,7 @@ u8 r8712_set_802_11_add_wep(struct _adapter *padapter, 


	keyid = wep->KeyIndex & 0x3fffffff;

	if (keyid >= WEP_KEYS)

		return false;

		return -EINVAL;

	switch (wep->KeyLength) {

	case 5:

		psecuritypriv->PrivacyAlgrthm = _WEP40_;
@@ -351,7 +351,5 @@ u8 r8712_set_802_11_add_wep(struct _adapter *padapter, 
		wep->KeyLength);

	psecuritypriv->DefKeylen[keyid] = wep->KeyLength;

	psecuritypriv->PrivacyKeyIndex = keyid;

	if (r8712_set_key(padapter, psecuritypriv, keyid))

		return false;

	return _SUCCESS;

	return r8712_set_key(padapter, psecuritypriv, keyid);

}

drivers/staging/rtl8712/rtl871x_ioctl_set.h

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ u8 r8712_set_802_11_authentication_mode(struct _adapter *pdapter, 


u8 r8712_set_802_11_bssid(struct _adapter *padapter, u8 *bssid);



u8 r8712_set_802_11_add_wep(struct _adapter *padapter,

int r8712_set_802_11_add_wep(struct _adapter *padapter,

			     struct NDIS_802_11_WEP *wep);



u8 r8712_set_802_11_disassociate(struct _adapter *padapter);

CRA Git | Maintained and supported by SUSTech CRA and CCSE