Commit 8a4b1870 authored by Sevinj Aghayeva's avatar Sevinj Aghayeva Committed by Greg Kroah-Hartman
Browse files

staging: r8188eu: simplify control flow 



The function iterates an index from 0 to NUM_PMKID_CACHE and returns
the first index for which the condition is true. If no such index is
found, the function returns -1. Current code has a complex control
flow that obfuscates this simple task. Replace it with a loop.

Also, given the shortened function body, replace the long variable
name psecuritypriv with a short variable name p.

Reported by checkpatch:

WARNING: else is not generally useful after a break or return

Signed-off-by: default avatarSevinj Aghayeva <sevinj.aghayeva@gmail.com>
Link: https://lore.kernel.org/r/20220403164250.GA371601@euclid


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

drivers/staging/r8188eu/core/rtw_mlme.c

+6 −19
Original line number Diff line number Diff line
@@ -1637,26 +1637,13 @@ int rtw_restruct_wmm_ie(struct adapter *adapter, u8 *in_ie, u8 *out_ie, uint in_ 


static int SecIsInPMKIDList(struct adapter *Adapter, u8 *bssid)

{

	struct security_priv *psecuritypriv = &Adapter->securitypriv;

	int i = 0;



	do {

		if ((psecuritypriv->PMKIDList[i].bUsed) &&

		    (!memcmp(psecuritypriv->PMKIDList[i].Bssid, bssid, ETH_ALEN))) {

			break;

		} else {

			i++;

			/* continue; */

		}



	} while (i < NUM_PMKID_CACHE);

	struct security_priv *p = &Adapter->securitypriv;

	int i;



	if (i == NUM_PMKID_CACHE) {

		i = -1;/*  Could not find. */

	} else {

		/*  There is one Pre-Authentication Key for the specific BSSID. */

	}

	for (i = 0; i < NUM_PMKID_CACHE; i++)

		if (p->PMKIDList[i].bUsed && !memcmp(p->PMKIDList[i].Bssid, bssid, ETH_ALEN))

			return i;

	return -1;

}



/*  */