Commit 2cc46837 authored by Chaehyun Lim's avatar Chaehyun Lim Committed by Greg Kroah-Hartman
Browse files

staging: wilc1000: use memset instead of WILC_memset 



Use memset instead of WILC_memset.

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

drivers/staging/wilc1000/coreconfigurator.c

+8 −8
Original line number Diff line number Diff line
@@ -681,9 +681,9 @@ s32 CoreConfiguratorInit(void) 
		goto _fail_;

	}



	WILC_memset((void *)gps8ConfigPacket, 0, MAX_PACKET_BUFF_SIZE);

	memset((void *)gps8ConfigPacket, 0, MAX_PACKET_BUFF_SIZE);



	WILC_memset((void *)(&gstrConfigPktInfo), 0, sizeof(tstrConfigPktInfo));

	memset((void *)(&gstrConfigPktInfo), 0, sizeof(tstrConfigPktInfo));

_fail_:

	return s32Error;

}
@@ -812,7 +812,7 @@ s32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo) 
		u32 u32Tsf_Hi;



		pstrNetworkInfo = (tstrNetworkInfo *)WILC_MALLOC(sizeof(tstrNetworkInfo));

		WILC_memset((void *)(pstrNetworkInfo), 0, sizeof(tstrNetworkInfo));

		memset((void *)(pstrNetworkInfo), 0, sizeof(tstrNetworkInfo));



		pstrNetworkInfo->s8rssi = pu8WidVal[0];
@@ -862,7 +862,7 @@ s32 ParseNetworkInfo(u8 *pu8MsgBuffer, tstrNetworkInfo **ppstrNetworkInfo) 


		if (u16IEsLen > 0) {

			pstrNetworkInfo->pu8IEs = (u8 *)WILC_MALLOC(u16IEsLen);

			WILC_memset((void *)(pstrNetworkInfo->pu8IEs), 0, u16IEsLen);

			memset((void *)(pstrNetworkInfo->pu8IEs), 0, u16IEsLen);



			WILC_memcpy(pstrNetworkInfo->pu8IEs, pu8IEs, u16IEsLen);

		}
@@ -929,7 +929,7 @@ s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen, 
	u16 u16IEsLen = 0;



	pstrConnectRespInfo = (tstrConnectRespInfo *)WILC_MALLOC(sizeof(tstrConnectRespInfo));

	WILC_memset((void *)(pstrConnectRespInfo), 0, sizeof(tstrConnectRespInfo));

	memset((void *)(pstrConnectRespInfo), 0, sizeof(tstrConnectRespInfo));



	/* u16AssocRespLen = pu8Buffer[0]; */

	u16AssocRespLen = (u16)u32BufferLen;
@@ -949,7 +949,7 @@ s32 ParseAssocRespInfo(u8 *pu8Buffer, u32 u32BufferLen, 
		u16IEsLen = u16AssocRespLen - (CAP_INFO_LEN + STATUS_CODE_LEN + AID_LEN);



		pstrConnectRespInfo->pu8RespIEs = (u8 *)WILC_MALLOC(u16IEsLen);

		WILC_memset((void *)(pstrConnectRespInfo->pu8RespIEs), 0, u16IEsLen);

		memset((void *)(pstrConnectRespInfo->pu8RespIEs), 0, u16IEsLen);



		WILC_memcpy(pstrConnectRespInfo->pu8RespIEs, pu8IEs, u16IEsLen);

		pstrConnectRespInfo->u16RespIEsLen = u16IEsLen;
@@ -1023,7 +1023,7 @@ s32 ParseSurveyResults(u8 ppu8RcvdSiteSurveyResults[][MAX_SURVEY_RESULT_FRAG_SIZ 
		WILC_ERRORREPORT(s32Error, WILC_NO_MEM);

	}



	WILC_memset((void *)(pstrSurveyResults), 0, u32SurveyResultsCount * sizeof(wid_site_survey_reslts_s));

	memset((void *)(pstrSurveyResults), 0, u32SurveyResultsCount * sizeof(wid_site_survey_reslts_s));



	u32SurveyResultsCount = 0;
@@ -1871,7 +1871,7 @@ s32 ConfigWaitResponse(char *pcRespBuffer, s32 s32MaxRespBuffLen, s32 *ps32Bytes 
		*ps32BytesRead = gstrConfigPktInfo.s32BytesRead;

	}



	WILC_memset((void *)(&gstrConfigPktInfo), 0, sizeof(tstrConfigPktInfo));

	memset((void *)(&gstrConfigPktInfo), 0, sizeof(tstrConfigPktInfo));



	return s32Error;

}

drivers/staging/wilc1000/host_interface.c

+67 −67

File changed.

Preview size limit exceeded, changes collapsed.

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+8 −8
Original line number Diff line number Diff line
@@ -574,7 +574,7 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent, 
			 *  = SUCCESSFUL_STATUSCODE, while mac status is MAC_DISCONNECTED (which means something wrong happened) */

			u16ConnectStatus = WLAN_STATUS_UNSPECIFIED_FAILURE;

			linux_wlan_set_bssid(priv->dev, NullBssid);

			WILC_memset(u8ConnectedSSID, 0, ETH_ALEN);

			memset(u8ConnectedSSID, 0, ETH_ALEN);



			/*BugID_5457*/

			/*Invalidate u8WLANChannel value on wlan0 disconnect*/
@@ -640,9 +640,9 @@ static void CfgConnectResult(tenuConnDisconnEvent enuConnDisconnEvent, 
		u8P2Plocalrandom = 0x01;

		u8P2Precvrandom = 0x00;

		bWilc_ie = false;

		WILC_memset(priv->au8AssociatedBss, 0, ETH_ALEN);

		memset(priv->au8AssociatedBss, 0, ETH_ALEN);

		linux_wlan_set_bssid(priv->dev, NullBssid);

		WILC_memset(u8ConnectedSSID, 0, ETH_ALEN);

		memset(u8ConnectedSSID, 0, ETH_ALEN);



		/*BugID_5457*/

		/*Invalidate u8WLANChannel value on wlan0 disconnect*/
@@ -887,8 +887,8 @@ static int WILC_WFI_CfgConnect(struct wiphy *wiphy, struct net_device *dev, 
	}



	priv->WILC_WFI_wep_default = 0;

	WILC_memset(priv->WILC_WFI_wep_key, 0, sizeof(priv->WILC_WFI_wep_key));

	WILC_memset(priv->WILC_WFI_wep_key_len, 0, sizeof(priv->WILC_WFI_wep_key_len));

	memset(priv->WILC_WFI_wep_key, 0, sizeof(priv->WILC_WFI_wep_key));

	memset(priv->WILC_WFI_wep_key_len, 0, sizeof(priv->WILC_WFI_wep_key_len));



	PRINT_INFO(CFG80211_DBG, "sme->crypto.wpa_versions=%x\n", sme->crypto.wpa_versions);

	PRINT_INFO(CFG80211_DBG, "sme->crypto.cipher_group=%x\n", sme->crypto.cipher_group);
@@ -1490,7 +1490,7 @@ static int WILC_WFI_del_key(struct wiphy *wiphy, struct net_device *netdev, 
	}



	if (key_index >= 0 && key_index <= 3) {

		WILC_memset(priv->WILC_WFI_wep_key[key_index], 0, priv->WILC_WFI_wep_key_len[key_index]);

		memset(priv->WILC_WFI_wep_key[key_index], 0, priv->WILC_WFI_wep_key_len[key_index]);

		priv->WILC_WFI_wep_key_len[key_index] = 0;



		PRINT_D(CFG80211_DBG, "Removing WEP key with index = %d\n", key_index);
@@ -1950,7 +1950,7 @@ static int WILC_WFI_del_pmksa(struct wiphy *wiphy, struct net_device *netdev, 
				 ETH_ALEN)) {

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

			PRINT_D(CFG80211_DBG, "Reseting PMKID values\n");

			WILC_memset(&priv->pmkid_list.pmkidlist[i], 0, sizeof(tstrHostIFpmkid));

			memset(&priv->pmkid_list.pmkidlist[i], 0, sizeof(tstrHostIFpmkid));

			flag = PMKID_FOUND;

			break;

		}
@@ -1989,7 +1989,7 @@ static int WILC_WFI_flush_pmksa(struct wiphy *wiphy, struct net_device *netdev) 
	PRINT_D(CFG80211_DBG,  "Flushing  PMKID key values\n");



	/*Get cashed Pmkids and set all with zeros*/

	WILC_memset(&priv->pmkid_list, 0, sizeof(tstrHostIFpmkidAttr));

	memset(&priv->pmkid_list, 0, sizeof(tstrHostIFpmkidAttr));



	return 0;

}