Commit 1ce39848 authored by navin patidar's avatar navin patidar Committed by Greg Kroah-Hartman
Browse files

staging: rtl8188eu: Remove function _rtw_memset() 



Signed-off-by: default avatarnavin patidar <navin.patidar@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 56ed3914

drivers/staging/rtl8188eu/core/rtw_ap.c

+6 −6
Original line number Diff line number Diff line
@@ -548,7 +548,7 @@ static void update_bmc_sta(struct adapter *padapter) 


		psta->ieee8021x_blocked = 0;



		_rtw_memset((void *)&psta->sta_stats, 0, sizeof(struct stainfo_stats));

		memset((void *)&psta->sta_stats, 0, sizeof(struct stainfo_stats));



		/* prepare for add_RATid */

		supportRateNum = rtw_get_rateset_len((u8 *)&pcur_network->SupportedRates);
@@ -671,7 +671,7 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta) 


	/* todo: init other variables */



	_rtw_memset((void *)&psta->sta_stats, 0, sizeof(struct stainfo_stats));

	memset((void *)&psta->sta_stats, 0, sizeof(struct stainfo_stats));



	spin_lock_bh(&psta->lock);

	psta->state |= _FW_LINKED;
@@ -886,7 +886,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 


	pbss_network->IELength = len;



	_rtw_memset(ie, 0, MAX_IE_SZ);

	memset(ie, 0, MAX_IE_SZ);



	memcpy(ie, pbuf, pbss_network->IELength);
@@ -908,7 +908,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 
	/* SSID */

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SSID_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));

	if (p && ie_len > 0) {

		_rtw_memset(&pbss_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));

		memset(&pbss_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));

		memcpy(pbss_network->Ssid.Ssid, (p + 2), ie_len);

		pbss_network->Ssid.SsidLength = ie_len;

	}
@@ -922,7 +922,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len) 


	pbss_network->Configuration.DSConfig = channel;



	_rtw_memset(supportRate, 0, NDIS_802_11_LENGTH_RATES_EX);

	memset(supportRate, 0, NDIS_802_11_LENGTH_RATES_EX);

	/*  get supported rates */

	p = rtw_get_ie(ie + _BEACON_IE_OFFSET_, _SUPPORTEDRATES_IE_, &ie_len, (pbss_network->IELength - _BEACON_IE_OFFSET_));

	if (p !=  NULL) {
@@ -1934,7 +1934,7 @@ void stop_ap_mode(struct adapter *padapter) 
	pmlmeext->bstart_bss = false;



	/* reset and init security priv , this can refine with rtw_reset_securitypriv */

	_rtw_memset((unsigned char *)&padapter->securitypriv, 0, sizeof(struct security_priv));

	memset((unsigned char *)&padapter->securitypriv, 0, sizeof(struct security_priv));

	padapter->securitypriv.ndisauthtype = Ndis802_11AuthModeOpen;

	padapter->securitypriv.ndisencryptstatus = Ndis802_11WEPDisabled;

drivers/staging/rtl8188eu/core/rtw_cmd.c

+1 −1
Original line number Diff line number Diff line
@@ -878,7 +878,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network *pnetwork) 
		goto exit;

	}



	_rtw_memset(psecnetwork, 0, t_len);

	memset(psecnetwork, 0, t_len);



	memcpy(psecnetwork, &pnetwork->network, get_wlan_bssid_ex_sz(&pnetwork->network));

drivers/staging/rtl8188eu/core/rtw_efuse.c

+9 −9
Original line number Diff line number Diff line
@@ -304,7 +304,7 @@ static s32 iol_read_efuse(struct adapter *padapter, u8 txpktbuf_bndy, u16 offset 
	u16 size = 512;



	usb_write8(padapter, REG_TDECTRL+1, txpktbuf_bndy);

	_rtw_memset(physical_map, 0xFF, 512);

	memset(physical_map, 0xFF, 512);

	usb_write8(padapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT);

	status = iol_execute(padapter, CMD_READ_EFUSE_MAP);

	if (status == _SUCCESS)
@@ -395,7 +395,7 @@ u8 Efuse_WordEnableDataWrite(struct adapter *pAdapter, u16 efuse_addr, u8 word_e 
	u8 badworden = 0x0F;

	u8 tmpdata[8];



	_rtw_memset((void *)tmpdata, 0xff, PGPKT_DATA_SIZE);

	memset((void *)tmpdata, 0xff, PGPKT_DATA_SIZE);



	if (!(word_en&BIT0)) {

		tmpaddr = start_addr;
@@ -501,8 +501,8 @@ int Efuse_PgPacketRead(struct adapter *pAdapter, u8 offset, u8 *data) 
	if (offset > max_section)

		return false;



	_rtw_memset((void *)data, 0xff, sizeof(u8)*PGPKT_DATA_SIZE);

	_rtw_memset((void *)tmpdata, 0xff, sizeof(u8)*PGPKT_DATA_SIZE);

	memset((void *)data, 0xff, sizeof(u8)*PGPKT_DATA_SIZE);

	memset((void *)tmpdata, 0xff, sizeof(u8)*PGPKT_DATA_SIZE);



	/*  <Roger_TODO> Efuse has been pre-programmed dummy 5Bytes at the end of Efuse by CP. */

	/*  Skip dummy parts to prevent unexpected data read from Efuse. */
@@ -573,7 +573,7 @@ static bool hal_EfuseFixHeaderProcess(struct adapter *pAdapter, u8 efuseType, st 
	u16	efuse_addr = *pAddr;

	u32	PgWriteSuccess = 0;



	_rtw_memset((void *)originaldata, 0xff, 8);

	memset((void *)originaldata, 0xff, 8);



	if (Efuse_PgPacketRead(pAdapter, pFixPkt->offset, originaldata)) {

		/* check if data exist */
@@ -868,7 +868,7 @@ hal_EfusePgCheckAvailableAddr( 


static void hal_EfuseConstructPGPkt(u8 offset, u8 word_en, u8 *pData, struct pgpkt *pTargetPkt)

{

	_rtw_memset((void *)pTargetPkt->data, 0xFF, sizeof(u8)*8);

	memset((void *)pTargetPkt->data, 0xFF, sizeof(u8)*8);

	pTargetPkt->offset = offset;

	pTargetPkt->word_en = word_en;

	efuse_WordEnableDataRead(word_en, pData, pTargetPkt->data);
@@ -1095,7 +1095,7 @@ u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) 


	offset = (addr >> 3);

	word_en = 0xF;

	_rtw_memset(newdata, 0xFF, PGPKT_DATA_SIZE + 1);

	memset(newdata, 0xFF, PGPKT_DATA_SIZE + 1);

	i = addr & 0x7;	/*  index of one package */

	idx = 0;	/*  data index */
@@ -1151,7 +1151,7 @@ u8 rtw_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data) 
		offset++;

		i = 0;

		word_en = 0xF;

		_rtw_memset(newdata, 0xFF, PGPKT_DATA_SIZE);

		memset(newdata, 0xFF, PGPKT_DATA_SIZE);

	} while (1);



	Efuse_PowerSwitch(padapter, true, false);
@@ -1236,7 +1236,7 @@ void EFUSE_ShadowMapUpdate( 
	EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen);



	if (pEEPROM->bautoload_fail_flag)

		_rtw_memset(pEEPROM->efuse_eeprom_data, 0xFF, mapLen);

		memset(pEEPROM->efuse_eeprom_data, 0xFF, mapLen);

	else

		Efuse_ReadAllMap(pAdapter, efuseType, pEEPROM->efuse_eeprom_data);

}

drivers/staging/rtl8188eu/core/rtw_ieee80211.c

+5 −5
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ exit: 
void rtw_set_supported_rate(u8 *SupportedRates, uint mode)

{



	_rtw_memset(SupportedRates, 0, NDIS_802_11_LENGTH_RATES_EX);

	memset(SupportedRates, 0, NDIS_802_11_LENGTH_RATES_EX);



	switch (mode) {

	case WIRELESS_11B:
@@ -957,7 +957,7 @@ enum parse_res rtw_ieee802_11_parse_elems(u8 *start, uint len, 
	u8 *pos = start;

	int unknown = 0;



	_rtw_memset(elems, 0, sizeof(*elems));

	memset(elems, 0, sizeof(*elems));



	while (left >= 2) {

		u8 id, elen;
@@ -1333,9 +1333,9 @@ static uint rtw_p2p_attr_remove(u8 *ie, uint ielen_ori, u8 attr_id) 
			u8 *next_attr = target_attr+target_attr_len;

			uint remain_len = ielen-(next_attr-ie);



			_rtw_memset(target_attr, 0, target_attr_len);

			memset(target_attr, 0, target_attr_len);

			memcpy(target_attr, next_attr, remain_len);

			_rtw_memset(target_attr+remain_len, 0, target_attr_len);

			memset(target_attr+remain_len, 0, target_attr_len);

			*(ie+1) -= target_attr_len;

			ielen -= target_attr_len;

		} else {
@@ -1359,7 +1359,7 @@ void rtw_wlan_bssid_ex_remove_p2p_attr(struct wlan_bssid_ex *bss_ex, u8 attr_id) 
			uint remain_len = bss_ex->IELength-(next_ie_ori-bss_ex->IEs);



			memcpy(next_ie, next_ie_ori, remain_len);

			_rtw_memset(next_ie+remain_len, 0, p2p_ielen_ori-p2p_ielen);

			memset(next_ie+remain_len, 0, p2p_ielen_ori-p2p_ielen);

			bss_ex->IELength -= p2p_ielen_ori-p2p_ielen;

		}

	}

drivers/staging/rtl8188eu/core/rtw_ioctl_set.c

+8 −8
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ u8 rtw_do_join(struct adapter *padapter) 


				pibss = padapter->registrypriv.dev_network.MacAddress;



				_rtw_memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));

				memset(&pdev_network->Ssid, 0, sizeof(struct ndis_802_11_ssid));

				memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(struct ndis_802_11_ssid));



				rtw_update_registrypriv_dev_network(padapter);
@@ -605,7 +605,7 @@ u8 rtw_set_802_11_remove_wep(struct adapter *padapter, u32 keyindex) 
		int res;

		struct security_priv *psecuritypriv = &(padapter->securitypriv);

		if (keyindex < 4) {

			_rtw_memset(&psecuritypriv->dot11DefKey[keyindex], 0, 16);

			memset(&psecuritypriv->dot11DefKey[keyindex], 0, 16);

			res = rtw_set_key(padapter, psecuritypriv, keyindex, 0);

			psecuritypriv->dot11DefKeylen[keyindex] = 0;

			if (res == _FAIL)
@@ -869,9 +869,9 @@ u8 rtw_set_802_11_add_key(struct adapter *padapter, struct ndis_802_11_key *key) 
			ret = _FAIL;

			goto exit;

		}

		_rtw_memset(&padapter->securitypriv.dot118021XGrpKey[(u8)((key->KeyIndex) & 0x03)], 0, 16);

		_rtw_memset(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], 0, 16);

		_rtw_memset(&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)], 0, 16);

		memset(&padapter->securitypriv.dot118021XGrpKey[(u8)((key->KeyIndex) & 0x03)], 0, 16);

		memset(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], 0, 16);

		memset(&padapter->securitypriv.dot118021XGrprxmickey[(u8)((key->KeyIndex) & 0x03)], 0, 16);



		if ((key->KeyIndex & 0x10000000)) {

			memcpy(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 16, 8);
@@ -931,7 +931,7 @@ u8 rtw_set_802_11_add_key(struct adapter *padapter, struct ndis_802_11_key *key) 
		stainfo = rtw_get_stainfo(&padapter->stapriv, pbssid);



		if (stainfo != NULL) {

			_rtw_memset(&stainfo->dot118021x_UncstKey, 0, 16);/*  clear keybuffer */

			memset(&stainfo->dot118021x_UncstKey, 0, 16);/*  clear keybuffer */



			memcpy(&stainfo->dot118021x_UncstKey, key->KeyMaterial, 16);
@@ -988,7 +988,7 @@ u8 rtw_set_802_11_remove_key(struct adapter *padapter, struct ndis_802_11_remove 
	if (bgroup) {

		/*  clear group key by index */



		_rtw_memset(&padapter->securitypriv.dot118021XGrpKey[keyIndex], 0, 16);

		memset(&padapter->securitypriv.dot118021XGrpKey[keyIndex], 0, 16);



		/*  \todo Send a H2C Command to Firmware for removing this Key in CAM Entry. */

	} else {
@@ -996,7 +996,7 @@ u8 rtw_set_802_11_remove_key(struct adapter *padapter, struct ndis_802_11_remove 
		stainfo = rtw_get_stainfo(&padapter->stapriv, pbssid);

		if (stainfo) {

			/*  clear key by BSSID */

			_rtw_memset(&stainfo->dot118021x_UncstKey, 0, 16);

			memset(&stainfo->dot118021x_UncstKey, 0, 16);



			/*  \todo Send a H2C Command to Firmware for disable this Key in CAM Entry. */

		} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE