Commit e6d93795 authored by Narcisa Ana Maria Vasile's avatar Narcisa Ana Maria Vasile Committed by Greg Kroah-Hartman
Browse files

staging: rtl8712: Invert if statements to reduce indentation level 



Invert if statements to be able to return immediately in case of error,
and to avoid additional else branch, and then continue with the rest
of the function without excessive indentation.

This was found using the following Coccinelle script:

@disable neg_if@
expression e,E;
statement S;
@@

*if (e)
S
else { return -E; }

@disable neg_if@
expression e,E;
statement S;
identifier l;
@@

*if (e)
S
else { rc = -E; goto l;  }

Signed-off-by: default avatarNarcisa Ana Maria Vasile <narcisaanamaria12@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ff49304b

drivers/staging/rtl8712/rtl871x_ioctl_linux.c

+17 −22
Original line number Diff line number Diff line
@@ -378,14 +378,13 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, 
	if (param_len != (u32)((u8 *) param->u.crypt.key - (u8 *)param) +

			 param->u.crypt.key_len)

		return -EINVAL;

	if (is_broadcast_ether_addr(param->sta_addr)) {

	if (!is_broadcast_ether_addr(param->sta_addr))

		return -EINVAL;



	if (param->u.crypt.idx >= WEP_KEYS) {

		/* for large key indices, set the default (0) */

		param->u.crypt.idx = 0;

	}

	} else {

		return -EINVAL;

	}

	if (strcmp(param->u.crypt.alg, "WEP") == 0) {

		netdev_info(dev, "r8712u: %s: crypt.alg = WEP\n", __func__);

		padapter->securitypriv.ndisencryptstatus =
@@ -396,23 +395,19 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, 
		wep_key_len = param->u.crypt.key_len;

		if (wep_key_idx >= WEP_KEYS)

			wep_key_idx = 0;

		if (wep_key_len > 0) {

		if (wep_key_len <= 0)

			return -EINVAL;



		wep_key_len = wep_key_len <= 5 ? 5 : 13;

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

		if (!pwep)

			return -ENOMEM;

		pwep->KeyLength = wep_key_len;

		pwep->Length = wep_key_len +

				 FIELD_OFFSET(struct NDIS_802_11_WEP,

				 KeyMaterial);

			FIELD_OFFSET(struct NDIS_802_11_WEP, KeyMaterial);

		if (wep_key_len == 13) {

				padapter->securitypriv.PrivacyAlgrthm =

					 _WEP104_;

				padapter->securitypriv.XGrpPrivacy =

					 _WEP104_;

			}

		} else {

			return -EINVAL;

			padapter->securitypriv.PrivacyAlgrthm = _WEP104_;

			padapter->securitypriv.XGrpPrivacy = _WEP104_;

		}

		pwep->KeyIndex = wep_key_idx;

		pwep->KeyIndex |= 0x80000000;

CRA Git | Maintained and supported by SUSTech CRA and CCSE