Commit 1a646e7e authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: use memcmp instead of WILC_memcmp 



Use memcmp instead of WILC_memcmp.

Signed-off-by: default avatarChaehyun Lim <chaehyun.lim@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 70b801cb

drivers/staging/wilc1000/host_interface.c

+10 −10
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ s32 Handle_get_IPAddress(void *drvHandler, u8 *pu8IPAddr, u8 idx) 
	/*get the value by searching the local copy*/

	WILC_FREE(strWID.ps8WidVal);



	if (WILC_memcmp(gs8GetIP[idx], gs8SetIP[idx], IP_ALEN) != 0)

	if (memcmp(gs8GetIP[idx], gs8SetIP[idx], IP_ALEN) != 0)

		host_int_setup_ipaddress((WILC_WFIDrvHandle)pstrWFIDrv, gs8SetIP[idx], idx);



	if (s32Error != WILC_SUCCESS) {
@@ -1527,7 +1527,7 @@ static s32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrHostIFcon 




	for (i = 0; i < pstrWFIDrv->u32SurveyResultsCount; i++)	{

		if (WILC_memcmp(pstrWFIDrv->astrSurveyResults[i].SSID,

		if (memcmp(pstrWFIDrv->astrSurveyResults[i].SSID,

				pstrHostIFconnectAttr->pu8ssid,

				pstrHostIFconnectAttr->ssidLen) == 0) {

			PRINT_INFO(HOSTINF_DBG, "Network with required SSID is found %s\n", pstrHostIFconnectAttr->pu8ssid);
@@ -1540,7 +1540,7 @@ static s32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrHostIFcon 
				/* BSSID is also passed from the user, so decision of matching

				 * should consider also this passed BSSID */



				if (WILC_memcmp(pstrWFIDrv->astrSurveyResults[i].BSSID,

				if (memcmp(pstrWFIDrv->astrSurveyResults[i].BSSID,

						pstrHostIFconnectAttr->pu8bssid,

						6) == 0) {

					PRINT_INFO(HOSTINF_DBG, "BSSID is passed from the user and matched\n");
@@ -1648,7 +1648,7 @@ static s32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrHostIFcon 


	/* if we try to connect to an already connected AP then discard the request */



	if (WILC_memcmp(pstrHostIFconnectAttr->pu8bssid, u8ConnectedSSID, ETH_ALEN) == 0) {

	if (memcmp(pstrHostIFconnectAttr->pu8bssid, u8ConnectedSSID, ETH_ALEN) == 0) {



		s32Error = WILC_SUCCESS;

		PRINT_ER("Trying to connect to an already connected AP, Discard connect request\n");
@@ -1720,7 +1720,7 @@ static s32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrHostIFcon 
		u32WidsCount++;



		/*BugID_5137*/

		if (WILC_memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) {

		if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) {



			gu32FlushedInfoElemAsocSize = pstrWFIDrv->strWILC_UsrConnReq.ConnReqIEsLen;

			gu8FlushedInfoElemAsoc =  WILC_MALLOC(gu32FlushedInfoElemAsocSize);
@@ -1735,7 +1735,7 @@ static s32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrHostIFcon 
	u32WidsCount++;



	/*BugID_5137*/

	if (WILC_memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7))

	if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7))

		gu8Flushed11iMode = pstrWFIDrv->strWILC_UsrConnReq.u8security;



	PRINT_INFO(HOSTINF_DBG, "Encrypt Mode = %x\n", pstrWFIDrv->strWILC_UsrConnReq.u8security);
@@ -1748,7 +1748,7 @@ static s32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrHostIFcon 
	u32WidsCount++;



	/*BugID_5137*/

	if (WILC_memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7))

	if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7))

		gu8FlushedAuthType = (u8)pstrWFIDrv->strWILC_UsrConnReq.tenuAuth_type;



	PRINT_INFO(HOSTINF_DBG, "Authentication Type = %x\n", pstrWFIDrv->strWILC_UsrConnReq.tenuAuth_type);
@@ -1803,7 +1803,7 @@ static s32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrHostIFcon 
	strWIDList[u32WidsCount].ps8WidVal = WILC_MALLOC(strWIDList[u32WidsCount].s32ValueSize);



	/*BugID_5137*/

	if (WILC_memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) {

	if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) {

		gu32FlushedJoinReqSize = strWIDList[u32WidsCount].s32ValueSize;

		gu8FlushedJoinReq = WILC_MALLOC(gu32FlushedJoinReqSize);

	}
@@ -1940,7 +1940,7 @@ static s32 Handle_Connect(void *drvHandler, tstrHostIFconnectAttr *pstrHostIFcon 
	/* ////////////////////// */



	/*BugID_5137*/

	if (WILC_memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) {

	if (memcmp("DIRECT-", pstrHostIFconnectAttr->pu8ssid, 7)) {

		memcpy(gu8FlushedJoinReq, pu8CurrByte, gu32FlushedJoinReqSize);

		gu8FlushedJoinReqDrvHandler = (u32)pstrWFIDrv;

	}
@@ -2246,7 +2246,7 @@ static s32 Handle_RcvdNtwrkInfo(void *drvHandler, tstrRcvdNetworkInfo *pstrRcvdN 


			if ((pstrWFIDrv->strWILC_UsrScanReq.astrFoundNetworkInfo[i].au8bssid != NULL) &&

			    (pstrNetworkInfo->au8bssid != NULL)) {

				if (WILC_memcmp(pstrWFIDrv->strWILC_UsrScanReq.astrFoundNetworkInfo[i].au8bssid,

				if (memcmp(pstrWFIDrv->strWILC_UsrScanReq.astrFoundNetworkInfo[i].au8bssid,

						pstrNetworkInfo->au8bssid, 6) == 0) {

					if (pstrNetworkInfo->s8rssi <= pstrWFIDrv->strWILC_UsrScanReq.astrFoundNetworkInfo[i].s8rssi) {

						/*we have already found this network with better rssi, so keep the old cached one and don't

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+16 −16
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ void refresh_scan(void *pUserVoid, uint8_t all, bool bDirectScan) 
				channel = ieee80211_get_channel(wiphy, s32Freq);



				rssi = get_rssi_avg(pstrNetworkInfo);

				if (WILC_memcmp("DIRECT-", pstrNetworkInfo->au8ssid, 7) || bDirectScan)	{

				if (memcmp("DIRECT-", pstrNetworkInfo->au8ssid, 7) || bDirectScan)	{

					bss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN, pstrNetworkInfo->au8bssid, pstrNetworkInfo->u64Tsf, pstrNetworkInfo->u16CapInfo,

								  pstrNetworkInfo->u16BeaconPeriod, (const u8 *)pstrNetworkInfo->pu8IEs,

								  (size_t)pstrNetworkInfo->u16IEsLen, (((s32)rssi) * 100), GFP_KERNEL);
@@ -283,7 +283,7 @@ int8_t is_network_in_shadow(tstrNetworkInfo *pstrNetworkInfo, void *pUserVoid) 
	} else {

		/* Linear search for now */

		for (i = 0; i < u32LastScannedNtwrksCountShadow; i++) {

			if (WILC_memcmp(astrLastScannedNtwrksShadow[i].au8bssid,

			if (memcmp(astrLastScannedNtwrksShadow[i].au8bssid,

					pstrNetworkInfo->au8bssid, 6) == 0) {

				state = i;

				break;
@@ -414,7 +414,7 @@ static void CfgScanResult(tenuScanEvent enuScanEvent, tstrNetworkInfo *pstrNetwo 


						/*P2P peers are sent to WPA supplicant and added to shadow table*/



						if (!(WILC_memcmp("DIRECT-", pstrNetworkInfo->au8ssid, 7))) {

						if (!(memcmp("DIRECT-", pstrNetworkInfo->au8ssid, 7))) {

							bss = cfg80211_inform_bss(wiphy, channel, CFG80211_BSS_FTYPE_UNKNOWN,  pstrNetworkInfo->au8bssid, pstrNetworkInfo->u64Tsf, pstrNetworkInfo->u16CapInfo,

										  pstrNetworkInfo->u16BeaconPeriod, (const u8 *)pstrNetworkInfo->pu8IEs,

										  (size_t)pstrNetworkInfo->u16IEsLen, (((s32)pstrNetworkInfo->s8rssi) * 100), GFP_KERNEL);
@@ -429,7 +429,7 @@ static void CfgScanResult(tenuScanEvent enuScanEvent, tstrNetworkInfo *pstrNetwo 
					u32 i;

					/* So this network is discovered before, we'll just update its RSSI */

					for (i = 0; i < priv->u32RcvdChCount; i++) {

						if (WILC_memcmp(astrLastScannedNtwrksShadow[i].au8bssid, pstrNetworkInfo->au8bssid, 6) == 0) {

						if (memcmp(astrLastScannedNtwrksShadow[i].au8bssid, pstrNetworkInfo->au8bssid, 6) == 0) {

							PRINT_D(CFG80211_DBG, "Update RSSI of %s \n", astrLastScannedNtwrksShadow[i].au8ssid);



							astrLastScannedNtwrksShadow[i].s8rssi = pstrNetworkInfo->s8rssi;
@@ -503,7 +503,7 @@ int WILC_WFI_Set_PMKSA(u8 *bssid, struct WILC_WFI_priv *priv) 


	for (i = 0; i < priv->pmkid_list.numpmkid; i++)	{



		if (!WILC_memcmp(bssid, priv->pmkid_list.pmkidlist[i].bssid,

		if (!memcmp(bssid, priv->pmkid_list.pmkidlist[i].bssid,

				 ETH_ALEN)) {

			PRINT_D(CFG80211_DBG, "PMKID successful comparison");
@@ -599,7 +599,7 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent, 
			 *  Linux kernel warning generated at the nl80211 layer */



			for (i = 0; i < u32LastScannedNtwrksCountShadow; i++) {

				if (WILC_memcmp(astrLastScannedNtwrksShadow[i].au8bssid,

				if (memcmp(astrLastScannedNtwrksShadow[i].au8bssid,

						pstrConnectInfo->au8bssid, ETH_ALEN) == 0) {

					unsigned long now = jiffies;
@@ -845,7 +845,7 @@ static int WILC_WFI_CfgConnect(struct wiphy *wiphy, struct net_device *dev, 


	for (i = 0; i < u32LastScannedNtwrksCountShadow; i++) {

		if ((sme->ssid_len == astrLastScannedNtwrksShadow[i].u8SsidLen) &&

		    WILC_memcmp(astrLastScannedNtwrksShadow[i].au8ssid,

		    memcmp(astrLastScannedNtwrksShadow[i].au8ssid,

				sme->ssid,

				sme->ssid_len) == 0) {

			PRINT_INFO(CFG80211_DBG, "Network with required SSID is found %s\n", sme->ssid);
@@ -857,7 +857,7 @@ static int WILC_WFI_CfgConnect(struct wiphy *wiphy, struct net_device *dev, 
			} else {

				/* BSSID is also passed from the user, so decision of matching

				 * should consider also this passed BSSID */

				if (WILC_memcmp(astrLastScannedNtwrksShadow[i].au8bssid,

				if (memcmp(astrLastScannedNtwrksShadow[i].au8bssid,

						sme->bssid,

						ETH_ALEN) == 0)	{

					PRINT_INFO(CFG80211_DBG, "BSSID is passed from the user and matched\n");
@@ -1170,7 +1170,7 @@ static int WILC_WFI_add_key(struct wiphy *wiphy, struct net_device *netdev, u8 k 
			break;

		}

				#endif

		if (WILC_memcmp(params->key, priv->WILC_WFI_wep_key[key_index], params->key_len)) {

		if (memcmp(params->key, priv->WILC_WFI_wep_key[key_index], params->key_len)) {

			priv->WILC_WFI_wep_default = key_index;

			priv->WILC_WFI_wep_key_len[key_index] = params->key_len;

			WILC_memcpy(priv->WILC_WFI_wep_key[key_index], params->key, params->key_len);
@@ -1896,7 +1896,7 @@ static int WILC_WFI_set_pmksa(struct wiphy *wiphy, struct net_device *netdev, 




	for (i = 0; i < priv->pmkid_list.numpmkid; i++)	{

		if (!WILC_memcmp(pmksa->bssid, priv->pmkid_list.pmkidlist[i].bssid,

		if (!memcmp(pmksa->bssid, priv->pmkid_list.pmkidlist[i].bssid,

				 ETH_ALEN)) {

			/*If bssid already exists and pmkid value needs to reset*/

			flag = PMKID_FOUND;
@@ -1946,7 +1946,7 @@ static int WILC_WFI_del_pmksa(struct wiphy *wiphy, struct net_device *netdev, 
	PRINT_D(CFG80211_DBG, "Deleting PMKSA keys\n");



	for (i = 0; i < priv->pmkid_list.numpmkid; i++)	{

		if (!WILC_memcmp(pmksa->bssid, priv->pmkid_list.pmkidlist[i].bssid,

		if (!memcmp(pmksa->bssid, priv->pmkid_list.pmkidlist[i].bssid,

				 ETH_ALEN)) {

			/*If bssid is found, reset the values*/

			PRINT_D(CFG80211_DBG, "Reseting PMKID values\n");
@@ -2257,11 +2257,11 @@ void WILC_WFI_p2p_rx (struct net_device *dev, uint8_t *buff, uint32_t size) 
				case PUBLIC_ACT_VENDORSPEC:

					/*Now we have a public action vendor specific action frame, check if its a p2p public action frame

					 * based on the standard its should have the p2p_oui attribute with the following values 50 6f 9A 09*/

					if (!WILC_memcmp(u8P2P_oui, &buff[ACTION_SUBTYPE_ID + 1], 4)) {

					if (!memcmp(u8P2P_oui, &buff[ACTION_SUBTYPE_ID + 1], 4)) {

						if ((buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP))	{

							if (!bWilc_ie) {

								for (i = P2P_PUB_ACTION_SUBTYPE; i < size; i++)	{

									if (!WILC_memcmp(u8P2P_vendorspec, &buff[i], 6)) {

									if (!memcmp(u8P2P_vendorspec, &buff[i], 6)) {

										u8P2Precvrandom = buff[i + 6];

										bWilc_ie = true;

										PRINT_D(GENERIC_DBG, "WILC Vendor specific IE:%02x\n", u8P2Precvrandom);
@@ -2274,7 +2274,7 @@ void WILC_WFI_p2p_rx (struct net_device *dev, uint8_t *buff, uint32_t size) 
							if ((buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP

							      || buff[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_REQ || buff[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_RSP)) {

								for (i = P2P_PUB_ACTION_SUBTYPE + 2; i < size; i++) {

									if (buff[i] == P2PELEM_ATTR_ID && !(WILC_memcmp(u8P2P_oui, &buff[i + 2], 4))) {

									if (buff[i] == P2PELEM_ATTR_ID && !(memcmp(u8P2P_oui, &buff[i + 2], 4))) {

										WILC_WFI_CfgParseRxAction(&buff[i + 6], size - (i + 6));

										break;

									}
@@ -2570,7 +2570,7 @@ int WILC_WFI_mgmt_tx(struct wiphy *wiphy, 
				{

					/*Now we have a public action vendor specific action frame, check if its a p2p public action frame

					 * based on the standard its should have the p2p_oui attribute with the following values 50 6f 9A 09*/

					if (!WILC_memcmp(u8P2P_oui, &buf[ACTION_SUBTYPE_ID + 1], 4)) {

					if (!memcmp(u8P2P_oui, &buf[ACTION_SUBTYPE_ID + 1], 4)) {

						/*For the connection of two WILC's connection generate a rand number to determine who will be a GO*/

						if ((buf[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_REQ || buf[P2P_PUB_ACTION_SUBTYPE] == GO_NEG_RSP)) {

							if (u8P2Plocalrandom == 1 && u8P2Precvrandom < u8P2Plocalrandom) {
@@ -2587,7 +2587,7 @@ int WILC_WFI_mgmt_tx(struct wiphy *wiphy, 


								/*Search for the p2p information information element , after the Public action subtype theres a byte for teh dialog token, skip that*/

								for (i = P2P_PUB_ACTION_SUBTYPE + 2; i < len; i++) {

									if (buf[i] == P2PELEM_ATTR_ID && !(WILC_memcmp(u8P2P_oui, &buf[i + 2], 4))) {

									if (buf[i] == P2PELEM_ATTR_ID && !(memcmp(u8P2P_oui, &buf[i + 2], 4))) {

										if (buf[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_REQ || buf[P2P_PUB_ACTION_SUBTYPE] == P2P_INV_RSP)

											WILC_WFI_CfgParseTxAction(&mgmt_tx->buff[i + 6], len - (i + 6), true, nic->iftype);