From 14a16dd544d2da6d5064512449389119bb816ce5 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sat, 24 Nov 2018 12:07:51 -0600 Subject: [PATCH] rtl8188eu: Eliminate the wrapper _rtw_memset() This code is nothing more than memset(). Signed-off-by: Larry Finger --- core/rtw_ap.c | 16 ++--- core/rtw_beamforming.c | 38 +++++------ core/rtw_btcoex.c | 10 +-- core/rtw_cmd.c | 2 +- core/rtw_debug.c | 8 +-- core/rtw_efuse.c | 24 +++---- core/rtw_ieee80211.c | 16 ++--- core/rtw_ioctl_set.c | 20 +++--- core/rtw_mi.c | 10 +-- core/rtw_mlme.c | 48 +++++++------- core/rtw_mlme_ext.c | 122 +++++++++++++++++----------------- core/rtw_mp.c | 38 +++++------ core/rtw_p2p.c | 80 +++++++++++----------- core/rtw_pwrctrl.c | 2 +- core/rtw_recv.c | 6 +- core/rtw_security.c | 46 ++++++------- core/rtw_sta_mgt.c | 10 +-- core/rtw_tdls.c | 38 +++++------ core/rtw_wlan_util.c | 24 +++---- core/rtw_xmit.c | 24 +++---- hal/hal_btcoex.c | 10 +-- hal/hal_btcoex_wifionly.c | 2 +- hal/hal_com.c | 72 ++++++++++---------- hal/hal_com_phycfg.c | 32 ++++----- hal/hal_dm.c | 2 +- hal/hal_intf.c | 4 +- hal/hal_mcc.c | 2 +- hal/hal_usb.c | 2 +- hal/phydm/phydm_interface.c | 2 +- hal/rtl8188e_cmd.c | 2 +- hal/rtl8188e_hal_init.c | 14 ++-- hal/rtl8188e_rxdesc.c | 2 +- hal/rtl8188e_xmit.c | 6 +- hal/rtl8188eu_xmit.c | 6 +- hal/usb_halinit.c | 6 +- include/osdep_service.h | 1 - os_dep/ioctl_cfg80211.c | 34 +++++----- os_dep/ioctl_cfg80211.h | 10 +-- os_dep/ioctl_linux.c | 128 ++++++++++++++++++------------------ os_dep/ioctl_mp.c | 64 +++++++++--------- os_dep/mlme_linux.c | 6 +- os_dep/os_intfs.c | 8 +-- os_dep/osdep_service.c | 7 +- os_dep/recv_linux.c | 6 +- os_dep/rtw_proc.c | 4 +- os_dep/usb_ops_linux.c | 2 +- 46 files changed, 505 insertions(+), 511 deletions(-) diff --git a/core/rtw_ap.c b/core/rtw_ap.c index 2e09189..4abde09 100644 --- a/core/rtw_ap.c +++ b/core/rtw_ap.c @@ -668,7 +668,7 @@ void update_bmc_sta(_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)); /* psta->dot118021XPrivacy = _NO_PRIVACY_; */ /* !!! remove it, because it has been set before this. */ @@ -825,7 +825,7 @@ void update_sta_info_apmode(_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)); _enter_critical_bh(&psta->lock, &irqL); psta->state |= _FW_LINKED; @@ -1424,7 +1424,7 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len) pbss_network->IELength = len; - _rtw_memset(ie, 0, MAX_IE_SZ); + memset(ie, 0, MAX_IE_SZ); _rtw_memcpy(ie, pbuf, pbss_network->IELength); @@ -1453,7 +1453,7 @@ int rtw_check_beacon_data(_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(NDIS_802_11_SSID)); + memset(&pbss_network->Ssid, 0, sizeof(NDIS_802_11_SSID)); _rtw_memcpy(pbss_network->Ssid.Ssid, (p + 2), ie_len); pbss_network->Ssid.SsidLength = ie_len; #ifdef CONFIG_P2P @@ -1472,7 +1472,7 @@ int rtw_check_beacon_data(_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) { @@ -2006,7 +2006,7 @@ static int rtw_ap_set_key(_adapter *padapter, u8 *key, u8 alg, int keyid, u8 set goto exit; } - _rtw_memset(psetkeyparm, 0, sizeof(struct setkey_parm)); + memset(psetkeyparm, 0, sizeof(struct setkey_parm)); psetkeyparm->keyid = (u8)keyid; if (is_wep_enc(alg)) @@ -3256,7 +3256,7 @@ void start_ap_mode(_adapter *padapter) pmlmepriv->ht_op_mode = 0; pmlmepriv->sw_to_20mhz = 0; - _rtw_memset(pmlmepriv->ext_capab_ie_data, 0, sizeof(pmlmepriv->ext_capab_ie_data)); + memset(pmlmepriv->ext_capab_ie_data, 0, sizeof(pmlmepriv->ext_capab_ie_data)); pmlmepriv->ext_capab_ie_len = 0; #ifdef CONFIG_CONCURRENT_MODE @@ -3299,7 +3299,7 @@ void stop_ap_mode(_adapter *padapter) /* _rtw_spinlock_free(&pmlmepriv->bcn_update_lock); */ /* 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; diff --git a/core/rtw_beamforming.c b/core/rtw_beamforming.c index 1082497..6e4f5bd 100644 --- a/core/rtw_beamforming.c +++ b/core/rtw_beamforming.c @@ -178,7 +178,7 @@ static u8 _send_ht_ndpa_packet(PADAPTER adapter, u8 *ra, CHANNEL_WIDTH bw) attrib->rate = (u8)txrate; attrib->bf_pkt_type = 0; - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -273,7 +273,7 @@ static u8 _send_vht_ndpa_packet(PADAPTER adapter, u8 *ra, u16 aid, CHANNEL_WIDTH attrib->rate = (u8)txrate; attrib->bf_pkt_type = 0; - _rtw_memset(pmgntframe->buf_addr, 0, TXDESC_OFFSET + WLANHDR_OFFSET); + memset(pmgntframe->buf_addr, 0, TXDESC_OFFSET + WLANHDR_OFFSET); pframe = pmgntframe->buf_addr + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -390,7 +390,7 @@ static u8 _send_vht_mu_ndpa_packet(PADAPTER adapter, CHANNEL_WIDTH bw) else attrib->bf_pkt_type = 0; - _rtw_memset(pmgntframe->buf_addr, 0, TXDESC_OFFSET + WLANHDR_OFFSET); + memset(pmgntframe->buf_addr, 0, TXDESC_OFFSET + WLANHDR_OFFSET); pframe = pmgntframe->buf_addr + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -482,7 +482,7 @@ static u8 _send_bf_report_poll(PADAPTER adapter, u8 *ra, u8 bFinalPoll) else attrib->bf_pkt_type = 2; - _rtw_memset(pmgntframe->buf_addr, 0, TXDESC_OFFSET + WLANHDR_OFFSET); + memset(pmgntframe->buf_addr, 0, TXDESC_OFFSET + WLANHDR_OFFSET); pframe = pmgntframe->buf_addr + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -546,8 +546,8 @@ static void _sounding_update_min_period(PADAPTER adapter, u16 period, u8 leave) static void _sounding_init(struct sounding_info *sounding) { - _rtw_memset(sounding->su_sounding_list, 0xFF, MAX_NUM_BEAMFORMEE_SU); - _rtw_memset(sounding->mu_sounding_list, 0xFF, MAX_NUM_BEAMFORMEE_MU); + memset(sounding->su_sounding_list, 0xFF, MAX_NUM_BEAMFORMEE_SU); + memset(sounding->mu_sounding_list, 0xFF, MAX_NUM_BEAMFORMEE_MU); sounding->state = SOUNDING_STATE_NONE; sounding->su_bfee_curidx = 0xFF; sounding->candidate_mu_bfee_cnt = 0; @@ -565,8 +565,8 @@ static void _sounding_reset_vars(PADAPTER adapter) info = GET_BEAMFORM_INFO(adapter); sounding = &info->sounding_info; - _rtw_memset(sounding->su_sounding_list, 0xFF, MAX_NUM_BEAMFORMEE_SU); - _rtw_memset(sounding->mu_sounding_list, 0xFF, MAX_NUM_BEAMFORMEE_MU); + memset(sounding->su_sounding_list, 0xFF, MAX_NUM_BEAMFORMEE_SU); + memset(sounding->mu_sounding_list, 0xFF, MAX_NUM_BEAMFORMEE_MU); sounding->su_bfee_curidx = 0xFF; sounding->candidate_mu_bfee_cnt = 0; @@ -1021,8 +1021,8 @@ static void _bfer_remove_entry(PADAPTER adapter, struct beamformer_entry *entry) if (TEST_FLAG(entry->cap, BEAMFORMER_CAP_VHT_MU)) { info->beamformer_mu_cnt -= 1; - _rtw_memset(entry->gid_valid, 0, 8); - _rtw_memset(entry->user_position, 0, 16); + memset(entry->gid_valid, 0, 8); + memset(entry->user_position, 0, 16); } else if (TEST_FLAG(entry->cap, BEAMFORMER_CAP_VHT_SU|BEAMFORMER_CAP_HT_EXPLICIT)) { info->beamformer_su_cnt -= 1; } @@ -1214,7 +1214,7 @@ static struct beamformee_entry *_bfee_add_entry(PADAPTER adapter, RTW_ERR("%s: UNEXPECTED!! info->TargetSUBFee is NULL!", __func__); } info->TargetSUBFee = NULL; - _rtw_memset(&info->TargetCSIInfo, 0, sizeof(struct _RT_CSI_INFO)); + memset(&info->TargetCSIInfo, 0, sizeof(struct _RT_CSI_INFO)); rtw_bf_cmd(adapter, BEAMFORMING_CTRL_SET_CSI_REPORT, (u8*)&info->TargetCSIInfo, sizeof(struct _RT_CSI_INFO), 0); } } @@ -1237,7 +1237,7 @@ static struct beamformee_entry *_bfee_add_entry(PADAPTER adapter, /* Record the first SU BFee index. We only allow the first SU BFee to be sound */ if ((info->beamformee_su_cnt == 1) && (info->beamformee_mu_cnt == 0)) { info->TargetSUBFee = bfee; - _rtw_memset(&info->TargetCSIInfo, 0, sizeof(struct _RT_CSI_INFO)); + memset(&info->TargetCSIInfo, 0, sizeof(struct _RT_CSI_INFO)); bfee->bSuspendSUCap = _FALSE; } else { bfee->bSuspendSUCap = _TRUE; @@ -1277,7 +1277,7 @@ static void _bfee_remove_entry(PADAPTER adapter, struct beamformee_entry *entry) if ((info->beamformee_mu_cnt == 0) && (info->beamformee_su_cnt > 0)) { idx = _bfee_get_first_su_entry_idx(adapter, NULL); info->TargetSUBFee = &info->bfee_entry[idx]; - _rtw_memset(&info->TargetCSIInfo, 0, sizeof(struct _RT_CSI_INFO)); + memset(&info->TargetCSIInfo, 0, sizeof(struct _RT_CSI_INFO)); info->TargetSUBFee->bSuspendSUCap = _FALSE; } } @@ -1289,7 +1289,7 @@ static void _bfee_remove_entry(PADAPTER adapter, struct beamformee_entry *entry) && (entry == info->TargetSUBFee)) { entry->bSuspendSUCap = _TRUE; info->TargetSUBFee = NULL; - _rtw_memset(&info->TargetCSIInfo, 0, sizeof(struct _RT_CSI_INFO)); + memset(&info->TargetCSIInfo, 0, sizeof(struct _RT_CSI_INFO)); rtw_bf_cmd(adapter, BEAMFORMING_CTRL_SET_CSI_REPORT, (u8*)&info->TargetCSIInfo, sizeof(struct _RT_CSI_INFO), 0); } } @@ -1673,7 +1673,7 @@ u8 rtw_bf_send_vht_gid_mgnt_packet(PADAPTER adapter, u8 *ra, u8 *gid, u8 *positi attrib->bwmode = CHANNEL_WIDTH_20; attrib->subtype = WIFI_ACTION; - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)pmgntframe->buf_addr + TXDESC_OFFSET; wlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -2163,7 +2163,7 @@ bool issue_ht_sw_ndpa_packet(PADAPTER Adapter, u8 *ra, CHANNEL_WIDTH bw, u8 qidx pattrib->order = 1; pattrib->subtype = WIFI_ACTION_NOACK; - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; @@ -2239,7 +2239,7 @@ bool issue_ht_ndpa_packet(PADAPTER Adapter, u8 *ra, CHANNEL_WIDTH bw, u8 qidx) pattrib->order = 1; pattrib->subtype = WIFI_ACTION_NOACK; - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; @@ -2326,7 +2326,7 @@ bool issue_vht_sw_ndpa_packet(PADAPTER Adapter, u8 *ra, u16 aid, CHANNEL_WIDTH b pattrib->bwmode = bw; pattrib->subtype = WIFI_NDPA; - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; @@ -2412,7 +2412,7 @@ bool issue_vht_ndpa_packet(PADAPTER Adapter, u8 *ra, u16 aid, CHANNEL_WIDTH bw, pattrib->bwmode = bw; pattrib->subtype = WIFI_NDPA; - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; diff --git a/core/rtw_btcoex.c b/core/rtw_btcoex.c index e00ff86..695f39b 100644 --- a/core/rtw_btcoex.c +++ b/core/rtw_btcoex.c @@ -587,7 +587,7 @@ u8 rtw_btcoex_parse_BT_info_notify_cmd(_adapter *padapter, u8 *pcmd, u16 cmdlen) RTW_INFO("%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n" ,pcmd[4],pcmd[5],pcmd[6],pcmd[7],pcmd[8],pcmd[9],pcmd[10],pcmd[11]);*/ - _rtw_memset(btinfo, 0, BT_INFO_LENGTH); + memset(btinfo, 0, BT_INFO_LENGTH); if (BT_INFO_LENGTH != btInfoLen) { status = HCI_STATUS_INVALID_HCI_CMD_PARA_VALUE; @@ -1272,7 +1272,7 @@ void rtw_btcoex_recvmsgbysocket(void *data) /*important: cut the udp header from skb->data! header length is 8 byte*/ recv_length = skb->len - 8; - _rtw_memset(recv_data, 0, sizeof(recv_data)); + memset(recv_data, 0, sizeof(recv_data)); _rtw_memcpy(recv_data, skb->data + 8, recv_length); parse_res = rtw_btcoex_parse_recv_data(recv_data, recv_length); @@ -1426,12 +1426,12 @@ u8 rtw_btcoex_create_kernel_socket(_adapter *padapter) RTW_INFO("Error during creation of socket error:%d\n", kernel_socket_err); status = _FAIL; } else { - _rtw_memset(&(pcoex_info->wifi_sockaddr), 0, sizeof(pcoex_info->wifi_sockaddr)); + memset(&(pcoex_info->wifi_sockaddr), 0, sizeof(pcoex_info->wifi_sockaddr)); pcoex_info->wifi_sockaddr.sin_family = AF_INET; pcoex_info->wifi_sockaddr.sin_port = htons(CONNECT_PORT); pcoex_info->wifi_sockaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); - _rtw_memset(&(pcoex_info->bt_sockaddr), 0, sizeof(pcoex_info->bt_sockaddr)); + memset(&(pcoex_info->bt_sockaddr), 0, sizeof(pcoex_info->bt_sockaddr)); pcoex_info->bt_sockaddr.sin_family = AF_INET; pcoex_info->bt_sockaddr.sin_port = htons(CONNECT_PORT_BT); pcoex_info->bt_sockaddr.sin_addr.s_addr = htonl(INADDR_LOOPBACK); @@ -1480,7 +1480,7 @@ void rtw_btcoex_init_socket(_adapter *padapter) struct bt_coex_info *pcoex_info = &padapter->coex_info; RTW_INFO("%s\n", __func__); if (_FALSE == pcoex_info->is_exist) { - _rtw_memset(pcoex_info, 0, sizeof(struct bt_coex_info)); + memset(pcoex_info, 0, sizeof(struct bt_coex_info)); pcoex_info->btcoex_wq = create_workqueue("BTCOEX"); INIT_DELAYED_WORK(&pcoex_info->recvmsg_work, (void *)rtw_btcoex_recvmsgbysocket); diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index 58ad027..54c3abb 100644 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -1411,7 +1411,7 @@ u8 rtw_joinbss_cmd(_adapter *padapter, struct wlan_network *pnetwork) goto exit; } - _rtw_memset(psecnetwork, 0, t_len); + memset(psecnetwork, 0, t_len); _rtw_memcpy(psecnetwork, &pnetwork->network, get_WLAN_BSSID_EX_sz(&pnetwork->network)); diff --git a/core/rtw_debug.c b/core/rtw_debug.c index d11c851..773f81c 100644 --- a/core/rtw_debug.c +++ b/core/rtw_debug.c @@ -3229,9 +3229,9 @@ ssize_t proc_set_btcoex_dbg(struct file *file, const char __user *buffer, size_t num = sscanf(tmp, "%x %x", module, module + 1); if (1 == num) { if (0 == module[0]) - _rtw_memset(module, 0, sizeof(module)); + memset(module, 0, sizeof(module)); else - _rtw_memset(module, 0xFF, sizeof(module)); + memset(module, 0xFF, sizeof(module)); } else if (2 != num) { RTW_INFO(FUNC_ADPT_FMT ": input(\"%s\") format incorrect!\n", FUNC_ADPT_ARG(padapter), tmp); @@ -3343,7 +3343,7 @@ int proc_get_pattern_info(struct seq_file *m, void *v) p_str = str_1; max_len = sizeof(str_1); for (i = 0 ; i < MAX_WKFM_PATTERN_SIZE / 8 ; i++) { - _rtw_memset(p_str, 0, max_len); + memset(p_str, 0, max_len); len = 0; for (j = 0 ; j < 8 ; j++) { val8 = pwrpriv->patterns[k].content[i * 8 + j]; @@ -3354,7 +3354,7 @@ int proc_get_pattern_info(struct seq_file *m, void *v) } RTW_PRINT_SEL(m, "\npattern mask:\n"); for (i = 0 ; i < MAX_WKFM_SIZE / 8 ; i++) { - _rtw_memset(p_str, 0, max_len); + memset(p_str, 0, max_len); len = 0; for (j = 0 ; j < 8 ; j++) { val8 = pwrpriv->patterns[k].mask[i * 8 + j]; diff --git a/core/rtw_efuse.c b/core/rtw_efuse.c index 8de4746..90dafd7 100644 --- a/core/rtw_efuse.c +++ b/core/rtw_efuse.c @@ -702,7 +702,7 @@ u8 rtw_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data) if (map == NULL) return _FAIL; - _rtw_memset(map, 0xFF, mapLen); + memset(map, 0xFF, mapLen); ret = rtw_efuse_map_read(padapter, 0, mapLen, map); if (ret == _FAIL) @@ -1137,19 +1137,19 @@ Efuse_InitSomeVar( { u8 i; - _rtw_memset((void *)&fakeEfuseContent[0], 0xff, EFUSE_MAX_HW_SIZE); - _rtw_memset((void *)&fakeEfuseInitMap[0], 0xff, EFUSE_MAX_MAP_LEN); - _rtw_memset((void *)&fakeEfuseModifiedMap[0], 0xff, EFUSE_MAX_MAP_LEN); + memset((void *)&fakeEfuseContent[0], 0xff, EFUSE_MAX_HW_SIZE); + memset((void *)&fakeEfuseInitMap[0], 0xff, EFUSE_MAX_MAP_LEN); + memset((void *)&fakeEfuseModifiedMap[0], 0xff, EFUSE_MAX_MAP_LEN); for (i = 0; i < EFUSE_MAX_BT_BANK; i++) - _rtw_memset((void *)&BTEfuseContent[i][0], 0xff, EFUSE_MAX_HW_SIZE); - _rtw_memset((void *)&BTEfuseInitMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); - _rtw_memset((void *)&BTEfuseModifiedMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); + memset((void *)&BTEfuseContent[i][0], 0xff, EFUSE_MAX_HW_SIZE); + memset((void *)&BTEfuseInitMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); + memset((void *)&BTEfuseModifiedMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); for (i = 0; i < EFUSE_MAX_BT_BANK; i++) - _rtw_memset((void *)&fakeBTEfuseContent[i][0], 0xff, EFUSE_MAX_HW_SIZE); - _rtw_memset((void *)&fakeBTEfuseInitMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); - _rtw_memset((void *)&fakeBTEfuseModifiedMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); + memset((void *)&fakeBTEfuseContent[i][0], 0xff, EFUSE_MAX_HW_SIZE); + memset((void *)&fakeBTEfuseInitMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); + memset((void *)&fakeBTEfuseModifiedMap[0], 0xff, EFUSE_BT_MAX_MAP_LEN); } /* 11/16/2008 MH Add description. Get current efuse area enabled word!!. */ @@ -1234,7 +1234,7 @@ void EFUSE_ShadowMapUpdate( EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (void *)&mapLen, bPseudoTest); if (pHalData->bautoload_fail_flag == _TRUE) - _rtw_memset(pHalData->efuse_eeprom_data, 0xFF, mapLen); + memset(pHalData->efuse_eeprom_data, 0xFF, mapLen); else { #ifdef CONFIG_ADAPTOR_INFO_CACHING_FILE if (_SUCCESS != retriveAdaptorInfoFile(pAdapter->registrypriv.adaptor_info_caching_file_path, pHalData->efuse_eeprom_data)) { @@ -1423,7 +1423,7 @@ u32 rtw_read_efuse_from_file(const char *path, u8 *buf, int map_size) RTW_ERR("%s rtw_vmalloc(%d) fail\n", __func__, map_size); goto exit; } - _rtw_memset(map, 0xff, map_size); + memset(map, 0xff, map_size); temp[2] = 0; /* end of string '\0' */ diff --git a/core/rtw_ieee80211.c b/core/rtw_ieee80211.c index 26b8871..8fcb58a 100644 --- a/core/rtw_ieee80211.c +++ b/core/rtw_ieee80211.c @@ -388,7 +388,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: @@ -1114,7 +1114,7 @@ ParseRes 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; @@ -1936,7 +1936,7 @@ uint rtw_del_p2p_ie(u8 *ies, uint ies_len_ori, const char *msg) } _rtw_memmove(target_ie, next_ie, remain_len); - _rtw_memset(target_ie + remain_len, 0, target_ie_len); + memset(target_ie + remain_len, 0, target_ie_len); ies_len -= target_ie_len; if (DBG_DEL_P2P_IE && msg) { @@ -1977,7 +1977,7 @@ uint rtw_del_p2p_attr(u8 *ie, uint ielen_ori, u8 attr_id) } _rtw_memmove(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; @@ -2047,7 +2047,7 @@ void rtw_bss_ex_del_p2p_attr(WLAN_BSSID_EX *bss_ex, u8 attr_id) u8 *next_ie = ie + ie_len; _rtw_memmove(next_ie, next_ie_ori, remain_len); - _rtw_memset(next_ie + remain_len, 0, ie_len_ori - ie_len); + memset(next_ie + remain_len, 0, ie_len_ori - ie_len); bss_ex->IELength -= ie_len_ori - ie_len; ies = next_ie; @@ -2263,7 +2263,7 @@ uint rtw_del_wfd_ie(u8 *ies, uint ies_len_ori, const char *msg) } _rtw_memmove(target_ie, next_ie, remain_len); - _rtw_memset(target_ie + remain_len, 0, target_ie_len); + memset(target_ie + remain_len, 0, target_ie_len); ies_len -= target_ie_len; if (DBG_DEL_WFD_IE && msg) { @@ -2304,7 +2304,7 @@ uint rtw_del_wfd_attr(u8 *ie, uint ielen_ori, u8 attr_id) } _rtw_memmove(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; @@ -2373,7 +2373,7 @@ void rtw_bss_ex_del_wfd_attr(WLAN_BSSID_EX *bss_ex, u8 attr_id) u8 *next_ie = ie + ie_len; _rtw_memmove(next_ie, next_ie_ori, remain_len); - _rtw_memset(next_ie + remain_len, 0, ie_len_ori - ie_len); + memset(next_ie + remain_len, 0, ie_len_ori - ie_len); bss_ex->IELength -= ie_len_ori - ie_len; ies = next_ie; diff --git a/core/rtw_ioctl_set.c b/core/rtw_ioctl_set.c index b67768d..f265297 100644 --- a/core/rtw_ioctl_set.c +++ b/core/rtw_ioctl_set.c @@ -130,7 +130,7 @@ u8 rtw_do_join(_adapter *padapter) pibss = padapter->registrypriv.dev_network.MacAddress; - _rtw_memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID)); + memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID)); _rtw_memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(NDIS_802_11_SSID)); rtw_update_registrypriv_dev_network(padapter); @@ -223,7 +223,7 @@ handle_tkip_countermeasure: goto release_mlme_lock; } - _rtw_memset(&pmlmepriv->assoc_ssid, 0, sizeof(NDIS_802_11_SSID)); + memset(&pmlmepriv->assoc_ssid, 0, sizeof(NDIS_802_11_SSID)); _rtw_memcpy(&pmlmepriv->assoc_bssid, bssid, ETH_ALEN); pmlmepriv->assoc_by_bssid = _TRUE; @@ -382,7 +382,7 @@ handle_tkip_countermeasure: if (ssid && ssid_valid) _rtw_memcpy(&pmlmepriv->assoc_ssid, ssid, sizeof(NDIS_802_11_SSID)); else - _rtw_memset(&pmlmepriv->assoc_ssid, 0, sizeof(NDIS_802_11_SSID)); + memset(&pmlmepriv->assoc_ssid, 0, sizeof(NDIS_802_11_SSID)); if (bssid && bssid_valid) { _rtw_memcpy(&pmlmepriv->assoc_bssid, bssid, ETH_ALEN); @@ -602,7 +602,7 @@ u8 rtw_set_802_11_remove_wep(_adapter *padapter, u32 keyindex) 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, _TRUE); @@ -804,9 +804,9 @@ u8 rtw_set_802_11_add_key(_adapter *padapter, NDIS_802_11_KEY *key) 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)) { _rtw_memcpy(&padapter->securitypriv.dot118021XGrptxmickey[(u8)((key->KeyIndex) & 0x03)], key->KeyMaterial + 16, 8); @@ -841,7 +841,7 @@ u8 rtw_set_802_11_add_key(_adapter *padapter, 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 */ _rtw_memcpy(&stainfo->dot118021x_UncstKey, key->KeyMaterial, 16); @@ -900,7 +900,7 @@ u8 rtw_set_802_11_remove_key(_adapter *padapter, NDIS_802_11_REMOVE_KEY *key) /* NdisZeroMemory(Adapter->MgntInfo.SecurityInfo.KeyBuf[keyIndex], MAX_WEP_KEY_LEN); */ /* Adapter->MgntInfo.SecurityInfo.KeyLen[keyIndex] = 0; */ - _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. */ @@ -912,7 +912,7 @@ u8 rtw_set_802_11_remove_key(_adapter *padapter, NDIS_802_11_REMOVE_KEY *key) encryptionalgo = stainfo->dot118021XPrivacy; /* 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. */ diff --git a/core/rtw_mi.c b/core/rtw_mi.c index 62a5cd2..4ddd017 100644 --- a/core/rtw_mi.c +++ b/core/rtw_mi.c @@ -117,7 +117,7 @@ static void _rtw_mi_status(_adapter *adapter, struct mi_state *mstate, bool incl _adapter *iface; int i; - _rtw_memset(mstate, 0, sizeof(struct mi_state)); + memset(mstate, 0, sizeof(struct mi_state)); for (i = 0; i < dvobj->iface_nums; i++) { iface = dvobj->padapters[i]; @@ -715,25 +715,25 @@ static void rtw_dbg_dump_fwstate(_adapter *padapter, sint state) u8 buf[32] = {0}; if (state & WIFI_FW_NULL_STATE) { - _rtw_memset(buf, 0, 32); + memset(buf, 0, 32); sprintf(buf, "WIFI_FW_NULL_STATE"); RTW_INFO(FUNC_ADPT_FMT"fwstate-%s\n", FUNC_ADPT_ARG(padapter), buf); } if (state & _FW_LINKED) { - _rtw_memset(buf, 0, 32); + memset(buf, 0, 32); sprintf(buf, "_FW_LINKED"); RTW_INFO(FUNC_ADPT_FMT"fwstate-%s\n", FUNC_ADPT_ARG(padapter), buf); } if (state & _FW_UNDER_LINKING) { - _rtw_memset(buf, 0, 32); + memset(buf, 0, 32); sprintf(buf, "_FW_UNDER_LINKING"); RTW_INFO(FUNC_ADPT_FMT"fwstate-%s\n", FUNC_ADPT_ARG(padapter), buf); } if (state & _FW_UNDER_SURVEY) { - _rtw_memset(buf, 0, 32); + memset(buf, 0, 32); sprintf(buf, "_FW_UNDER_SURVEY"); RTW_INFO(FUNC_ADPT_FMT"fwstate-%s\n", FUNC_ADPT_ARG(padapter), buf); } diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index e60607a..e37fe51 100644 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -54,7 +54,7 @@ static sint _rtw_init_mlme_priv(_adapter *padapter) set_scanned_network_val(pmlmepriv, 0); - _rtw_memset(&pmlmepriv->assoc_ssid, 0, sizeof(NDIS_802_11_SSID)); + memset(&pmlmepriv->assoc_ssid, 0, sizeof(NDIS_802_11_SSID)); pbuf = rtw_zvmalloc(MAX_BSS_CNT * (sizeof(struct wlan_network))); @@ -1191,7 +1191,7 @@ void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf) _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); - _rtw_memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID)); + memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID)); _rtw_memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(NDIS_802_11_SSID)); rtw_update_registrypriv_dev_network(adapter); @@ -1226,7 +1226,7 @@ void rtw_surveydone_event_callback(_adapter *adapter, u8 *pbuf) rtw_set_to_roam(adapter, 0); #ifdef CONFIG_INTEL_WIDI if (adapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) { - _rtw_memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN); + memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN); intel_widi_wk_cmd(adapter, INTEL_WIDI_LISTEN_WK, NULL, 0); RTW_INFO("change to widi listen\n"); } @@ -1470,7 +1470,7 @@ void rtw_indicate_connect(_adapter *padapter) rtw_set_to_roam(padapter, 0); #ifdef CONFIG_INTEL_WIDI if (padapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) { - _rtw_memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN); + memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN); intel_widi_wk_cmd(padapter, INTEL_WIDI_LISTEN_WK, NULL, 0); RTW_INFO("change to widi listen\n"); } @@ -1702,17 +1702,17 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl psta->ieee8021x_blocked = _TRUE; psta->dot118021XPrivacy = padapter->securitypriv.dot11PrivacyAlgrthm; - _rtw_memset((u8 *)&psta->dot118021x_UncstKey, 0, sizeof(union Keytype)); + memset((u8 *)&psta->dot118021x_UncstKey, 0, sizeof(union Keytype)); - _rtw_memset((u8 *)&psta->dot11tkiprxmickey, 0, sizeof(union Keytype)); - _rtw_memset((u8 *)&psta->dot11tkiptxmickey, 0, sizeof(union Keytype)); + memset((u8 *)&psta->dot11tkiprxmickey, 0, sizeof(union Keytype)); + memset((u8 *)&psta->dot11tkiptxmickey, 0, sizeof(union Keytype)); - _rtw_memset((u8 *)&psta->dot11txpn, 0, sizeof(union pn48)); + memset((u8 *)&psta->dot11txpn, 0, sizeof(union pn48)); psta->dot11txpn.val = psta->dot11txpn.val + 1; #ifdef CONFIG_IEEE80211W - _rtw_memset((u8 *)&psta->dot11wtxpn, 0, sizeof(union pn48)); + memset((u8 *)&psta->dot11wtxpn, 0, sizeof(union pn48)); #endif /* CONFIG_IEEE80211W */ - _rtw_memset((u8 *)&psta->dot11rxpn, 0, sizeof(union pn48)); + memset((u8 *)&psta->dot11rxpn, 0, sizeof(union pn48)); } /* Commented by Albert 2012/07/21 */ @@ -2271,14 +2271,14 @@ void rtw_update_ft_stainfo(_adapter *padapter, WLAN_BSSID_EX *pnetwork) psta->dot118021XPrivacy = padapter->securitypriv.dot11PrivacyAlgrthm; psta->dot11txpn.val = psta->dot11txpn.val + 1; - _rtw_memset((u8 *)&psta->dot118021x_UncstKey, 0, sizeof(union Keytype)); - _rtw_memset((u8 *)&psta->dot11tkiprxmickey, 0, sizeof(union Keytype)); - _rtw_memset((u8 *)&psta->dot11tkiptxmickey, 0, sizeof(union Keytype)); - _rtw_memset((u8 *)&psta->dot11txpn, 0, sizeof(union pn48)); + memset((u8 *)&psta->dot118021x_UncstKey, 0, sizeof(union Keytype)); + memset((u8 *)&psta->dot11tkiprxmickey, 0, sizeof(union Keytype)); + memset((u8 *)&psta->dot11tkiptxmickey, 0, sizeof(union Keytype)); + memset((u8 *)&psta->dot11txpn, 0, sizeof(union pn48)); #ifdef CONFIG_IEEE80211W - _rtw_memset((u8 *)&psta->dot11wtxpn, 0, sizeof(union pn48)); + memset((u8 *)&psta->dot11wtxpn, 0, sizeof(union pn48)); #endif - _rtw_memset((u8 *)&psta->dot11rxpn, 0, sizeof(union pn48)); + memset((u8 *)&psta->dot11rxpn, 0, sizeof(union pn48)); } } @@ -2294,7 +2294,7 @@ void rtw_ft_reassoc_event_callback(_adapter *padapter, u8 *pbuf) struct cfg80211_ft_event_params ft_evt_parms; _irqL irqL; - _rtw_memset(&ft_evt_parms, 0, sizeof(ft_evt_parms)); + memset(&ft_evt_parms, 0, sizeof(ft_evt_parms)); rtw_update_ft_stainfo(padapter, pnetwork); ft_evt_parms.ies_len = pftpriv->ft_event.ies_len; ft_evt_parms.ies = rtw_zmalloc(ft_evt_parms.ies_len); @@ -2494,7 +2494,7 @@ void rtw_stadel_event_callback(_adapter *adapter, u8 *pbuf) _rtw_memcpy(pdev_network, &tgt_network->network, get_WLAN_BSSID_EX_sz(&tgt_network->network)); - _rtw_memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID)); + memset(&pdev_network->Ssid, 0, sizeof(NDIS_802_11_SSID)); _rtw_memcpy(&pdev_network->Ssid, &pmlmepriv->assoc_ssid, sizeof(NDIS_802_11_SSID)); rtw_update_registrypriv_dev_network(adapter); @@ -2577,7 +2577,7 @@ void _rtw_join_timeout_handler(_adapter *adapter) } else { #ifdef CONFIG_INTEL_WIDI if (adapter->mlmepriv.widi_state == INTEL_WIDI_STATE_ROAMING) { - _rtw_memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN); + memset(pmlmepriv->sa_ext, 0x00, L2SDTA_SERVICE_VE_LEN); intel_widi_wk_cmd(adapter, INTEL_WIDI_LISTEN_WK, NULL, 0); RTW_INFO("change to widi listen\n"); } @@ -2849,7 +2849,7 @@ static void collect_traffic_statistics(_adapter *padapter) { struct dvobj_priv *pdvobjpriv = adapter_to_dvobj(padapter); - /*_rtw_memset(&pdvobjpriv->traffic_stat, 0, sizeof(struct rtw_traffic_statistics));*/ + /*memset(&pdvobjpriv->traffic_stat, 0, sizeof(struct rtw_traffic_statistics));*/ /* Tx bytes reset*/ pdvobjpriv->traffic_stat.tx_bytes = 0; @@ -3072,7 +3072,7 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme) mlme->roam_network = candidate; if (_rtw_memcmp(candidate->network.MacAddress, mlme->roam_tgt_addr, ETH_ALEN) == _TRUE) - _rtw_memset(mlme->roam_tgt_addr, 0, ETH_ALEN); + memset(mlme->roam_tgt_addr, 0, ETH_ALEN); } ret = _SUCCESS; @@ -3269,7 +3269,7 @@ sint rtw_set_auth(_adapter *adapter, struct security_priv *psecuritypriv) goto exit; } - _rtw_memset(psetauthparm, 0, sizeof(struct setauth_parm)); + memset(psetauthparm, 0, sizeof(struct setauth_parm)); psetauthparm->mode = (unsigned char)psecuritypriv->dot11AuthAlgrthm; pcmd->cmdcode = _SetAuth_CMD_; @@ -3307,7 +3307,7 @@ sint rtw_set_key(_adapter *adapter, struct security_priv *psecuritypriv, sint ke res = _FAIL; goto exit; } - _rtw_memset(psetkeyparm, 0, sizeof(struct setkey_parm)); + memset(psetkeyparm, 0, sizeof(struct setkey_parm)); if (psecuritypriv->dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) { psetkeyparm->algorithm = (unsigned char)psecuritypriv->dot118021XGrpPrivacy; @@ -3801,7 +3801,7 @@ unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, ui out_len = *pout_len; - _rtw_memset(&ht_capie, 0, sizeof(struct rtw_ieee80211_ht_cap)); + memset(&ht_capie, 0, sizeof(struct rtw_ieee80211_ht_cap)); ht_capie.cap_info = cpu_to_le16(IEEE80211_HT_CAP_DSSSCCK40); diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 329d5d2..a552392 100755 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -331,7 +331,7 @@ void rtw_rfctl_init(_adapter *adapter) { struct rf_ctl_t *rfctl = adapter_to_rfctl(adapter); - _rtw_memset(rfctl, 0, sizeof(*rfctl)); + memset(rfctl, 0, sizeof(*rfctl)); #ifdef CONFIG_DFS_MASTER rfctl->cac_start_time = rfctl->cac_end_time = RTW_CAC_STOPPED; @@ -1059,7 +1059,7 @@ static void init_mlme_ext_priv_value(_adapter *padapter) pmlmeinfo->enc_algo = _NO_PRIVACY_; pmlmeinfo->authModeToggle = 0; - _rtw_memset(pmlmeinfo->chg_txt, 0, 128); + memset(pmlmeinfo->chg_txt, 0, 128); pmlmeinfo->slotTime = SHORT_SLOT_TIME; pmlmeinfo->preamble_mode = PREAMBLE_AUTO; @@ -1164,7 +1164,7 @@ static u8 init_channel_set(_adapter *padapter, u8 ChannelPlan, RT_CHANNEL_INFO * return chanset_size; } - _rtw_memset(channel_set, 0, sizeof(RT_CHANNEL_INFO) * MAX_CHANNEL_NUM); + memset(channel_set, 0, sizeof(RT_CHANNEL_INFO) * MAX_CHANNEL_NUM); if (IsSupported24G(padapter->registrypriv.wireless_mode)) b2_4GBand = _TRUE; @@ -1274,7 +1274,7 @@ int init_mlme_ext_priv(_adapter *padapter) struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); /* We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */ - /* _rtw_memset((u8 *)pmlmeext, 0, sizeof(struct mlme_ext_priv)); */ + /* memset((u8 *)pmlmeext, 0, sizeof(struct mlme_ext_priv)); */ pmlmeext->padapter = padapter; @@ -1698,7 +1698,7 @@ _continue: rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, _TRUE); - _rtw_memset((void *)&psta->sta_stats, 0, sizeof(struct stainfo_stats)); + memset((void *)&psta->sta_stats, 0, sizeof(struct stainfo_stats)); _enter_critical_bh(&psta->lock, &irqL); psta->state |= _FW_LINKED; @@ -1923,7 +1923,7 @@ unsigned int OnBeacon(_adapter *padapter, union recv_frame *precv_frame) pmlmepriv->new_beacon_cnts = 0; } else { RTW_ERR("%s: get beacon keys failed\n", __func__); - _rtw_memset(&pmlmepriv->cur_beacon_keys, 0, sizeof(recv_beacon)); + memset(&pmlmepriv->cur_beacon_keys, 0, sizeof(recv_beacon)); pmlmepriv->new_beacon_cnts = 0; } } @@ -1941,8 +1941,8 @@ unsigned int OnBeacon(_adapter *padapter, union recv_frame *precv_frame) pmlmeext->DrvBcnEarly = 0xff; pmlmeext->DrvBcnTimeOut = 0xff; pmlmeext->bcn_cnt = 0; - _rtw_memset(pmlmeext->bcn_delay_cnt, 0, sizeof(pmlmeext->bcn_delay_cnt)); - _rtw_memset(pmlmeext->bcn_delay_ratio, 0, sizeof(pmlmeext->bcn_delay_ratio)); + memset(pmlmeext->bcn_delay_cnt, 0, sizeof(pmlmeext->bcn_delay_cnt)); + memset(pmlmeext->bcn_delay_ratio, 0, sizeof(pmlmeext->bcn_delay_ratio)); #ifdef CONFIG_P2P_PS process_p2p_ps_ie(padapter, (pframe + WLAN_HDR_A3_LEN), (len - WLAN_HDR_A3_LEN)); @@ -2238,7 +2238,7 @@ unsigned int OnAuth(_adapter *padapter, union recv_frame *precv_frame) /* prepare for the challenging txt... */ /* get_random_bytes((void *)pstat->chg_txt, 128); */ /* TODO: */ - _rtw_memset((void *)pstat->chg_txt, 78, 128); + memset((void *)pstat->chg_txt, 78, 128); #ifdef CONFIG_IEEE80211W if (pstat->bpairwise_key_installed != _TRUE && !(pstat->state & WIFI_FW_ASSOC_SUCCESS)) #endif /* CONFIG_IEEE80211W */ @@ -2304,7 +2304,7 @@ auth_fail: rtw_free_stainfo(padapter , pstat); pstat = &stat; - _rtw_memset((char *)pstat, '\0', sizeof(stat)); + memset((char *)pstat, '\0', sizeof(stat)); pstat->auth_seq = 2; _rtw_memcpy(pstat->hwaddr, sa, 6); @@ -2569,7 +2569,7 @@ unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame) pstat->wpa2_group_cipher = 0; pstat->wpa_pairwise_cipher = 0; pstat->wpa2_pairwise_cipher = 0; - _rtw_memset(pstat->wpa_ie, 0, sizeof(pstat->wpa_ie)); + memset(pstat->wpa_ie, 0, sizeof(pstat->wpa_ie)); if ((psecuritypriv->wpa_psk & BIT(1)) && elems.rsn_ie) { int group_cipher = 0, pairwise_cipher = 0; @@ -2755,7 +2755,7 @@ unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame) goto bypass_ht_chk; /* save HT capabilities in the sta object */ - _rtw_memset(&pstat->htpriv.ht_cap, 0, sizeof(struct rtw_ieee80211_ht_cap)); + memset(&pstat->htpriv.ht_cap, 0, sizeof(struct rtw_ieee80211_ht_cap)); if (elems.ht_capabilities && elems.ht_capabilities_len >= sizeof(struct rtw_ieee80211_ht_cap)) { pstat->flags |= WLAN_STA_HT; @@ -3865,7 +3865,7 @@ void issue_p2p_GO_request(_adapter *padapter, u8 *raddr) pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -4276,7 +4276,7 @@ static void issue_p2p_GO_response(_adapter *padapter, u8 *raddr, u8 *frame_body, pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -4309,7 +4309,7 @@ static void issue_p2p_GO_response(_adapter *padapter, u8 *raddr, u8 *frame_body, rtw_get_wps_attr_content(wpsie, wpsielen, WPS_ATTR_DEVICE_PWID, (u8 *) &be_tmp, &wps_devicepassword_id_len); wps_devicepassword_id = be16_to_cpu(be_tmp); - _rtw_memset(wpsie, 0x00, 255); + memset(wpsie, 0x00, 255); wpsielen = 0; /* WPS Section */ @@ -4701,7 +4701,7 @@ static void issue_p2p_GO_confirm(_adapter *padapter, u8 *raddr, u8 result) pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -4938,7 +4938,7 @@ void issue_p2p_invitation_request(_adapter *padapter, u8 *raddr) pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -5250,7 +5250,7 @@ void issue_p2p_invitation_response(_adapter *padapter, u8 *raddr, u8 dialogToken pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -5501,7 +5501,7 @@ void issue_p2p_provision_request(_adapter *padapter, u8 *pssid, u8 ussidlen, u8 pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -5640,7 +5640,7 @@ void issue_probersp_p2p(_adapter *padapter, unsigned char *da) pattrib->raid = rtw_get_mgntframe_raid(padapter, WIRELESS_11G); } - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -5798,7 +5798,7 @@ void issue_probersp_p2p(_adapter *padapter, unsigned char *da) /* Value: */ if (pwdinfo->external_uuid == 0) { - _rtw_memset(wpsie + wpsielen, 0x0, 16); + memset(wpsie + wpsielen, 0x0, 16); _rtw_memcpy(wpsie + wpsielen, mac, ETH_ALEN); } else _rtw_memcpy(wpsie + wpsielen, pwdinfo->uuid, 0x10); @@ -5965,7 +5965,7 @@ static int _issue_probereq_p2p(_adapter *padapter, u8 *da, int wait_ack) pattrib->raid = rtw_get_mgntframe_raid(padapter, WIRELESS_11G); } - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -6054,7 +6054,7 @@ static int _issue_probereq_p2p(_adapter *padapter, u8 *da, int wait_ack) wpsielen += 2; /* Value: */ if (pwdinfo->external_uuid == 0) { - _rtw_memset(wpsie + wpsielen, 0x0, 16); + memset(wpsie + wpsielen, 0x0, 16); _rtw_memcpy(wpsie + wpsielen, mac, ETH_ALEN); } else _rtw_memcpy(wpsie + wpsielen, pwdinfo->uuid, 0x10); @@ -6361,7 +6361,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame) switch (frame_body[6]) { /* OUI Subtype */ case P2P_GO_NEGO_REQ: { RTW_INFO("[%s] Got GO Nego Req Frame\n", __func__); - _rtw_memset(&pwdinfo->groupid_info, 0x00, sizeof(struct group_id_info)); + memset(&pwdinfo->groupid_info, 0x00, sizeof(struct group_id_info)); if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_REQ)) rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo)); @@ -6481,7 +6481,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame) RTW_INFO("[%s] Malloc p2p ie fail\n", __func__); goto exit; } - _rtw_memset(merged_p2pie, 0x00, merged_p2p_ielen); + memset(merged_p2pie, 0x00, merged_p2p_ielen); merged_p2p_ielen = rtw_p2p_merge_ies(frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, merged_p2pie); @@ -6505,7 +6505,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame) if (invitation_flag & P2P_INVITATION_FLAGS_PERSISTENT) { /* Re-invoke the persistent group. */ - _rtw_memset(&group_id, 0x00, sizeof(struct group_id_info)); + memset(&group_id, 0x00, sizeof(struct group_id_info)); rtw_get_p2p_attr_content(merged_p2pie, merged_p2p_ielen, P2P_ATTR_GROUP_ID, (u8 *) &group_id, &attr_contentlen); if (attr_contentlen) { if (_rtw_memcmp(group_id.go_device_addr, adapter_mac_addr(padapter), ETH_ALEN)) { @@ -6564,7 +6564,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame) } else { /* Received the invitation to join a P2P group. */ - _rtw_memset(&group_id, 0x00, sizeof(struct group_id_info)); + memset(&group_id, 0x00, sizeof(struct group_id_info)); rtw_get_p2p_attr_content(merged_p2pie, merged_p2p_ielen, P2P_ATTR_GROUP_ID, (u8 *) &group_id, &attr_contentlen); if (attr_contentlen) { if (_rtw_memcmp(group_id.go_device_addr, adapter_mac_addr(padapter), ETH_ALEN)) { @@ -7181,7 +7181,7 @@ void update_mgntframe_attrib(_adapter *padapter, struct pkt_attrib *pattrib) struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct xmit_priv *pxmitpriv = &padapter->xmitpriv; struct sta_info *pbcmc_sta = NULL; - /* _rtw_memset((u8 *)(pattrib), 0, sizeof(struct pkt_attrib)); */ + /* memset((u8 *)(pattrib), 0, sizeof(struct pkt_attrib)); */ pbcmc_sta = rtw_get_bcmc_stainfo(padapter); @@ -7357,7 +7357,7 @@ static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode) break; } case 2: - _rtw_memset(&ssid_ie[2], 0, ssid_len_ori); + memset(&ssid_ie[2], 0, ssid_len_ori); break; default: break; @@ -7435,7 +7435,7 @@ void issue_beacon(_adapter *padapter, int timeout_ms) pattrib->mbssid = 1; #endif - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -7733,7 +7733,7 @@ void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probe pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -7989,7 +7989,7 @@ static int _issue_probereq(_adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da, update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -8150,7 +8150,7 @@ void issue_auth(_adapter *padapter, struct sta_info *psta, unsigned short status pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -8332,7 +8332,7 @@ void issue_asocrsp(_adapter *padapter, unsigned short status, struct sta_info *p update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -8542,7 +8542,7 @@ void _issue_assocreq(_adapter *padapter, u8 is_reassoc) update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -8972,7 +8972,7 @@ static int _issue_nulldata(_adapter *padapter, unsigned char *da, unsigned int p update_mgntframe_attrib(padapter, pattrib); pattrib->retry_ctrl = _FALSE; - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -9158,7 +9158,7 @@ static int _issue_qos_nulldata(_adapter *padapter, unsigned char *da, u16 tid, i pattrib->ack_policy = 0; pattrib->mdata = 0; - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -9298,7 +9298,7 @@ static int _issue_deauth(_adapter *padapter, unsigned char *da, unsigned short r update_mgntframe_attrib(padapter, pattrib); pattrib->retry_ctrl = _FALSE; pattrib->key_type = key_type; - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -9425,7 +9425,7 @@ void issue_action_spct_ch_switch(_adapter *padapter, u8 *ra, u8 new_ch, u8 ch_of pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -9497,7 +9497,7 @@ void issue_action_SA_Query(_adapter *padapter, unsigned char *raddr, unsigned ch pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); pattrib->key_type = key_type; - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -9598,7 +9598,7 @@ static int issue_action_ba(_adapter *padapter, unsigned char *raddr, unsigned ch pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -9932,7 +9932,7 @@ static void issue_action_BSSCoexistPacket(_adapter *padapter) pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -9967,7 +9967,7 @@ static void issue_action_BSSCoexistPacket(_adapter *padapter) /* */ - _rtw_memset(ICS, 0, sizeof(ICS)); + memset(ICS, 0, sizeof(ICS)); if (pmlmepriv->num_sta_no_ht > 0) { int i; @@ -10081,7 +10081,7 @@ static int _issue_action_SM_PS(_adapter *padapter , unsigned char *raddr , u8 N pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -10371,7 +10371,7 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSI return _FAIL; } - _rtw_memset(bssid, 0, sizeof(WLAN_BSSID_EX)); + memset(bssid, 0, sizeof(WLAN_BSSID_EX)); subtype = get_frame_sub_type(pframe); @@ -10424,7 +10424,7 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSI } else bssid->Ssid.SsidLength = 0; - _rtw_memset(bssid->SupportedRates, 0, NDIS_802_11_LENGTH_RATES_EX); + memset(bssid->SupportedRates, 0, NDIS_802_11_LENGTH_RATES_EX); /* checking rate info... */ i = 0; @@ -10855,7 +10855,7 @@ static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid) p = ie; ie += len; - _rtw_memset(country, 0, 4); + memset(country, 0, 4); _rtw_memcpy(country, p, 3); p += 3; RTW_INFO("%s: 802.11d country=%s\n", __func__, country); @@ -10898,7 +10898,7 @@ static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid) _RTW_INFO("}\n"); #endif - _rtw_memset(pmlmeext->channel_set, 0, sizeof(pmlmeext->channel_set)); + memset(pmlmeext->channel_set, 0, sizeof(pmlmeext->channel_set)); chplan_new = pmlmeext->channel_set; i = j = k = 0; @@ -11990,9 +11990,9 @@ void linked_status_chk_tdls(_adapter *padapter) #define ALIVE_MIN 2 #define ALIVE_MAX 5 - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); - _rtw_memset(checkalive, 0x00, sizeof(checkalive)); - _rtw_memset(teardown, 0x00, sizeof(teardown)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(checkalive, 0x00, sizeof(checkalive)); + memset(teardown, 0x00, sizeof(teardown)); if ((padapter->tdlsinfo.link_established == _TRUE)) { _enter_critical_bh(&pstapriv->sta_hash_lock, &irqL); @@ -12118,8 +12118,8 @@ void linked_status_chk(_adapter *padapter, u8 from_timer) if (rtw_gw_addr_query(padapter) == 0) pmlmepriv->bGetGateway = 0; else { - _rtw_memset(pmlmepriv->gw_ip, 0, 4); - _rtw_memset(pmlmepriv->gw_mac_addr, 0, 6); + memset(pmlmepriv->gw_ip, 0, 4); + memset(pmlmepriv->gw_mac_addr, 0, 6); } } #endif @@ -12567,7 +12567,7 @@ void issue_action_ft_request(_adapter *padapter, u8 *pTargetAddr) pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -12626,7 +12626,7 @@ void report_ft_event(_adapter *padapter) struct cfg80211_ft_event_params ft_evt_parms; _irqL irqL; - _rtw_memset(&ft_evt_parms, 0, sizeof(ft_evt_parms)); + memset(&ft_evt_parms, 0, sizeof(ft_evt_parms)); rtw_update_ft_stainfo(padapter, pnetwork); if (!pnetwork) @@ -13247,7 +13247,7 @@ static u8 rtw_scan_sparse(_adapter *adapter, struct rtw_ieee80211_channel *ch, u } } - _rtw_memset(&ch[k], 0, sizeof(struct rtw_ieee80211_channel)); + memset(&ch[k], 0, sizeof(struct rtw_ieee80211_channel)); ret_num = k; mlmeext->last_scan_time = rtw_get_current_time(); @@ -13267,7 +13267,7 @@ static int rtw_scan_ch_decision(_adapter *padapter, struct rtw_ieee80211_channel struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; /* clear first */ - _rtw_memset(out, 0, sizeof(struct rtw_ieee80211_channel) * out_num); + memset(out, 0, sizeof(struct rtw_ieee80211_channel) * out_num); /* acquire channels from in */ j = 0; @@ -15109,7 +15109,7 @@ u8 tdls_hdl(_adapter *padapter, unsigned char *pbuf) break; #ifdef CONFIG_TDLS_CH_SW case TDLS_CH_SW_RESP: - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); txmgmt.status_code = 0; _rtw_memcpy(txmgmt.peer, ptdls_sta->hwaddr, ETH_ALEN); @@ -15191,7 +15191,7 @@ u8 tdls_hdl(_adapter *padapter, unsigned char *pbuf) if (option == TDLS_CH_SW_TO_BASE_CHNL_UNSOLICITED) { if (ptdls_sta != NULL) { /* Send unsolicited channel switch rsp. to peer */ - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); txmgmt.status_code = 0; _rtw_memcpy(txmgmt.peer, ptdls_sta->hwaddr, ETH_ALEN); issue_tdls_ch_switch_rsp(padapter, &txmgmt, _FALSE); @@ -15213,7 +15213,7 @@ u8 tdls_hdl(_adapter *padapter, unsigned char *pbuf) RTW_INFO("[TDLS] write REG_RCR, set bit6 on\n"); break; case TDLS_TEARDOWN_STA: - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); txmgmt.status_code = 0; _rtw_memcpy(txmgmt.peer, ptdls_sta->hwaddr, ETH_ALEN); @@ -15226,7 +15226,7 @@ u8 tdls_hdl(_adapter *padapter, unsigned char *pbuf) TDLS_CH_SWITCH_ON_STATE | TDLS_PEER_AT_OFF_STATE); rtw_tdls_set_ch_sw_oper_control(padapter, _FALSE); - _rtw_memset(pchsw_info->addr, 0x00, ETH_ALEN); + memset(pchsw_info->addr, 0x00, ETH_ALEN); } #endif rtw_sta_media_status_rpt(padapter, ptdls_sta, 0); diff --git a/core/rtw_mp.c b/core/rtw_mp.c index d1c26b1..73ee0bf 100644 --- a/core/rtw_mp.c +++ b/core/rtw_mp.c @@ -113,7 +113,7 @@ static void _init_mp_priv_(struct mp_priv *pmp_priv) { WLAN_BSSID_EX *pnetwork; - _rtw_memset(pmp_priv, 0, sizeof(struct mp_priv)); + memset(pmp_priv, 0, sizeof(struct mp_priv)); pmp_priv->mode = MP_OFF; @@ -206,11 +206,11 @@ static void mp_init_xmit_attrib(struct mp_tx *pmptx, PADAPTER padapter) /* init xmitframe attribute */ pattrib = &pmptx->attrib; - _rtw_memset(pattrib, 0, sizeof(struct pkt_attrib)); - _rtw_memset(pmptx->desc, 0, TXDESC_SIZE); + memset(pattrib, 0, sizeof(struct pkt_attrib)); + memset(pmptx->desc, 0, TXDESC_SIZE); pattrib->ether_type = 0x8712; - _rtw_memset(pattrib->dst, 0xFF, ETH_ALEN); + memset(pattrib->dst, 0xFF, ETH_ALEN); pattrib->ack_policy = 0; pattrib->hdrlen = WLAN_HDR_A3_LEN; @@ -491,7 +491,7 @@ void MPT_PwrCtlDM(PADAPTER padapter, u32 bstart) { struct _TXPWRTRACK_CFG c; u1Byte chnl = 0 ; - _rtw_memset(&c, 0, sizeof(struct _TXPWRTRACK_CFG)); + memset(&c, 0, sizeof(struct _TXPWRTRACK_CFG)); configure_txpower_track(pDM_Odm, &c); odm_clear_txpowertracking_state(pDM_Odm); if (*c.odm_tx_pwr_track_set_pwr) { @@ -531,7 +531,7 @@ u32 mp_join(PADAPTER padapter, u8 mode) struct wireless_dev *pwdev = padapter->rtw_wdev; #endif /* #ifdef CONFIG_IOCTL_CFG80211 */ /* 1. initialize a new WLAN_BSSID_EX */ - _rtw_memset(&bssid, 0, sizeof(WLAN_BSSID_EX)); + memset(&bssid, 0, sizeof(WLAN_BSSID_EX)); RTW_INFO("%s ,pmppriv->network_macaddr=%x %x %x %x %x %x\n", __func__, pmppriv->network_macaddr[0], pmppriv->network_macaddr[1], pmppriv->network_macaddr[2], pmppriv->network_macaddr[3], pmppriv->network_macaddr[4], pmppriv->network_macaddr[5]); @@ -710,7 +710,7 @@ void mp_stop_test(PADAPTER padapter) init_fwstate(pmlmepriv, pmppriv->prev_fw_state); /* flush the cur_network */ - _rtw_memset(tgt_network, 0, sizeof(struct wlan_network)); + memset(tgt_network, 0, sizeof(struct wlan_network)); _clr_fwstate_(pmlmepriv, WIFI_MP_STATE); @@ -1071,7 +1071,7 @@ void SetPacketTx(PADAPTER padapter) pmp_priv->tx.buf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pmp_priv->tx.pallocated_buf), XMITBUF_ALIGN_SZ); ptr = pmp_priv->tx.buf; - _rtw_memset(pmp_priv->tx.desc, 0, TXDESC_SIZE); + memset(pmp_priv->tx.desc, 0, TXDESC_SIZE); pkt_start = ptr; pkt_end = pkt_start + pkt_size; @@ -1119,7 +1119,7 @@ void SetPacketTx(PADAPTER padapter) /* startPlace = (u32)(rtw_random32() % 3450); */ _rtw_memcpy(ptr, pmp_priv->TXradomBuffer, pkt_end - ptr); - /* _rtw_memset(ptr, payload, pkt_end - ptr); */ + /* memset(ptr, payload, pkt_end - ptr); */ rtw_mfree(pmp_priv->TXradomBuffer, 4096); /* 3 6. start thread */ @@ -1946,7 +1946,7 @@ void CCK_generator( CRC16_generator(crc16_out, crc16_in, 32); - _rtw_memset(pPMacTxInfo->CRC16, 0, 2); + memset(pPMacTxInfo->CRC16, 0, 2); ByteToBit(pPMacTxInfo->CRC16, crc16_out, 2); } @@ -2366,7 +2366,7 @@ void L_SIG_generator( sig_bi[i] = 0; /* dump_buf(sig_bi,24);*/ - _rtw_memset(pPMacTxInfo->LSIG, 0, 3); + memset(pPMacTxInfo->LSIG, 0, 3); ByteToBit(pPMacTxInfo->LSIG, (bool *)sig_bi, 3); } @@ -2456,7 +2456,7 @@ void HT_SIG_generator( for (i = 42; i < 48; i++) sig_bi[i] = 0; - _rtw_memset(pPMacTxInfo->HT_SIG, 0, 6); + memset(pPMacTxInfo->HT_SIG, 0, 6); ByteToBit(pPMacTxInfo->HT_SIG, sig_bi, 6); } @@ -2476,8 +2476,8 @@ void VHT_SIG_A_generator( UINT i; bool sig_bi[48], crc8[8]; - _rtw_memset(sig_bi, 0, 48); - _rtw_memset(crc8, 0, 8); + memset(sig_bi, 0, 48); + memset(crc8, 0, 8); /* BW Setting*/ for (i = 0; i < 2; i++) @@ -2524,7 +2524,7 @@ void VHT_SIG_A_generator( for (i = 42; i < 48; i++) sig_bi[i] = 0; - _rtw_memset(pPMacTxInfo->VHT_SIG_A, 0, 6); + memset(pPMacTxInfo->VHT_SIG_A, 0, 6); ByteToBit(pPMacTxInfo->VHT_SIG_A, sig_bi, 6); } @@ -2540,8 +2540,8 @@ void VHT_SIG_B_generator( UINT i, len, res, tail = 6, total_len, crc8_in_len; UINT sigb_len; - _rtw_memset(sig_bi, 0, 32); - _rtw_memset(crc8_bi, 0, 8); + memset(sig_bi, 0, 32); + memset(crc8_bi, 0, 8); /*Sounding Packet*/ if (pPMacTxInfo->NDP_sound == 1) { @@ -2593,7 +2593,7 @@ void VHT_SIG_B_generator( sig_bi[len + res + i] = 0; } - _rtw_memset(pPMacTxInfo->VHT_SIG_B, 0, 4); + memset(pPMacTxInfo->VHT_SIG_B, 0, 4); ByteToBit(pPMacTxInfo->VHT_SIG_B, sig_bi, 4); pPMacTxInfo->VHT_SIG_B_CRC = 0; @@ -2628,7 +2628,7 @@ void VHT_Delimiter_generator( for (j = 24; j < 32; j++) /* Delimiter[31:24]: Signature ('4E' in Hex, 78 in Dec)*/ sig_bi[j] = (78 >> (j - 24)) % 2; - _rtw_memset(pPMacTxInfo->VHT_Delimiter, 0, 4); + memset(pPMacTxInfo->VHT_Delimiter, 0, 4); ByteToBit(pPMacTxInfo->VHT_Delimiter, sig_bi, 4); } diff --git a/core/rtw_p2p.c b/core/rtw_p2p.c index 4b33764..1fed6e1 100644 --- a/core/rtw_p2p.c +++ b/core/rtw_p2p.c @@ -170,7 +170,7 @@ static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da) pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -230,7 +230,7 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -308,7 +308,7 @@ static void issue_p2p_provision_resp(struct wifidirect_info *pwdinfo, u8 *raddr, pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -398,7 +398,7 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -595,7 +595,7 @@ u32 build_beacon_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) _rtw_memcpy(wfdie + wfdielen, &pmlmepriv->assoc_bssid[0], ETH_ALEN); else - _rtw_memset(wfdie + wfdielen, 0x00, ETH_ALEN); + memset(wfdie + wfdielen, 0x00, ETH_ALEN); wfdielen += ETH_ALEN; @@ -707,7 +707,7 @@ u32 build_probe_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) _rtw_memcpy(wfdie + wfdielen, &pmlmepriv->assoc_bssid[0], ETH_ALEN); else - _rtw_memset(wfdie + wfdielen, 0x00, ETH_ALEN); + memset(wfdie + wfdielen, 0x00, ETH_ALEN); wfdielen += ETH_ALEN; @@ -842,7 +842,7 @@ u32 build_probe_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf, u8 tunnel if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) _rtw_memcpy(wfdie + wfdielen, &pmlmepriv->assoc_bssid[0], ETH_ALEN); else - _rtw_memset(wfdie + wfdielen, 0x00, ETH_ALEN); + memset(wfdie + wfdielen, 0x00, ETH_ALEN); wfdielen += ETH_ALEN; @@ -996,7 +996,7 @@ u32 build_assoc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) _rtw_memcpy(wfdie + wfdielen, &pmlmepriv->assoc_bssid[0], ETH_ALEN); else - _rtw_memset(wfdie + wfdielen, 0x00, ETH_ALEN); + memset(wfdie + wfdielen, 0x00, ETH_ALEN); wfdielen += ETH_ALEN; @@ -1095,7 +1095,7 @@ u32 build_assoc_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) _rtw_memcpy(wfdie + wfdielen, &pmlmepriv->assoc_bssid[0], ETH_ALEN); else - _rtw_memset(wfdie + wfdielen, 0x00, ETH_ALEN); + memset(wfdie + wfdielen, 0x00, ETH_ALEN); wfdielen += ETH_ALEN; @@ -1194,7 +1194,7 @@ u32 build_nego_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) _rtw_memcpy(wfdie + wfdielen, &pmlmepriv->assoc_bssid[0], ETH_ALEN); else - _rtw_memset(wfdie + wfdielen, 0x00, ETH_ALEN); + memset(wfdie + wfdielen, 0x00, ETH_ALEN); wfdielen += ETH_ALEN; @@ -1293,7 +1293,7 @@ u32 build_nego_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) _rtw_memcpy(wfdie + wfdielen, &pmlmepriv->assoc_bssid[0], ETH_ALEN); else - _rtw_memset(wfdie + wfdielen, 0x00, ETH_ALEN); + memset(wfdie + wfdielen, 0x00, ETH_ALEN); wfdielen += ETH_ALEN; @@ -1393,7 +1393,7 @@ u32 build_nego_confirm_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) _rtw_memcpy(wfdie + wfdielen, &pmlmepriv->assoc_bssid[0], ETH_ALEN); else - _rtw_memset(wfdie + wfdielen, 0x00, ETH_ALEN); + memset(wfdie + wfdielen, 0x00, ETH_ALEN); wfdielen += ETH_ALEN; @@ -1493,7 +1493,7 @@ u32 build_invitation_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) _rtw_memcpy(wfdie + wfdielen, &pmlmepriv->assoc_bssid[0], ETH_ALEN); else - _rtw_memset(wfdie + wfdielen, 0x00, ETH_ALEN); + memset(wfdie + wfdielen, 0x00, ETH_ALEN); wfdielen += ETH_ALEN; @@ -1606,7 +1606,7 @@ u32 build_invitation_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) _rtw_memcpy(wfdie + wfdielen, &pmlmepriv->assoc_bssid[0], ETH_ALEN); else - _rtw_memset(wfdie + wfdielen, 0x00, ETH_ALEN); + memset(wfdie + wfdielen, 0x00, ETH_ALEN); wfdielen += ETH_ALEN; @@ -1719,7 +1719,7 @@ u32 build_provdisc_req_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) _rtw_memcpy(wfdie + wfdielen, &pmlmepriv->assoc_bssid[0], ETH_ALEN); else - _rtw_memset(wfdie + wfdielen, 0x00, ETH_ALEN); + memset(wfdie + wfdielen, 0x00, ETH_ALEN); wfdielen += ETH_ALEN; @@ -1819,7 +1819,7 @@ u32 build_provdisc_resp_wfd_ie(struct wifidirect_info *pwdinfo, u8 *pbuf) if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) _rtw_memcpy(wfdie + wfdielen, &pmlmepriv->assoc_bssid[0], ETH_ALEN); else - _rtw_memset(wfdie + wfdielen, 0x00, ETH_ALEN); + memset(wfdie + wfdielen, 0x00, ETH_ALEN); wfdielen += ETH_ALEN; @@ -2702,7 +2702,7 @@ u8 process_p2p_group_negotation_req(struct wifidirect_info *pwdinfo, u8 *pframe, attr_contentlen = 0; if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_INTENDED_IF_ADDR, pwdinfo->p2p_peer_interface_addr, &attr_contentlen)) { if (attr_contentlen != ETH_ALEN) - _rtw_memset(pwdinfo->p2p_peer_interface_addr, 0x00, ETH_ALEN); + memset(pwdinfo->p2p_peer_interface_addr, 0x00, ETH_ALEN); } if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, ch_content, &ch_cnt)) { @@ -2847,7 +2847,7 @@ u8 process_p2p_group_negotation_resp(struct wifidirect_info *pwdinfo, u8 *pframe attr_contentlen = 0; if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_INTENDED_IF_ADDR, pwdinfo->p2p_peer_interface_addr, &attr_contentlen)) { if (attr_contentlen != ETH_ALEN) - _rtw_memset(pwdinfo->p2p_peer_interface_addr, 0x00, ETH_ALEN); + memset(pwdinfo->p2p_peer_interface_addr, 0x00, ETH_ALEN); } /* Try to get the peer's intent and tie breaker value. */ @@ -2952,7 +2952,7 @@ u8 process_p2p_group_negotation_resp(struct wifidirect_info *pwdinfo, u8 *pframe /* Try to get the group id information if peer is GO */ attr_contentlen = 0; - _rtw_memset(groupid, 0x00, 38); + memset(groupid, 0x00, 38); if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen)) { _rtw_memcpy(pwdinfo->groupid_info.go_device_addr, &groupid[0], ETH_ALEN); _rtw_memcpy(pwdinfo->groupid_info.ssid, &groupid[6], attr_contentlen - ETH_ALEN); @@ -3032,7 +3032,7 @@ u8 process_p2p_group_negotation_confirm(struct wifidirect_info *pwdinfo, u8 *pfr /* Try to get the group id information */ attr_contentlen = 0; - _rtw_memset(groupid, 0x00, 38); + memset(groupid, 0x00, 38); if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen)) { RTW_INFO("[%s] Ssid = %s, ssidlen = %zu\n", __func__, &groupid[ETH_ALEN], strlen(&groupid[ETH_ALEN])); _rtw_memcpy(pwdinfo->groupid_info.go_device_addr, &groupid[0], ETH_ALEN); @@ -3079,7 +3079,7 @@ static void find_phase_handler(_adapter *padapter) u8 _status = 0; - _rtw_memset((unsigned char *)&ssid, 0, sizeof(NDIS_802_11_SSID)); + memset((unsigned char *)&ssid, 0, sizeof(NDIS_802_11_SSID)); _rtw_memcpy(ssid.Ssid, pwdinfo->p2p_wildcard_ssid, P2P_WILDCARD_SSID_LEN); ssid.SsidLength = P2P_WILDCARD_SSID_LEN; @@ -3774,7 +3774,7 @@ static u8 *dump_p2p_attr_ch_list(u8 *p2p_ie, uint p2p_ielen, u8 *buf, u32 buf_le attr_contentlen -= 3; - _rtw_memset(ch_list, 0, 40); + memset(ch_list, 0, 40); while (attr_contentlen > 0) { num_of_ch = *(pattr_temp + 1); @@ -4212,7 +4212,7 @@ void rtw_init_cfg80211_wifidirect_info(_adapter *padapter) { struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo; - _rtw_memset(pcfg80211_wdinfo, 0x00, sizeof(struct cfg80211_wifidirect_info)); + memset(pcfg80211_wdinfo, 0x00, sizeof(struct cfg80211_wifidirect_info)); #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) _init_timer(&pcfg80211_wdinfo->remain_on_ch_timer, padapter->pnetdev, ro_ch_timer_process, padapter); @@ -4732,8 +4732,8 @@ int rtw_init_wifi_display_info(_adapter *padapter) pwfd_info->wfd_pc = _FALSE; /* Used in TDLS */ - _rtw_memset(pwfd_info->ip_address, 0x00, 4); - _rtw_memset(pwfd_info->peer_ip_address, 0x00, 4); + memset(pwfd_info->ip_address, 0x00, 4); + memset(pwfd_info->peer_ip_address, 0x00, 4); return res; } @@ -5034,32 +5034,32 @@ void init_wifidirect_info(_adapter *padapter, enum P2P_ROLE role) _rtw_memcpy((void *) pwdinfo->p2p_wildcard_ssid, "DIRECT-", 7); - _rtw_memset(pwdinfo->device_name, 0x00, WPS_MAX_DEVICE_NAME_LEN); + memset(pwdinfo->device_name, 0x00, WPS_MAX_DEVICE_NAME_LEN); pwdinfo->device_name_len = 0; - _rtw_memset(&pwdinfo->invitereq_info, 0x00, sizeof(struct tx_invite_req_info)); + memset(&pwdinfo->invitereq_info, 0x00, sizeof(struct tx_invite_req_info)); pwdinfo->invitereq_info.token = 3; /* Token used for P2P invitation request frame. */ - _rtw_memset(&pwdinfo->inviteresp_info, 0x00, sizeof(struct tx_invite_resp_info)); + memset(&pwdinfo->inviteresp_info, 0x00, sizeof(struct tx_invite_resp_info)); pwdinfo->inviteresp_info.token = 0; pwdinfo->profileindex = 0; - _rtw_memset(&pwdinfo->profileinfo[0], 0x00, sizeof(struct profile_info) * P2P_MAX_PERSISTENT_GROUP_NUM); + memset(&pwdinfo->profileinfo[0], 0x00, sizeof(struct profile_info) * P2P_MAX_PERSISTENT_GROUP_NUM); rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_NONE); pwdinfo->listen_dwell = (u8)((rtw_get_current_time() % 3) + 1); /* RTW_INFO( "[%s] listen_dwell time is %d00ms\n", __func__, pwdinfo->listen_dwell ); */ - _rtw_memset(&pwdinfo->tx_prov_disc_info, 0x00, sizeof(struct tx_provdisc_req_info)); + memset(&pwdinfo->tx_prov_disc_info, 0x00, sizeof(struct tx_provdisc_req_info)); pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_NONE; - _rtw_memset(&pwdinfo->nego_req_info, 0x00, sizeof(struct tx_nego_req_info)); + memset(&pwdinfo->nego_req_info, 0x00, sizeof(struct tx_nego_req_info)); pwdinfo->device_password_id_for_nego = WPS_DPID_PBC; pwdinfo->negotiation_dialog_token = 1; - _rtw_memset(pwdinfo->nego_ssid, 0x00, WLAN_SSID_MAXLEN); + memset(pwdinfo->nego_ssid, 0x00, WLAN_SSID_MAXLEN); pwdinfo->nego_ssidlen = 0; pwdinfo->ui_got_wps_info = P2P_NO_WPSINFO; @@ -5070,11 +5070,11 @@ void init_wifidirect_info(_adapter *padapter, enum P2P_ROLE role) pwdinfo->supported_wps_cm = WPS_CONFIG_METHOD_DISPLAY | WPS_CONFIG_METHOD_PBC | WPS_CONFIG_METHOD_KEYPAD; #endif /* CONFIG_WFD */ pwdinfo->channel_list_attr_len = 0; - _rtw_memset(pwdinfo->channel_list_attr, 0x00, 100); + memset(pwdinfo->channel_list_attr, 0x00, 100); - _rtw_memset(pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, 0x00, 4); - _rtw_memset(pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, '0', 3); - _rtw_memset(&pwdinfo->groupid_info, 0x00, sizeof(struct group_id_info)); + memset(pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, 0x00, 4); + memset(pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, '0', 3); + memset(&pwdinfo->groupid_info, 0x00, sizeof(struct group_id_info)); #ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_IOCTL_CFG80211 pwdinfo->ext_listen_interval = 1000; /* The interval to be available with legacy AP during p2p0-find/scan */ @@ -5096,8 +5096,8 @@ void init_wifidirect_info(_adapter *padapter, enum P2P_ROLE role) #endif /* CONFIG_IOCTL_CFG80211 */ pwdinfo->wfd_tdls_enable = 0; - _rtw_memset(pwdinfo->p2p_peer_interface_addr, 0x00, ETH_ALEN); - _rtw_memset(pwdinfo->p2p_peer_device_addr, 0x00, ETH_ALEN); + memset(pwdinfo->p2p_peer_interface_addr, 0x00, ETH_ALEN); + memset(pwdinfo->p2p_peer_device_addr, 0x00, ETH_ALEN); pwdinfo->rx_invitereq_info.operation_ch[0] = 0; pwdinfo->rx_invitereq_info.operation_ch[1] = 0; /* Used to indicate the scan end in site survey function */ @@ -5326,10 +5326,10 @@ int rtw_p2p_enable(_adapter *padapter, enum P2P_ROLE role) rtw_p2p_set_state(pwdinfo, P2P_STATE_NONE); rtw_p2p_set_pre_state(pwdinfo, P2P_STATE_NONE); rtw_p2p_set_role(pwdinfo, P2P_ROLE_DISABLE); - _rtw_memset(&pwdinfo->rx_prov_disc_info, 0x00, sizeof(struct rx_provdisc_req_info)); + memset(&pwdinfo->rx_prov_disc_info, 0x00, sizeof(struct rx_provdisc_req_info)); /* Remove profiles in wifidirect_info structure. */ - _rtw_memset(&pwdinfo->profileinfo[0], 0x00, sizeof(struct profile_info) * P2P_MAX_PERSISTENT_GROUP_NUM); + memset(&pwdinfo->profileinfo[0], 0x00, sizeof(struct profile_info) * P2P_MAX_PERSISTENT_GROUP_NUM); pwdinfo->profileindex = 0; } diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c index a5e520d..fba7e9f 100644 --- a/core/rtw_pwrctrl.c +++ b/core/rtw_pwrctrl.c @@ -2046,7 +2046,7 @@ void rtw_free_pwrctrl_priv(PADAPTER adapter) #endif - /* _rtw_memset((unsigned char *)pwrctrlpriv, 0, sizeof(struct pwrctrl_priv)); */ + /* memset((unsigned char *)pwrctrlpriv, 0, sizeof(struct pwrctrl_priv)); */ #ifdef CONFIG_RESUME_IN_WORKQUEUE diff --git a/core/rtw_recv.c b/core/rtw_recv.c index 24658fd..464eb62 100755 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -51,7 +51,7 @@ void _rtw_init_sta_recv_priv(struct sta_recv_priv *psta_recvpriv) - _rtw_memset((u8 *)psta_recvpriv, 0, sizeof(struct sta_recv_priv)); + memset((u8 *)psta_recvpriv, 0, sizeof(struct sta_recv_priv)); spin_lock_init(&psta_recvpriv->lock); @@ -72,7 +72,7 @@ sint _rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter) /* We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */ - /* _rtw_memset((unsigned char *)precvpriv, 0, sizeof (struct recv_priv)); */ + /* memset((unsigned char *)precvpriv, 0, sizeof (struct recv_priv)); */ spin_lock_init(&precvpriv->lock); @@ -107,7 +107,7 @@ sint _rtw_init_recv_priv(struct recv_priv *precvpriv, _adapter *padapter) res = _FAIL; goto exit; } - /* _rtw_memset(precvpriv->pallocated_frame_buf, 0, NR_RECVFRAME * sizeof(union recv_frame) + RXFRAME_ALIGN_SZ); */ + /* memset(precvpriv->pallocated_frame_buf, 0, NR_RECVFRAME * sizeof(union recv_frame) + RXFRAME_ALIGN_SZ); */ precvpriv->precv_frame_buf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(precvpriv->pallocated_frame_buf), RXFRAME_ALIGN_SZ); /* precvpriv->precv_frame_buf = precvpriv->pallocated_frame_buf + RXFRAME_ALIGN_SZ - */ diff --git a/core/rtw_security.c b/core/rtw_security.c index e7b435d..e2cd063 100644 --- a/core/rtw_security.c +++ b/core/rtw_security.c @@ -1375,13 +1375,13 @@ static sint aes_cipher(u8 *key, uint hdrlen, frsubtype = frsubtype >> 4; - _rtw_memset((void *)mic_iv, 0, 16); - _rtw_memset((void *)mic_header1, 0, 16); - _rtw_memset((void *)mic_header2, 0, 16); - _rtw_memset((void *)ctr_preload, 0, 16); - _rtw_memset((void *)chain_buffer, 0, 16); - _rtw_memset((void *)aes_out, 0, 16); - _rtw_memset((void *)padded_buffer, 0, 16); + memset((void *)mic_iv, 0, 16); + memset((void *)mic_header1, 0, 16); + memset((void *)mic_header2, 0, 16); + memset((void *)ctr_preload, 0, 16); + memset((void *)chain_buffer, 0, 16); + memset((void *)aes_out, 0, 16); + memset((void *)padded_buffer, 0, 16); if ((hdrlen == WLAN_HDR_A3_LEN) || (hdrlen == WLAN_HDR_A3_QOS_LEN)) a4_exists = 0; @@ -1683,13 +1683,13 @@ static sint aes_decipher(u8 *key, uint hdrlen, frsubtype = frsubtype >> 4; - _rtw_memset((void *)mic_iv, 0, 16); - _rtw_memset((void *)mic_header1, 0, 16); - _rtw_memset((void *)mic_header2, 0, 16); - _rtw_memset((void *)ctr_preload, 0, 16); - _rtw_memset((void *)chain_buffer, 0, 16); - _rtw_memset((void *)aes_out, 0, 16); - _rtw_memset((void *)padded_buffer, 0, 16); + memset((void *)mic_iv, 0, 16); + memset((void *)mic_header1, 0, 16); + memset((void *)mic_header2, 0, 16); + memset((void *)ctr_preload, 0, 16); + memset((void *)chain_buffer, 0, 16); + memset((void *)aes_out, 0, 16); + memset((void *)padded_buffer, 0, 16); /* start to decrypt the payload */ @@ -2055,7 +2055,7 @@ u32 rtw_BIP_verify(_adapter *padapter, u8 *precvframe) goto BIP_exit; } /* clear the MIC field of MME to zero */ - _rtw_memset(p + 2 + len - 8, 0, 8); + memset(p + 2 + len - 8, 0, 8); /* conscruct AAD, copy frame control field */ _rtw_memcpy(BIP_AAD, &pwlanhdr->frame_ctl, 2); @@ -2326,7 +2326,7 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem, * and text is the data being protected */ /* start out by storing key in ipad */ - _rtw_memset(k_pad, 0, sizeof(k_pad)); + memset(k_pad, 0, sizeof(k_pad)); _rtw_memcpy(k_pad, key, key_len); /* XOR key with ipad values */ for (i = 0; i < 64; i++) @@ -2341,7 +2341,7 @@ static void hmac_sha256_vector(u8 *key, size_t key_len, size_t num_elem, } sha256_vector(1 + num_elem, _addr, _len, mac); - _rtw_memset(k_pad, 0, sizeof(k_pad)); + memset(k_pad, 0, sizeof(k_pad)); _rtw_memcpy(k_pad, key, key_len); /* XOR key with opad values */ for (i = 0; i < 64; i++) @@ -2702,7 +2702,7 @@ static void gf_mulx(u8 *pad) static void aes_encrypt_deinit(void *ctx) { - _rtw_memset(ctx, 0, AES_PRIV_SIZE); + memset(ctx, 0, AES_PRIV_SIZE); rtw_mfree(ctx, AES_PRIV_SIZE); } @@ -2731,7 +2731,7 @@ static int omac1_aes_128_vector(u8 *key, size_t num_elem, ctx = aes_encrypt_init(key, 16); if (ctx == NULL) return -1; - _rtw_memset(cbc, 0, AES_BLOCK_SIZE); + memset(cbc, 0, AES_BLOCK_SIZE); total_len = 0; for (e = 0; e < num_elem; e++) @@ -2756,7 +2756,7 @@ static int omac1_aes_128_vector(u8 *key, size_t num_elem, left -= AES_BLOCK_SIZE; } - _rtw_memset(pad, 0, AES_BLOCK_SIZE); + memset(pad, 0, AES_BLOCK_SIZE); aes_128_encrypt(ctx, pad, pad); gf_mulx(pad); @@ -2897,7 +2897,7 @@ int wpa_tdls_ftie_mic(u8 *kck, u8 trans_seq, /* 7) FTIE, with the MIC field of the FTIE set to 0 */ _rtw_memcpy(pos, ftie, 2 + ftie[1]); _ftie = (struct wpa_tdls_ftie *) pos; - _rtw_memset(_ftie->mic, 0, TDLS_MIC_LEN); + memset(_ftie->mic, 0, TDLS_MIC_LEN); pos += 2 + ftie[1]; ret = omac1_aes_128(kck, buf, pos - buf, mic); @@ -2946,7 +2946,7 @@ int wpa_tdls_teardown_ftie_mic(u8 *kck, u8 *lnkid, u16 reason, /* 5) FTIE, with the MIC field of the FTIE set to 0 */ _rtw_memcpy(pos, ftie, 2 + ftie[1]); _ftie = (struct wpa_tdls_ftie *) pos; - _rtw_memset(_ftie->mic, 0, TDLS_MIC_LEN); + memset(_ftie->mic, 0, TDLS_MIC_LEN); pos += 2 + ftie[1]; ret = omac1_aes_128(kck, buf, pos - buf, mic); @@ -2996,7 +2996,7 @@ int tdls_verify_mic(u8 *kck, u8 trans_seq, _rtw_memcpy(pos, ftie, 2 + *(ftie + 1)); pos += 2; tmp_ftie = (u8 *)(pos + 2); - _rtw_memset(tmp_ftie, 0, 16); + memset(tmp_ftie, 0, 16); pos += *(ftie + 1); ret = omac1_aes_128(kck, buf, pos - buf, mic); diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c index d2bd42f..c36bd39 100644 --- a/core/rtw_sta_mgt.c +++ b/core/rtw_sta_mgt.c @@ -36,7 +36,7 @@ static struct st_register test_st_reg = { inline void rtw_st_ctl_init(struct st_ctl_t *st_ctl) { - _rtw_memset(st_ctl->reg, 0 , sizeof(struct st_register) * SESSION_TRACKER_REG_ID_NUM); + memset(st_ctl->reg, 0 , sizeof(struct st_register) * SESSION_TRACKER_REG_ID_NUM); _rtw_init_queue(&st_ctl->tracker_q); } @@ -161,7 +161,7 @@ void _rtw_init_stainfo(struct sta_info *psta) { - _rtw_memset((u8 *)psta, 0, sizeof(struct sta_info)); + memset((u8 *)psta, 0, sizeof(struct sta_info)); spin_lock_init(&psta->lock); _rtw_init_listhead(&psta->list); @@ -277,7 +277,7 @@ u32 _rtw_init_sta_priv(struct sta_priv *pstapriv) pstapriv->expire_to = 60;/* 60*2 = 120 sec = 2 min, expire after no any traffic. */ #endif #ifdef CONFIG_ATMEL_RC_PATCH - _rtw_memset(pstapriv->atmel_rc_pattern, 0, ETH_ALEN); + memset(pstapriv->atmel_rc_pattern, 0, ETH_ALEN); #endif pstapriv->max_num_sta = NUM_STA; @@ -500,7 +500,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr) for (i = 0; i < 16; i++) { _rtw_memcpy(&psta->sta_recvpriv.rxcache.tid_rxseq[i], &wRxSeqInitialValue, 2); - _rtw_memset(&psta->sta_recvpriv.rxcache.iv[i], 0, sizeof(psta->sta_recvpriv.rxcache.iv[i])); + memset(&psta->sta_recvpriv.rxcache.iv[i], 0, sizeof(psta->sta_recvpriv.rxcache.iv[i])); } init_addba_retry_timer(pstapriv->padapter, psta); @@ -1114,7 +1114,7 @@ void rtw_pre_link_sta_ctl_reset(struct sta_priv *stapriv) u8 addrs[RTW_PRE_LINK_STA_NUM][ETH_ALEN]; - _rtw_memset(addrs, 0, RTW_PRE_LINK_STA_NUM * ETH_ALEN); + memset(addrs, 0, RTW_PRE_LINK_STA_NUM * ETH_ALEN); _enter_critical_bh(&(pre_link_sta_ctl->lock), &irqL); for (i = 0; i < RTW_PRE_LINK_STA_NUM; i++) { diff --git a/core/rtw_tdls.c b/core/rtw_tdls.c index deff6ab..fd0d754 100644 --- a/core/rtw_tdls.c +++ b/core/rtw_tdls.c @@ -90,7 +90,7 @@ void rtw_free_tdls_info(struct tdls_info *ptdlsinfo) _rtw_spinlock_free(&ptdlsinfo->cmd_lock); _rtw_spinlock_free(&ptdlsinfo->hdl_lock); - _rtw_memset(ptdlsinfo, 0, sizeof(struct tdls_info)); + memset(ptdlsinfo, 0, sizeof(struct tdls_info)); } @@ -173,7 +173,7 @@ int _issue_nulldata_to_TDLS_peer_STA(_adapter *padapter, unsigned char *da, unsi pattrib->mdata = 0; pattrib->retry_ctrl = _FALSE; - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -278,7 +278,7 @@ void free_tdls_sta(_adapter *padapter, struct sta_info *ptdls_sta) /* -2: AP + BC/MC sta, -4: default key */ if (ptdlsinfo->sta_cnt < MAX_ALLOWED_TDLS_STA_NUM) { ptdlsinfo->sta_maximum = _FALSE; - _rtw_memset(&ptdlsinfo->ss_record, 0x00, sizeof(struct tdls_ss_record)); + memset(&ptdlsinfo->ss_record, 0x00, sizeof(struct tdls_ss_record)); } /* clear cam */ @@ -312,7 +312,7 @@ void rtw_tdls_process_ht_cap(_adapter *padapter, struct sta_info *ptdls_sta, u8 u8 cur_ldpc_cap = 0, cur_stbc_cap = 0, cur_beamform_cap = 0; /* Save HT capabilities in the sta object */ - _rtw_memset(&ptdls_sta->htpriv.ht_cap, 0, sizeof(struct rtw_ieee80211_ht_cap)); + memset(&ptdls_sta->htpriv.ht_cap, 0, sizeof(struct rtw_ieee80211_ht_cap)); if (data && Length >= sizeof(struct rtw_ieee80211_ht_cap)) { ptdls_sta->flags |= WLAN_STA_HT; ptdls_sta->flags |= WLAN_STA_WME; @@ -804,7 +804,7 @@ int issue_tunneled_probe_req(_adapter *padapter) RTW_INFO("[%s]\n", __func__); - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); txmgmt.action_code = TUNNELED_PROBE_REQ; pmgntframe = alloc_mgtxmitframe(pxmitpriv); @@ -846,7 +846,7 @@ int issue_tunneled_probe_rsp(_adapter *padapter, union recv_frame *precv_frame) RTW_INFO("[%s]\n", __func__); - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); txmgmt.action_code = TUNNELED_PROBE_RSP; pmgntframe = alloc_mgtxmitframe(pxmitpriv); @@ -1179,7 +1179,7 @@ int issue_tdls_dis_rsp(_adapter *padapter, struct tdls_txmgmt *ptxmgmt, u8 priva pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -1268,7 +1268,7 @@ int issue_tdls_peer_traffic_indication(_adapter *padapter, struct sta_info *ptdl RTW_INFO("[TDLS] %s\n", __func__); - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); txmgmt.action_code = TDLS_PEER_TRAFFIC_INDICATION; pmgntframe = alloc_mgtxmitframe(pxmitpriv); @@ -1321,7 +1321,7 @@ int issue_tdls_ch_switch_req(_adapter *padapter, struct sta_info *ptdls_sta) goto exit; } - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); txmgmt.action_code = TDLS_CHANNEL_SWITCH_REQUEST; pmgntframe = alloc_mgtxmitframe(pxmitpriv); @@ -1423,7 +1423,7 @@ int On_TDLS_Dis_Rsp(_adapter *padapter, union recv_frame *precv_frame) struct tdls_txmgmt txmgmt; int ret = _SUCCESS; - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); /* WFDTDLS: for sigma test, not to setup direct link automatically */ ptdlsinfo->dev_discovered = _TRUE; @@ -1505,7 +1505,7 @@ sint On_TDLS_Setup_Req(_adapter *padapter, union recv_frame *precv_frame) if (rtw_tdls_is_setup_allowed(padapter) == _FALSE) goto exit; - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); psa = get_sa(ptr); ptdls_sta = rtw_get_stainfo(pstapriv, psa); @@ -1703,7 +1703,7 @@ int On_TDLS_Setup_Rsp(_adapter *padapter, union recv_frame *precv_frame) int ret = _SUCCESS; u32 timeout_interval = TDLS_TPK_RESEND_COUNT; - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); psa = get_sa(ptr); ptdls_sta = rtw_get_stainfo(pstapriv, psa); @@ -1987,7 +1987,7 @@ int On_TDLS_Dis_Req(_adapter *padapter, union recv_frame *precv_frame) if (rtw_tdls_is_driver_setup(padapter) == _FALSE) goto exit; - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); ptr += prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len + LLC_HEADER_SIZE + ETH_TYPE_LEN + PAYLOAD_TYPE_LEN; txmgmt.dialog_token = *(ptr + 2); _rtw_memcpy(&txmgmt.peer, precv_frame->u.hdr.attrib.src, ETH_ALEN); @@ -2065,7 +2065,7 @@ int On_TDLS_Peer_Traffic_Indication(_adapter *padapter, union recv_frame *precv_ struct tdls_txmgmt txmgmt; ptr += pattrib->hdrlen + pattrib->iv_len + LLC_HEADER_SIZE + ETH_TYPE_LEN + PAYLOAD_TYPE_LEN; - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); if (ptdls_sta != NULL) { txmgmt.dialog_token = *(ptr + 2); @@ -2171,7 +2171,7 @@ sint On_TDLS_Ch_Switch_Req(_adapter *padapter, union recv_frame *precv_frame) return _FAIL; } - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); psa = get_sa(ptr); ptdls_sta = rtw_get_stainfo(pstapriv, psa); @@ -2431,7 +2431,7 @@ void wfd_ie_tdls(_adapter *padapter, u8 *pframe, u32 *pktlen) if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) _rtw_memcpy(wfdie + wfdielen, &pmlmepriv->assoc_bssid[0], ETH_ALEN); else - _rtw_memset(wfdie + wfdielen, 0x00, ETH_ALEN); + memset(wfdie + wfdielen, 0x00, ETH_ALEN); /* Local IP Address ATTR */ wfdie[wfdielen++] = WFD_ATTR_LOCAL_IP_ADDR; @@ -2917,7 +2917,7 @@ void _tdls_tpk_timer_hdl(void *FunctionContext) struct sta_info *ptdls_sta = (struct sta_info *)FunctionContext; struct tdls_txmgmt txmgmt; - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); ptdls_sta->TPK_count++; /* TPK_timer expired in a second */ /* Retry timer should set at least 301 sec. */ @@ -2982,7 +2982,7 @@ void _tdls_handshake_timer_hdl(void *FunctionContext) _adapter *padapter = ptdls_sta->padapter; struct tdls_txmgmt txmgmt; - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); _rtw_memcpy(txmgmt.peer, ptdls_sta->hwaddr, ETH_ALEN); txmgmt.status_code = _RSON_TDLS_TEAR_UN_RSN_; @@ -3001,7 +3001,7 @@ void _tdls_pti_timer_hdl(void *FunctionContext) _adapter *padapter = ptdls_sta->padapter; struct tdls_txmgmt txmgmt; - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); _rtw_memcpy(txmgmt.peer, ptdls_sta->hwaddr, ETH_ALEN); txmgmt.status_code = _RSON_TDLS_TEAR_TOOFAR_; diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c index f3c6dc9..55705db 100644 --- a/core/rtw_wlan_util.c +++ b/core/rtw_wlan_util.c @@ -370,7 +370,7 @@ void get_rate_set(_adapter *padapter, unsigned char *pbssrate, int *bssrate_len) { unsigned char supportedrates[NumRates]; - _rtw_memset(supportedrates, 0, NumRates); + memset(supportedrates, 0, NumRates); *bssrate_len = ratetbl2rateset(padapter, supportedrates); _rtw_memcpy(pbssrate, supportedrates, *bssrate_len); } @@ -851,7 +851,7 @@ void invalidate_cam_all(_adapter *padapter) _enter_critical_bh(&cam_ctl->lock, &irqL); rtw_sec_cam_map_clr_all(&cam_ctl->used); - _rtw_memset(dvobj->cam_cache, 0, sizeof(struct sec_cam_ent) * SEC_CAM_ENT_NUM_SW_LIMIT); + memset(dvobj->cam_cache, 0, sizeof(struct sec_cam_ent) * SEC_CAM_ENT_NUM_SW_LIMIT); _exit_critical_bh(&cam_ctl->lock, &irqL); } @@ -915,7 +915,7 @@ void clear_cam_cache(_adapter *adapter, u8 id) _enter_critical_bh(&cam_ctl->lock, &irqL); - _rtw_memset(&(dvobj->cam_cache[id]), 0, sizeof(struct sec_cam_ent)); + memset(&(dvobj->cam_cache[id]), 0, sizeof(struct sec_cam_ent)); _exit_critical_bh(&cam_ctl->lock, &irqL); } @@ -2166,7 +2166,7 @@ int rtw_get_bcn_keys(ADAPTER *Adapter, u8 *pframe, u32 packet_len, struct rtw_ieee80211_ht_cap *pht_cap = NULL; struct HT_info_element *pht_info = NULL; - _rtw_memset(recv_beacon, 0, sizeof(*recv_beacon)); + memset(recv_beacon, 0, sizeof(*recv_beacon)); /* checking capabilities */ capability = le16_to_cpu(*(__le16 *)(pframe + WLAN_HDR_A3_LEN + 10)); @@ -2674,7 +2674,7 @@ void update_tx_basic_rate(_adapter *padapter, u8 wirelessmode) return; #endif /* CONFIG_INTEL_WIDI */ - _rtw_memset(supported_rates, 0, NDIS_802_11_LENGTH_RATES_EX); + memset(supported_rates, 0, NDIS_802_11_LENGTH_RATES_EX); /* clear B mod if current channel is in 5G band, avoid tx cck rate in 5G band. */ if (pmlmeext->cur_channel > 14) @@ -3666,8 +3666,8 @@ void rtw_wow_pattern_sw_reset(_adapter *adapter) pwrctrlpriv->wowlan_pattern_idx = DEFAULT_PATTERN_NUM; for (i = 0 ; i < MAX_WKFM_CAM_NUM; i++) { - _rtw_memset(pwrctrlpriv->patterns[i].content, '\0', sizeof(pwrctrlpriv->patterns[i].content)); - _rtw_memset(pwrctrlpriv->patterns[i].mask, '\0', sizeof(pwrctrlpriv->patterns[i].mask)); + memset(pwrctrlpriv->patterns[i].content, '\0', sizeof(pwrctrlpriv->patterns[i].content)); + memset(pwrctrlpriv->patterns[i].mask, '\0', sizeof(pwrctrlpriv->patterns[i].mask)); pwrctrlpriv->patterns[i].len = 0; } } @@ -3691,9 +3691,9 @@ u8 rtw_set_default_pattern(_adapter *adapter) return 0; for (index = 0 ; index < DEFAULT_PATTERN_NUM ; index++) { - _rtw_memset(pwrpriv->patterns[index].content, 0, + memset(pwrpriv->patterns[index].content, 0, sizeof(pwrpriv->patterns[index].content)); - _rtw_memset(pwrpriv->patterns[index].mask, 0, + memset(pwrpriv->patterns[index].mask, 0, sizeof(pwrpriv->patterns[index].mask)); pwrpriv->patterns[index].len = 0; } @@ -3767,7 +3767,7 @@ void rtw_dump_priv_pattern(_adapter *adapter, u8 idx) p_str = str_1; max_len = sizeof(str_1); for (i = 0 ; i < MAX_WKFM_PATTERN_SIZE / 8 ; i++) { - _rtw_memset(p_str, 0, max_len); + memset(p_str, 0, max_len); len = 0; for (j = 0 ; j < 8 ; j++) { val8 = pwrctl->patterns[idx].content[i * 8 + j]; @@ -3779,7 +3779,7 @@ void rtw_dump_priv_pattern(_adapter *adapter, u8 idx) RTW_INFO(">>>priv_pattern_mask:\n"); for (i = 0 ; i < MAX_WKFM_SIZE / 8 ; i++) { - _rtw_memset(p_str, 0, max_len); + memset(p_str, 0, max_len); len = 0; for (j = 0 ; j < 8 ; j++) { val8 = pwrctl->patterns[idx].mask[i * 8 + j]; @@ -3807,7 +3807,7 @@ void rtw_get_sec_iv(PADAPTER padapter, u8 *pcur_dot11txpn, u8 *StaAddr) struct sta_info *psta; struct security_priv *psecpriv = &padapter->securitypriv; - _rtw_memset(pcur_dot11txpn, 0, 8); + memset(pcur_dot11txpn, 0, 8); if (NULL == StaAddr) return; psta = rtw_get_stainfo(&padapter->stapriv, StaAddr); diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index be3141e..77dec8a 100644 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -36,7 +36,7 @@ static void _init_txservq(struct tx_servq *ptxservq) void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_xmitpriv) { - _rtw_memset((unsigned char *)psta_xmitpriv, 0, sizeof(struct sta_xmit_priv)); + memset((unsigned char *)psta_xmitpriv, 0, sizeof(struct sta_xmit_priv)); spin_lock_init(&psta_xmitpriv->lock); @@ -60,7 +60,7 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, _adapter *padapter) sint res = _SUCCESS; /* We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */ - /* _rtw_memset((unsigned char *)pxmitpriv, 0, sizeof(struct xmit_priv)); */ + /* memset((unsigned char *)pxmitpriv, 0, sizeof(struct xmit_priv)); */ spin_lock_init(&pxmitpriv->lock); spin_lock_init(&pxmitpriv->lock_sctx); @@ -888,8 +888,8 @@ static s32 update_attrib_sec_info(_adapter *padapter, struct pkt_attrib *pattrib struct security_priv *psecuritypriv = &padapter->securitypriv; sint bmcast = IS_MCAST(pattrib->ra); - _rtw_memset(pattrib->dot118021x_UncstKey.skey, 0, 16); - _rtw_memset(pattrib->dot11tkiptxmickey.skey, 0, 16); + memset(pattrib->dot118021x_UncstKey.skey, 0, 16); + memset(pattrib->dot11tkiptxmickey.skey, 0, 16); pattrib->mac_id = psta->mac_id; if (psta->ieee8021x_blocked == _TRUE) { @@ -1584,7 +1584,7 @@ s32 rtw_make_wlanhdr(_adapter *padapter , u8 *hdr, struct pkt_attrib *pattrib) } */ - _rtw_memset(hdr, 0, WLANHDR_OFFSET); + memset(hdr, 0, WLANHDR_OFFSET); set_frame_sub_type(fctrl, pattrib->subtype); @@ -1846,7 +1846,7 @@ s32 rtw_make_tdls_wlanhdr(_adapter *padapter , u8 *hdr, struct pkt_attrib *pattr sint res = _SUCCESS; u16 *fctrl = &pwlanhdr->frame_ctl; - _rtw_memset(hdr, 0, WLANHDR_OFFSET); + memset(hdr, 0, WLANHDR_OFFSET); set_frame_sub_type(fctrl, pattrib->subtype); @@ -2219,7 +2219,7 @@ s32 rtw_xmitframe_coalesce_amsdu(_adapter *padapter, struct xmit_frame *pxmitfra if(padding == 4) padding = 0; - //_rtw_memset(pframe,0xaa, padding); + //memset(pframe,0xaa, padding); pframe += padding; pattrib->last_txcmdsz += ETH_HLEN + llc_sz + mem_sz + padding ; @@ -2497,7 +2497,7 @@ s32 rtw_mgmt_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame int frame_body_len; u8 mic[16]; - _rtw_memset(MME, 0, _MME_IE_LENGTH_); + memset(MME, 0, _MME_IE_LENGTH_); /* other types doesn't need the BIP */ if (get_frame_sub_type(pframe) != WIFI_DEAUTH && get_frame_sub_type(pframe) != WIFI_DISASSOC) @@ -2795,7 +2795,7 @@ struct xmit_frame *__rtw_alloc_cmdxmitframe(struct xmit_priv *pxmitpriv, pcmdframe->buf_addr = pxmitbuf->pbuf; /* initial memory to zero */ - _rtw_memset(pcmdframe->buf_addr, 0, pxmitbuf->alloc_sz); + memset(pcmdframe->buf_addr, 0, pxmitbuf->alloc_sz); pxmitbuf->priv_data = pcmdframe; @@ -2958,7 +2958,7 @@ static void rtw_init_xmitframe(struct xmit_frame *pxframe) pxframe->buf_addr = NULL; pxframe->pxmitbuf = NULL; - _rtw_memset(&pxframe->attrib, 0, sizeof(struct pkt_attrib)); + memset(&pxframe->attrib, 0, sizeof(struct pkt_attrib)); /* pxframe->attrib.psta = NULL; */ pxframe->frame_tag = DATA_FRAMETAG; @@ -3821,7 +3821,7 @@ s32 rtw_monitor_xmit_entry(struct sk_buff *skb, struct net_device *ndev) pattrib->retry_ctrl = _FALSE; - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; @@ -3862,7 +3862,7 @@ s32 rtw_monitor_xmit_entry(struct sk_buff *skb, struct net_device *ndev) update_mgntframe_attrib(padapter, pattrib); pattrib->retry_ctrl = _FALSE; - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; diff --git a/hal/hal_btcoex.c b/hal/hal_btcoex.c index dc507ff..2a9daf9 100644 --- a/hal/hal_btcoex.c +++ b/hal/hal_btcoex.c @@ -221,7 +221,7 @@ static void DBG_BT_INFO_INIT(PBTCDBGINFO pinfo, u8 *pbuf, u32 size) if (NULL == pinfo) return; - _rtw_memset(pinfo, 0, sizeof(BTCDBGINFO)); + memset(pinfo, 0, sizeof(BTCDBGINFO)); if (pbuf && size) { pinfo->info = pbuf; @@ -2012,7 +2012,7 @@ u8 EXhalbtcoutsrc_InitlizeVariables(void *padapter) _rtw_init_sema(&GLBtcBtMpRptSema, 0); GLBtcBtMpRptSeq = 0; GLBtcBtMpRptStatus = 0; - _rtw_memset(GLBtcBtMpRptRsp, 0, C2H_MAX_SIZE); + memset(GLBtcBtMpRptRsp, 0, C2H_MAX_SIZE); GLBtcBtMpRptRspSize = 0; GLBtcBtMpRptWait = 0; GLBtcBtMpRptWiFiOK = 0; @@ -3232,7 +3232,7 @@ u8 hal_btcoex_Initialize(PADAPTER padapter) HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); u8 ret; - _rtw_memset(&GLBtCoexist, 0, sizeof(GLBtCoexist)); + memset(&GLBtCoexist, 0, sizeof(GLBtCoexist)); hal_btcoex_SetBTCoexist(padapter, rtw_btcoex_get_bt_coexist(padapter)); hal_btcoex_SetChipType(padapter, rtw_btcoex_get_chip_type(padapter)); @@ -3682,7 +3682,7 @@ hal_btcoex_ParseAntIsolationConfigFile( RTW_INFO("Fail to parse parameters , format error!\n"); break; } - _rtw_memset((void *)param_value_string , 0 , 10); + memset((void *)param_value_string , 0 , 10); if (!ParseQualifiedString(szLine , &i , param_value_string , '"' , '"')) { RTW_INFO("Fail to parse parameters\n"); return _FAIL; @@ -3732,7 +3732,7 @@ hal_btcoex_AntIsolationConfig_ParaFile( HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); int rlen = 0 , rtStatus = _FAIL; - _rtw_memset(pHalData->para_file_buf , 0 , MAX_PARA_FILE_BUF_LEN); + memset(pHalData->para_file_buf , 0 , MAX_PARA_FILE_BUF_LEN); rtw_get_phy_file_path(Adapter, pFileName); if (rtw_is_file_readable(rtw_phy_para_file_path) == _TRUE) { diff --git a/hal/hal_btcoex_wifionly.c b/hal/hal_btcoex_wifionly.c index 55b996a..feeb3d5 100644 --- a/hal/hal_btcoex_wifionly.c +++ b/hal/hal_btcoex_wifionly.c @@ -116,7 +116,7 @@ void hal_btcoex_wifionly_initlizevariables(PADAPTER padapter) struct wifi_only_haldata *pwifionly_haldata = &pwifionlycfg->haldata_info; HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); - _rtw_memset(&GLBtCoexistWifiOnly, 0, sizeof(GLBtCoexistWifiOnly)); + memset(&GLBtCoexistWifiOnly, 0, sizeof(GLBtCoexistWifiOnly)); pwifionlycfg->Adapter = padapter; diff --git a/hal/hal_com.c b/hal/hal_com.c index 1fdcd4c..e8d6f5d 100644 --- a/hal/hal_com.c +++ b/hal/hal_com.c @@ -85,7 +85,7 @@ void rtw_hal_read_sta_dk_key(_adapter *adapter, u8 key_id) _irqL irqL; u8 get_key[16]; - _rtw_memset(get_key, 0, sizeof(get_key)); + memset(get_key, 0, sizeof(get_key)); if (key_id > 4) { RTW_INFO("%s [ERROR] gtk_keyindex:%d invalid\n", __func__, key_id); @@ -1200,7 +1200,7 @@ s32 c2h_evt_read_88xx(_adapter *adapter, u8 *buf) goto clear_evt; /* Not a valid value */ } - _rtw_memset(buf, 0, C2H_REG_LEN); + memset(buf, 0, C2H_REG_LEN); /* Read ID, LEN, SEQ */ SET_C2H_ID_88XX(buf, rtw_read8(adapter, REG_C2HEVT_MSG_NORMAL)); @@ -2054,7 +2054,7 @@ void rtw_mbid_cam_init(struct dvobj_priv *dvobj) spin_lock_init(&mbid_cam_ctl->lock); mbid_cam_ctl->bitmap = 0; ATOMIC_SET(&mbid_cam_ctl->mbid_entry_num, 0); - _rtw_memset(&dvobj->mbid_cam_cache, 0, sizeof(dvobj->mbid_cam_cache)); + memset(&dvobj->mbid_cam_cache, 0, sizeof(dvobj->mbid_cam_cache)); } void rtw_mbid_cam_deinit(struct dvobj_priv *dvobj) @@ -2072,7 +2072,7 @@ void rtw_mbid_cam_reset(_adapter *adapter) _enter_critical_bh(&mbid_cam_ctl->lock, &irqL); mbid_cam_ctl->bitmap = 0; - _rtw_memset(&dvobj->mbid_cam_cache, 0, sizeof(dvobj->mbid_cam_cache)); + memset(&dvobj->mbid_cam_cache, 0, sizeof(dvobj->mbid_cam_cache)); _exit_critical_bh(&mbid_cam_ctl->lock, &irqL); ATOMIC_SET(&mbid_cam_ctl->mbid_entry_num, 0); @@ -2178,7 +2178,7 @@ static inline void mbid_cam_cache_init(_adapter *adapter, struct mbid_cam_cache static inline void mbid_cam_cache_clr(struct mbid_cam_cache *pmbid_cam) { if (pmbid_cam) { - _rtw_memset(pmbid_cam->mac_addr, 0, ETH_ALEN); + memset(pmbid_cam->mac_addr, 0, ETH_ALEN); pmbid_cam->iface_id = CONFIG_IFACE_NUMBER; } } @@ -2381,7 +2381,7 @@ int rtw_mbid_cam_dump(void *sel, const char *fun_name, _adapter *adapter) /*_enter_critical_bh(&mbid_cam_ctl->lock, &irqL);*/ for (i = 0; i < TOTAL_MBID_CAM_NUM; i++) { RTW_PRINT_SEL(sel, "CAM_ID = %d\t", i); - _rtw_memset(mac_addr, 0, ETH_ALEN); + memset(mac_addr, 0, ETH_ALEN); read_mbssid_cam(adapter, i, mac_addr); RTW_PRINT_SEL(sel, "MAC Addr:"MAC_FMT"\n", MAC_ARG(mac_addr)); } @@ -2503,7 +2503,7 @@ void rtw_hal_get_macaddr_port(_adapter *adapter, u8 *mac_addr) if (mac_addr == NULL) return; - _rtw_memset(mac_addr, 0, ETH_ALEN); + memset(mac_addr, 0, ETH_ALEN); switch (adapter->hw_port) { case HW_PORT0: default: @@ -3086,7 +3086,7 @@ static void rtw_hal_set_FwAoacRsvdPage_cmd(PADAPTER padapter, PRSVDPAGE_LOC rsvd u1H2CAoacRsvdPageParm); RTW_INFO("AOAC Report=%d\n", rsvdpageloc->LocAOACReport); - _rtw_memset(&u1H2CAoacRsvdPageParm, 0, sizeof(u1H2CAoacRsvdPageParm)); + memset(&u1H2CAoacRsvdPageParm, 0, sizeof(u1H2CAoacRsvdPageParm)); SET_H2CCMD_AOAC_RSVDPAGE_LOC_AOAC_REPORT(u1H2CAoacRsvdPageParm, rsvdpageloc->LocAOACReport); ret = rtw_hal_fill_h2c_cmd(padapter, @@ -3100,7 +3100,7 @@ static void rtw_hal_set_FwAoacRsvdPage_cmd(PADAPTER padapter, PRSVDPAGE_LOC rsvd if (!pwrpriv->wowlan_in_resume) { RTW_INFO("NLO_INFO=%d\n", rsvdpageloc->LocPNOInfo); - _rtw_memset(&u1H2CAoacRsvdPageParm, 0, + memset(&u1H2CAoacRsvdPageParm, 0, sizeof(u1H2CAoacRsvdPageParm)); SET_H2CCMD_AOAC_RSVDPAGE_LOC_NLO_INFO(u1H2CAoacRsvdPageParm, rsvdpageloc->LocPNOInfo); @@ -3450,7 +3450,7 @@ static void rtw_hal_get_aoac_rpt(_adapter *adapter) goto _exit; } - _rtw_memset(paoac_rpt, 0, sizeof(struct aoac_report)); + memset(paoac_rpt, 0, sizeof(struct aoac_report)); _rtw_memcpy(paoac_rpt, buffer, sizeof(struct aoac_report)); for (i = 0 ; i < 4 ; i++) { @@ -3483,7 +3483,7 @@ static void rtw_hal_update_gtk_offload_info(_adapter *adapter) if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) return; - _rtw_memset(get_key, 0, sizeof(get_key)); + memset(get_key, 0, sizeof(get_key)); _rtw_memcpy(&replay_count, paoac_rpt->replay_counter_eapol_key, 8); @@ -3535,7 +3535,7 @@ static void rtw_hal_update_gtk_offload_info(_adapter *adapter) if (psecuritypriv->dot118021XGrpPrivacy == _AES_) { sz = sizeof(psecuritypriv->iv_seq[0]); for (i = 0 ; i < 4 ; i++) - _rtw_memset(psecuritypriv->iv_seq[i], 0, sz); + memset(psecuritypriv->iv_seq[i], 0, sz); } RTW_PRINT("GTK (%d) "KEY_FMT"\n", gtk_id, @@ -4032,7 +4032,7 @@ static void rtw_hal_set_ap_rsvdpage_loc_cmd(PADAPTER padapter, rtw_msleep_os(10); - _rtw_memset(&rsvdparm, 0, sizeof(rsvdparm)); + memset(&rsvdparm, 0, sizeof(rsvdparm)); SET_H2CCMD_AP_WOWLAN_RSVDPAGE_LOC_ProbeRsp(rsvdparm, rsvdpageloc->LocProbeRsp + header); @@ -4182,7 +4182,7 @@ static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode) break; } case 2: - _rtw_memset(&ssid_ie[2], 0, ssid_len_ori); + memset(&ssid_ie[2], 0, ssid_len_ori); break; default: break; @@ -4492,7 +4492,7 @@ static void rtw_hal_construct_P2PProbeRsp(_adapter *padapter, u8 *pframe, u32 *p *(fctrl) = 0; /* DA filled by FW */ - _rtw_memset(pwlanhdr->addr1, 0, ETH_ALEN); + memset(pwlanhdr->addr1, 0, ETH_ALEN); _rtw_memcpy(pwlanhdr->addr2, mac, ETH_ALEN); /* Use the device address for BSSID field. */ @@ -4640,7 +4640,7 @@ static void rtw_hal_construct_P2PProbeRsp(_adapter *padapter, u8 *pframe, u32 *p /* Value: */ if (pwdinfo->external_uuid == 0) { - _rtw_memset(wpsie + wpsielen, 0x0, 16); + memset(wpsie + wpsielen, 0x0, 16); _rtw_memcpy(wpsie + wpsielen, mac, ETH_ALEN); } else _rtw_memcpy(wpsie + wpsielen, pwdinfo->uuid, 0x10); @@ -4805,7 +4805,7 @@ static void rtw_hal_construct_P2PNegoRsp(_adapter *padapter, u8 *pframe, u32 *pL *(fctrl) = 0; /* RA, filled by FW */ - _rtw_memset(pwlanhdr->addr1, 0, ETH_ALEN); + memset(pwlanhdr->addr1, 0, ETH_ALEN); _rtw_memcpy(pwlanhdr->addr2, adapter_mac_addr(padapter), ETH_ALEN); _rtw_memcpy(pwlanhdr->addr3, adapter_mac_addr(padapter), ETH_ALEN); @@ -4823,7 +4823,7 @@ static void rtw_hal_construct_P2PNegoRsp(_adapter *padapter, u8 *pframe, u32 *pL /* dialog token, filled by FW */ pframe = rtw_set_fixed_ie(pframe, 1, &(dialogToken), &(pktlen)); - _rtw_memset(wpsie, 0x00, 255); + memset(wpsie, 0x00, 255); wpsielen = 0; /* WPS Section */ @@ -5207,11 +5207,11 @@ static void rtw_hal_construct_P2PInviteRsp(_adapter *padapter, u8 *pframe, u32 * *(fctrl) = 0; /* RA fill by FW */ - _rtw_memset(pwlanhdr->addr1, 0, ETH_ALEN); + memset(pwlanhdr->addr1, 0, ETH_ALEN); _rtw_memcpy(pwlanhdr->addr2, adapter_mac_addr(padapter), ETH_ALEN); /* BSSID fill by FW */ - _rtw_memset(pwlanhdr->addr3, 0, ETH_ALEN); + memset(pwlanhdr->addr3, 0, ETH_ALEN); SetSeqNum(pwlanhdr, 0); set_frame_sub_type(pframe, WIFI_ACTION); @@ -5315,7 +5315,7 @@ static void rtw_hal_construct_P2PProvisionDisRsp(_adapter *padapter, u8 *pframe, *(fctrl) = 0; /* RA filled by FW */ - _rtw_memset(pwlanhdr->addr1, 0, ETH_ALEN); + memset(pwlanhdr->addr1, 0, ETH_ALEN); _rtw_memcpy(pwlanhdr->addr2, adapter_mac_addr(padapter), ETH_ALEN); _rtw_memcpy(pwlanhdr->addr3, adapter_mac_addr(padapter), ETH_ALEN); @@ -5400,7 +5400,7 @@ u8 rtw_hal_set_p2p_wowlan_offload_cmd(_adapter *adapter) struct hal_ops *pHalFunc = &adapter->hal_func; u8 ret = _FAIL; - _rtw_memset(p2p_wowlan_offload, 0 , sizeof(struct P2P_WoWlan_Offload_t)); + memset(p2p_wowlan_offload, 0 , sizeof(struct P2P_WoWlan_Offload_t)); RTW_INFO("%s\n", __func__); switch (pwdinfo->role) { case P2P_ROLE_DEVICE: @@ -5798,7 +5798,7 @@ static void rtw_hal_construct_ARPRsp( } if (EncryptionHeadOverhead > 0) { - _rtw_memset(&(pframe[*pLength]), 0, EncryptionHeadOverhead); + memset(&(pframe[*pLength]), 0, EncryptionHeadOverhead); *pLength += EncryptionHeadOverhead; /* SET_80211_HDR_WEP(pARPRspPkt, 1); */ /* Suggested by CCW. */ SetPrivacy(fctrl); @@ -6101,7 +6101,7 @@ static void rtw_hal_construct_GTKRsp( } if (EncryptionHeadOverhead > 0) { - _rtw_memset(&(pframe[*pLength]), 0, EncryptionHeadOverhead); + memset(&(pframe[*pLength]), 0, EncryptionHeadOverhead); *pLength += EncryptionHeadOverhead; /* SET_80211_HDR_WEP(pGTKRspPkt, 1); */ /* Suggested by CCW. */ /* GTK's privacy bit is done by FW */ @@ -6128,7 +6128,7 @@ static void rtw_hal_construct_GTKRsp( *pLength += 11; pGTKRspPkt += 11; /* GTK frame body after LLC, part 2 */ - _rtw_memset(&(pframe[*pLength]), 0, 88); + memset(&(pframe[*pLength]), 0, 88); *pLength += 88; pGTKRspPkt += 88; @@ -6209,8 +6209,8 @@ void rtw_hal_set_wow_fw_rsvd_page(_adapter *adapter, u8 *pframe, u16 index, /* if the ap staion info. exists, get the kek, kck from staion info. */ psta = rtw_get_stainfo(pstapriv, get_bssid(pmlmepriv)); if (psta == NULL) { - _rtw_memset(kek, 0, RTW_KEK_LEN); - _rtw_memset(kck, 0, RTW_KCK_LEN); + memset(kek, 0, RTW_KEK_LEN); + memset(kck, 0, RTW_KCK_LEN); RTW_INFO("%s, KEK, KCK download rsvd page all zero\n", __func__); } else { @@ -6440,7 +6440,7 @@ static u8 rtw_hal_wow_pattern_generate(_adapter *adapter, u8 idx, struct rtl_wow mask = pwrctl->patterns[idx].mask; _rtw_memcpy(mac_addr, adapter_mac_addr(adapter), ETH_ALEN); - _rtw_memset(pwow_pattern, 0, sizeof(struct rtl_wow_pattern)); + memset(pwow_pattern, 0, sizeof(struct rtl_wow_pattern)); mask_len = DIV_ROUND_UP(len, 8); @@ -6748,7 +6748,7 @@ void rtw_clean_pattern(_adapter *adapter) struct rtl_wow_pattern zero_pattern; int i = 0; - _rtw_memset(&zero_pattern, 0, sizeof(struct rtl_wow_pattern)); + memset(&zero_pattern, 0, sizeof(struct rtl_wow_pattern)); zero_pattern.type = PATTERN_INVALID; @@ -6783,7 +6783,7 @@ static int rtw_hal_set_pattern(_adapter *adapter, u8 *pattern, pmlmeext = &adapter->mlmeextpriv; pmlmeinfo = &pmlmeext->mlmext_info; _rtw_memcpy(mac_addr, adapter_mac_addr(adapter), ETH_ALEN); - _rtw_memset(&wow_pattern, 0, sizeof(struct rtl_wow_pattern)); + memset(&wow_pattern, 0, sizeof(struct rtl_wow_pattern)); mask_len = DIV_ROUND_UP(len, 8); @@ -6952,7 +6952,7 @@ void rtw_wow_pattern_read_cam_ent(_adapter *adapter, u8 id, struct rtl_wow_patt int i; u32 rdata; - _rtw_memset(context, 0, sizeof(struct rtl_wow_pattern)); + memset(context, 0, sizeof(struct rtl_wow_pattern)); for (i = 4; i >= 0; i--) { rdata = _rtw_wow_pattern_read_cam(adapter, (id << 3) | i); @@ -7773,7 +7773,7 @@ void rtw_hal_set_fw_rsvd_page(_adapter *adapter, bool finished) } ReservedPagePacket = pcmdframe->buf_addr; - _rtw_memset(&RsvdPageLoc, 0, sizeof(RSVDPAGE_LOC)); + memset(&RsvdPageLoc, 0, sizeof(RSVDPAGE_LOC)); /* beacon * 2 pages */ BufIndex = TxDescOffset; @@ -9333,7 +9333,7 @@ bypass_hw_pg: } #endif - _rtw_memset(hal_data->EEPROMMACAddr, 0, ETH_ALEN); + memset(hal_data->EEPROMMACAddr, 0, ETH_ALEN); ret = _FAIL; exit: @@ -9985,7 +9985,7 @@ void rtw_dump_rx_counters(_adapter *padapter) struct dbg_rx_counter rx_counter; if (padapter->dump_rx_cnt_mode & DUMP_DRV_RX_COUNTER) { - _rtw_memset(&rx_counter, 0, sizeof(struct dbg_rx_counter)); + memset(&rx_counter, 0, sizeof(struct dbg_rx_counter)); rtw_dump_drv_rx_counters(padapter, &rx_counter); RTW_INFO("Drv Received packet OK:%d CRC error:%d Drop Packets: %d\n", rx_counter.rx_pkt_ok, rx_counter.rx_pkt_crc_error, rx_counter.rx_pkt_drop); @@ -9993,7 +9993,7 @@ void rtw_dump_rx_counters(_adapter *padapter) } if (padapter->dump_rx_cnt_mode & DUMP_MAC_RX_COUNTER) { - _rtw_memset(&rx_counter, 0, sizeof(struct dbg_rx_counter)); + memset(&rx_counter, 0, sizeof(struct dbg_rx_counter)); rtw_dump_mac_rx_counters(padapter, &rx_counter); RTW_INFO("Mac Received packet OK:%d CRC error:%d FA Counter: %d Drop Packets: %d\n", rx_counter.rx_pkt_ok, rx_counter.rx_pkt_crc_error, @@ -10003,7 +10003,7 @@ void rtw_dump_rx_counters(_adapter *padapter) } if (padapter->dump_rx_cnt_mode & DUMP_PHY_RX_COUNTER) { - _rtw_memset(&rx_counter, 0, sizeof(struct dbg_rx_counter)); + memset(&rx_counter, 0, sizeof(struct dbg_rx_counter)); rtw_dump_phy_rx_counters(padapter, &rx_counter); /* RTW_INFO("%s: OFDM_FA =%d\n", __func__, rx_counter.rx_ofdm_fa); */ /* RTW_INFO("%s: CCK_FA =%d\n", __func__, rx_counter.rx_cck_fa); */ diff --git a/hal/hal_com_phycfg.c b/hal/hal_com_phycfg.c index 029433d..cb37ad7 100644 --- a/hal/hal_com_phycfg.c +++ b/hal/hal_com_phycfg.c @@ -337,7 +337,7 @@ static inline void hal_init_pg_txpwr_info_2g(_adapter *adapter, TxPowerInfo24G * if (pwr_info == NULL) return; - _rtw_memset(pwr_info, 0, sizeof(TxPowerInfo24G)); + memset(pwr_info, 0, sizeof(TxPowerInfo24G)); /* init with invalid value */ for (path = 0; path < MAX_RF_PATH; path++) { @@ -375,7 +375,7 @@ static inline void hal_init_pg_txpwr_info_5g(_adapter *adapter, TxPowerInfo5G *p if (pwr_info == NULL) return; - _rtw_memset(pwr_info, 0, sizeof(TxPowerInfo5G)); + memset(pwr_info, 0, sizeof(TxPowerInfo5G)); /* init with invalid value */ for (path = 0; path < MAX_RF_PATH; path++) { @@ -3957,7 +3957,7 @@ phy_ConfigMACWithParaFile( if (!(Adapter->registrypriv.load_phy_file & LOAD_MAC_PARA_FILE)) return rtStatus; - _rtw_memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); + memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); if ((pHalData->mac_reg_len == 0) && (pHalData->mac_reg == NULL)) { rtw_get_phy_file_path(Adapter, pFileName); @@ -4036,7 +4036,7 @@ phy_ConfigBBWithParaFile( break; } - _rtw_memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); + memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL)) { rtw_get_phy_file_path(Adapter, pFileName); @@ -4414,7 +4414,7 @@ phy_ConfigBBWithPgParaFile( if (!(Adapter->registrypriv.load_phy_file & LOAD_BB_PG_PARA_FILE)) return rtStatus; - _rtw_memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); + memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); if (pHalData->bb_phy_reg_pg == NULL) { rtw_get_phy_file_path(Adapter, pFileName); @@ -4463,7 +4463,7 @@ phy_ConfigBBWithMpParaFile( if (!(Adapter->registrypriv.load_phy_file & LOAD_BB_MP_PARA_FILE)) return rtStatus; - _rtw_memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); + memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); if ((pHalData->bb_phy_reg_mp_len == 0) && (pHalData->bb_phy_reg_mp == NULL)) { rtw_get_phy_file_path(Adapter, pFileName); @@ -4567,7 +4567,7 @@ PHY_ConfigRFWithParaFile( break; } - _rtw_memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); + memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); if ((pBufLen != NULL) && (*pBufLen == 0) && (pBuf == NULL)) { rtw_get_phy_file_path(Adapter, pFileName); @@ -4762,7 +4762,7 @@ PHY_ConfigRFWithTxPwrTrackParaFile( if (!(Adapter->registrypriv.load_phy_file & LOAD_RF_TXPWR_TRACK_PARA_FILE)) return rtStatus; - _rtw_memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); + memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); if ((pHalData->rf_tx_pwr_track_len == 0) && (pHalData->rf_tx_pwr_track == NULL)) { rtw_get_phy_file_path(Adapter, pFileName); @@ -4855,12 +4855,12 @@ static int phy_ParsePowerLimitTableFile( if (loadingStage == 0) { for (forCnt = 0; forCnt < TXPWR_LMT_MAX_REGULATION_NUM; ++forCnt) - _rtw_memset((void *) regulation[forCnt], 0, 10); - _rtw_memset((void *) band, 0, 10); - _rtw_memset((void *) bandwidth, 0, 10); - _rtw_memset((void *) rateSection, 0, 10); - _rtw_memset((void *) rfPath, 0, 10); - _rtw_memset((void *) colNumBuf, 0, 10); + memset((void *) regulation[forCnt], 0, 10); + memset((void *) band, 0, 10); + memset((void *) bandwidth, 0, 10); + memset((void *) rateSection, 0, 10); + memset((void *) rfPath, 0, 10); + memset((void *) colNumBuf, 0, 10); if (szLine[0] != '#' || szLine[1] != '#') continue; @@ -4991,7 +4991,7 @@ static int phy_ParsePowerLimitTableFile( /* load the power limit value */ cnt = 0; fraction = 0; - _rtw_memset((void *) powerLimit, 0, 10); + memset((void *) powerLimit, 0, 10); while ((szLine[i] >= '0' && szLine[i] <= '9') || szLine[i] == '.') { if (szLine[i] == '.') { if ((szLine[i + 1] >= '0' && szLine[i + 1] <= '9')) { @@ -5079,7 +5079,7 @@ PHY_ConfigRFWithPowerLimitTableParaFile( if (!(Adapter->registrypriv.load_phy_file & LOAD_RF_TXPWR_LMT_PARA_FILE)) return rtStatus; - _rtw_memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); + memset(pHalData->para_file_buf, 0, MAX_PARA_FILE_BUF_LEN); if (pHalData->rf_tx_pwr_lmt == NULL) { rtw_get_phy_file_path(Adapter, pFileName); diff --git a/hal/hal_dm.c b/hal/hal_dm.c index 6f136ea..2e0bb2d 100644 --- a/hal/hal_dm.c +++ b/hal/hal_dm.c @@ -60,7 +60,7 @@ void Init_ODM_ComInfo(_adapter *adapter) struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(adapter); int i; - _rtw_memset(pDM_Odm, 0, sizeof(*pDM_Odm)); + memset(pDM_Odm, 0, sizeof(*pDM_Odm)); pDM_Odm->adapter = adapter; diff --git a/hal/hal_intf.c b/hal/hal_intf.c index 3f29b6a..ca2dad7 100644 --- a/hal/hal_intf.c +++ b/hal/hal_intf.c @@ -174,7 +174,7 @@ void rtw_hal_power_off(_adapter *padapter) { struct macid_ctl_t *macid_ctl = &padapter->dvobj->macid_ctl; - _rtw_memset(macid_ctl->h2c_msr, 0, MACID_NUM_SW_LIMIT); + memset(macid_ctl->h2c_msr, 0, MACID_NUM_SW_LIMIT); padapter->hal_func.hal_power_off(padapter); } @@ -430,7 +430,7 @@ void rtw_update_ramask(_adapter *padapter, struct sta_info *psta, u32 mac_id, u8 rtw_warn_on(1); return; } - _rtw_memset(&h2c_macid_cfg, 0, sizeof(struct macid_cfg)); + memset(&h2c_macid_cfg, 0, sizeof(struct macid_cfg)); bw = rtw_get_tx_bw_mode(padapter, psta); short_gi = query_ra_short_GI(psta, bw); diff --git a/hal/hal_mcc.c b/hal/hal_mcc.c index 6d1a217..ee3917b 100644 --- a/hal/hal_mcc.c +++ b/hal/hal_mcc.c @@ -711,7 +711,7 @@ static void rtw_hal_set_mcc_IQK_offload_cmd(PADAPTER padapter) for (rf_path_idx = 0; rf_path_idx < total_rf_path; rf_path_idx ++) { - _rtw_memset(cmd, 0, H2C_MCC_IQK_PARAM_LEN); + memset(cmd, 0, H2C_MCC_IQK_PARAM_LEN); TX_X = pmccadapriv->mcc_iqk_arr[rf_path_idx].TX_X & 0x7ff;/* [10:0] */ TX_Y = pmccadapriv->mcc_iqk_arr[rf_path_idx].TX_Y & 0x7ff;/* [10:0] */ RX_X = pmccadapriv->mcc_iqk_arr[rf_path_idx].RX_X & 0x3ff;/* [9:0] */ diff --git a/hal/hal_usb.c b/hal/hal_usb.c index 43a8170..bfc11c4 100644 --- a/hal/hal_usb.c +++ b/hal/hal_usb.c @@ -437,7 +437,7 @@ int usb_writeN(struct intf_hdl *pintfhdl, u32 addr, u32 length, u8 *pdata) void usb_set_intf_ops(_adapter *padapter, struct _io_ops *pops) { - _rtw_memset((u8 *)pops, 0, sizeof(struct _io_ops)); + memset((u8 *)pops, 0, sizeof(struct _io_ops)); pops->_read8 = &usb_read8; pops->_read16 = &usb_read16; diff --git a/hal/phydm/phydm_interface.c b/hal/phydm/phydm_interface.c index 4150100..8ba51c1 100644 --- a/hal/phydm/phydm_interface.c +++ b/hal/phydm/phydm_interface.c @@ -206,7 +206,7 @@ void odm_memory_set( u32 length ) { - _rtw_memset(pbuf, value, length); + memset(pbuf, value, length); } s32 odm_compare_memory( diff --git a/hal/rtl8188e_cmd.c b/hal/rtl8188e_cmd.c index b91b1d7..700bbf5 100644 --- a/hal/rtl8188e_cmd.c +++ b/hal/rtl8188e_cmd.c @@ -692,7 +692,7 @@ void rtl8188e_set_p2p_ps_offload_cmd(_adapter *padapter, u8 p2p_ps_state) switch (p2p_ps_state) { case P2P_PS_DISABLE: RTW_INFO("P2P_PS_DISABLE\n"); - _rtw_memset(p2p_ps_offload, 0 , 1); + memset(p2p_ps_offload, 0 , 1); break; case P2P_PS_ENABLE: RTW_INFO("P2P_PS_ENABLE\n"); diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c index 652d30a..77a92d2 100644 --- a/hal/rtl8188e_hal_init.c +++ b/hal/rtl8188e_hal_init.c @@ -364,7 +364,7 @@ static s32 iol_read_efuse( rtw_write8(padapter, REG_TDECTRL + 1, txpktbuf_bndy); - _rtw_memset(physical_map, 0xFF, 512); + memset(physical_map, 0xFF, 512); rtw_write8(padapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT); @@ -1065,7 +1065,7 @@ static bool efuse_read_phymap( /* */ /* Refresh efuse init map as all 0xFF. */ /* */ - _rtw_memset(pbuf, 0xFF, limit); + memset(pbuf, 0xFF, limit); /* */ @@ -1530,7 +1530,7 @@ Hal_EfuseWordEnableDataWrite(PADAPTER pAdapter, 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; @@ -1729,8 +1729,8 @@ hal_EfusePgPacketRead_8188e( 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); /* */ @@ -1856,7 +1856,7 @@ hal_EfuseFixHeaderProcess( 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, bPseudoTest)) { /* check if data exist */ @@ -2243,7 +2243,7 @@ hal_EfuseConstructPGPkt( ) { - _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); diff --git a/hal/rtl8188e_rxdesc.c b/hal/rtl8188e_rxdesc.c index b0034f9..f19f236 100644 --- a/hal/rtl8188e_rxdesc.c +++ b/hal/rtl8188e_rxdesc.c @@ -43,7 +43,7 @@ void rtl8188e_query_rx_desc_status( prxreport = (PRXREPORT)&report; pattrib = &precvframe->u.hdr.attrib; - _rtw_memset(pattrib, 0, sizeof(struct rx_pkt_attrib)); + memset(pattrib, 0, sizeof(struct rx_pkt_attrib)); pattrib->crc_err = (u8)((le32_to_cpu(report.rxdw0) >> 14) & 0x1);;/* (u8)prxreport->crc32; */ diff --git a/hal/rtl8188e_xmit.c b/hal/rtl8188e_xmit.c index e8989ac..9e2e51c 100644 --- a/hal/rtl8188e_xmit.c +++ b/hal/rtl8188e_xmit.c @@ -132,7 +132,7 @@ InsertEMContent_8188E( u4Byte dwtmp = 0; #endif - _rtw_memset(VirtualAddress, 0, EARLY_MODE_INFO_SIZE); + memset(VirtualAddress, 0, EARLY_MODE_INFO_SIZE); if (pEMInfo->EMPktNum == 0) return; @@ -238,7 +238,7 @@ void UpdateEarlyModeInfo8188E(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmi offset = pxmitpriv->agg_pkt[index].offset; pktlen = pxmitpriv->agg_pkt[index].pkt_len; - _rtw_memset(&eminfo, 0, sizeof(struct EMInfo)); + memset(&eminfo, 0, sizeof(struct EMInfo)); if (pframe->agg_num > EARLY_MODE_MAX_PKT_NUM) { if (node_num_0 > EARLY_MODE_MAX_PKT_NUM) { eminfo.EMPktNum = EARLY_MODE_MAX_PKT_NUM; @@ -271,7 +271,7 @@ void UpdateEarlyModeInfo8188E(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmi } - _rtw_memset(pxmitpriv->agg_pkt, 0, sizeof(struct agg_pkt_info) * MAX_AGG_PKT_NUM); + memset(pxmitpriv->agg_pkt, 0, sizeof(struct agg_pkt_info) * MAX_AGG_PKT_NUM); } #endif diff --git a/hal/rtl8188eu_xmit.c b/hal/rtl8188eu_xmit.c index 6c65c5f..afdaae0 100644 --- a/hal/rtl8188eu_xmit.c +++ b/hal/rtl8188eu_xmit.c @@ -85,7 +85,7 @@ void rtl8188e_fill_fake_txdesc( /* Clear all status */ ptxdesc = (struct tx_desc *)pDesc; - _rtw_memset(pDesc, 0, TXDESC_SIZE); + memset(pDesc, 0, TXDESC_SIZE); /* offset 0 */ ptxdesc->txdw0 |= cpu_to_le32(OWN | FSG | LSG); /* own, bFirstSeg, bLastSeg; */ @@ -263,7 +263,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz , u8 ba } #endif /* CONFIG_USE_USB_BUFFER_ALLOC_TX */ - _rtw_memset(ptxdesc, 0, sizeof(struct tx_desc)); + memset(ptxdesc, 0, sizeof(struct tx_desc)); /* 4 offset 0 */ ptxdesc->txdw0 |= cpu_to_le32(OWN | FSG | LSG); @@ -1205,7 +1205,7 @@ s32 rtl8188eu_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt) /* ----- fill tx desc ----- */ ptxdesc = (struct tx_desc *)pxmitbuf; - _rtw_memset(ptxdesc, 0, sizeof(*ptxdesc)); + memset(ptxdesc, 0, sizeof(*ptxdesc)); /* offset 0 */ ptxdesc->txdw0 |= cpu_to_le32(len & 0x0000ffff); diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index 3181529..93656e6 100644 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -2071,9 +2071,9 @@ static void rtl8188eu_init_default_value(_adapter *padapter) pHalData->EfuseHal.fakeEfuseBank = 0; pHalData->EfuseHal.fakeEfuseUsedBytes = 0; - _rtw_memset(pHalData->EfuseHal.fakeEfuseContent, 0xFF, EFUSE_MAX_HW_SIZE); - _rtw_memset(pHalData->EfuseHal.fakeEfuseInitMap, 0xFF, EFUSE_MAX_MAP_LEN); - _rtw_memset(pHalData->EfuseHal.fakeEfuseModifiedMap, 0xFF, EFUSE_MAX_MAP_LEN); + memset(pHalData->EfuseHal.fakeEfuseContent, 0xFF, EFUSE_MAX_HW_SIZE); + memset(pHalData->EfuseHal.fakeEfuseInitMap, 0xFF, EFUSE_MAX_MAP_LEN); + memset(pHalData->EfuseHal.fakeEfuseModifiedMap, 0xFF, EFUSE_MAX_MAP_LEN); } static u8 rtl8188eu_ps_func(PADAPTER Adapter, HAL_INTF_PS_FUNC efunc_id, u8 *val) diff --git a/include/osdep_service.h b/include/osdep_service.h index 93399ac..d595a76 100644 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -266,7 +266,6 @@ extern void rtw_mfree2d(void *pbuf, int h, int w, int size); extern void _rtw_memcpy(void *dec, const void *sour, u32 sz); extern void _rtw_memmove(void *dst, const void *src, u32 sz); extern int _rtw_memcmp(const void *dst, const void *src, u32 sz); -extern void _rtw_memset(void *pbuf, int c, u32 sz); extern void _rtw_init_listhead(_list *list); extern u32 rtw_is_list_empty(_list *phead); diff --git a/os_dep/ioctl_cfg80211.c b/os_dep/ioctl_cfg80211.c index 7ba550c..46b1a32 100644 --- a/os_dep/ioctl_cfg80211.c +++ b/os_dep/ioctl_cfg80211.c @@ -1393,10 +1393,10 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev, if (param == NULL) return -1; - _rtw_memset(param, 0, param_len); + memset(param, 0, param_len); param->cmd = IEEE_CMD_SET_ENCRYPTION; - _rtw_memset(param->sta_addr, 0xff, ETH_ALEN); + memset(param->sta_addr, 0xff, ETH_ALEN); switch (params->cipher) { case IW_AUTH_CIPHER_NONE: @@ -2380,7 +2380,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy #endif /* CONFIG_P2P */ - _rtw_memset(ssid, 0, sizeof(NDIS_802_11_SSID) * RTW_SSID_SCAN_AMOUNT); + memset(ssid, 0, sizeof(NDIS_802_11_SSID) * RTW_SSID_SCAN_AMOUNT); /* parsing request ssids, n_ssids */ for (i = 0; i < request->n_ssids && i < RTW_SSID_SCAN_AMOUNT; i++) { #ifdef CONFIG_DEBUG_CFG80211 @@ -2391,7 +2391,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy } /* parsing channels, n_channels */ - _rtw_memset(ch, 0, sizeof(struct rtw_ieee80211_channel) * RTW_CHANNEL_SCAN_AMOUNT); + memset(ch, 0, sizeof(struct rtw_ieee80211_channel) * RTW_CHANNEL_SCAN_AMOUNT); for (i = 0; i < request->n_channels && i < RTW_CHANNEL_SCAN_AMOUNT; i++) { #ifdef CONFIG_DEBUG_CFG80211 RTW_INFO(FUNC_ADPT_FMT CHAN_FMT"\n", FUNC_ADPT_ARG(padapter), CHAN_ARG(request->channels[i])); @@ -2871,7 +2871,7 @@ static int cfg80211_rtw_join_ibss(struct wiphy *wiphy, struct net_device *ndev, #endif /*CONFIG_CONCURRENT_MODE*/ - _rtw_memset(&ndis_ssid, 0, sizeof(NDIS_802_11_SSID)); + memset(&ndis_ssid, 0, sizeof(NDIS_802_11_SSID)); ndis_ssid.SsidLength = params->ssid_len; _rtw_memcpy(ndis_ssid.Ssid, (u8 *)params->ssid, params->ssid_len); @@ -3024,7 +3024,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, rtw_mi_scan_abort(padapter, _TRUE); - _rtw_memset(&ndis_ssid, 0, sizeof(NDIS_802_11_SSID)); + memset(&ndis_ssid, 0, sizeof(NDIS_802_11_SSID)); ndis_ssid.SsidLength = sme->ssid_len; _rtw_memcpy(ndis_ssid.Ssid, (u8 *)sme->ssid, sme->ssid_len); @@ -3104,7 +3104,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, goto cancel_ps_deny; } - _rtw_memset(pwep, 0, wep_total_len); + memset(pwep, 0, wep_total_len); pwep->KeyLength = wep_key_len; pwep->Length = wep_total_len; @@ -3339,8 +3339,8 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy, for (index = 0 ; index < NUM_PMKID_CACHE; index++) { if (_rtw_memcmp(psecuritypriv->PMKIDList[index].Bssid, (u8 *)pmksa->bssid, ETH_ALEN) == _TRUE) { /* BSSID is matched, the same AP => Remove this PMKID information and reset it. */ - _rtw_memset(psecuritypriv->PMKIDList[index].Bssid, 0x00, ETH_ALEN); - _rtw_memset(psecuritypriv->PMKIDList[index].PMKID, 0x00, WLAN_PMKID_LEN); + memset(psecuritypriv->PMKIDList[index].Bssid, 0x00, ETH_ALEN); + memset(psecuritypriv->PMKIDList[index].PMKID, 0x00, WLAN_PMKID_LEN); psecuritypriv->PMKIDList[index].bUsed = _FALSE; bMatched = _TRUE; RTW_INFO(FUNC_NDEV_FMT" clear id:%hhu\n", FUNC_NDEV_ARG(ndev), index); @@ -3365,7 +3365,7 @@ static int cfg80211_rtw_flush_pmksa(struct wiphy *wiphy, RTW_INFO(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); - _rtw_memset(&psecuritypriv->PMKIDList[0], 0x00, sizeof(RT_PMKID_LIST) * NUM_PMKID_CACHE); + memset(&psecuritypriv->PMKIDList[0], 0x00, sizeof(RT_PMKID_LIST) * NUM_PMKID_CACHE); psecuritypriv->PMKIDIndex = 0; return 0; @@ -3608,7 +3608,7 @@ dump: update_mgntframe_attrib(padapter, pattrib); pattrib->retry_ctrl = _FALSE; - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; @@ -4731,8 +4731,8 @@ void rtw_cfg80211_issue_p2p_provision_request(_adapter *padapter, const u8 *buf, } /* start to build provision_request frame */ - _rtw_memset(wpsie, 0, sizeof(wpsie)); - _rtw_memset(p2p_ie, 0, sizeof(p2p_ie)); + memset(wpsie, 0, sizeof(wpsie)); + memset(p2p_ie, 0, sizeof(p2p_ie)); p2p_ielen = 0; pmgntframe = alloc_mgtxmitframe(pxmitpriv); @@ -4743,7 +4743,7 @@ void rtw_cfg80211_issue_p2p_provision_request(_adapter *padapter, const u8 *buf, pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -5482,7 +5482,7 @@ issue_mgmt_frame: pattrib->retry_ctrl = _FALSE; - _rtw_memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); + memset(pmgntframe->buf_addr, 0, WLANHDR_OFFSET + TXDESC_OFFSET); pframe = (u8 *)(pmgntframe->buf_addr) + TXDESC_OFFSET; @@ -5844,7 +5844,7 @@ static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy, goto discard; } - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); _rtw_memcpy(txmgmt.peer, peer, ETH_ALEN); txmgmt.action_code = action_code; txmgmt.dialog_token = dialog_token; @@ -5923,7 +5923,7 @@ static int cfg80211_rtw_tdls_oper(struct wiphy *wiphy, rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_LEAVE, 1); #endif /* CONFIG_LPS */ - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); if (peer) _rtw_memcpy(txmgmt.peer, peer, ETH_ALEN); diff --git a/os_dep/ioctl_cfg80211.h b/os_dep/ioctl_cfg80211.h index aa4750a..c8fc0d1 100644 --- a/os_dep/ioctl_cfg80211.h +++ b/os_dep/ioctl_cfg80211.h @@ -78,8 +78,8 @@ struct rtw_wdev_invit_info { #define rtw_wdev_invit_info_init(invit_info) \ do { \ (invit_info)->state = 0xff; \ - _rtw_memset((invit_info)->peer_mac, 0, ETH_ALEN); \ - _rtw_memset((invit_info)->group_bssid, 0, ETH_ALEN); \ + memset((invit_info)->peer_mac, 0, ETH_ALEN); \ + memset((invit_info)->group_bssid, 0, ETH_ALEN); \ (invit_info)->active = 0xff; \ (invit_info)->token = 0; \ (invit_info)->flags = 0x00; \ @@ -107,9 +107,9 @@ struct rtw_wdev_nego_info { #define rtw_wdev_nego_info_init(nego_info) \ do { \ (nego_info)->state = 0xff; \ - _rtw_memset((nego_info)->iface_addr, 0, ETH_ALEN); \ - _rtw_memset((nego_info)->peer_mac, 0, ETH_ALEN); \ - _rtw_memset((nego_info)->peer_iface_addr, 0, ETH_ALEN); \ + memset((nego_info)->iface_addr, 0, ETH_ALEN); \ + memset((nego_info)->peer_mac, 0, ETH_ALEN); \ + memset((nego_info)->peer_iface_addr, 0, ETH_ALEN); \ (nego_info)->active = 0xff; \ (nego_info)->token = 0; \ (nego_info)->status = 0xff; \ diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index 4a1a700..adda8b1 100644 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -133,7 +133,7 @@ static void indicate_wx_custom_event(_adapter *padapter, char *msg) _rtw_memcpy(buff, msg, strlen(msg)); - _rtw_memset(&wrqu, 0, sizeof(wrqu)); + memset(&wrqu, 0, sizeof(wrqu)); wrqu.data.length = strlen(msg); RTW_INFO("%s %s\n", __func__, buff); @@ -156,13 +156,13 @@ static void request_wps_pbc_event(_adapter *padapter) if (!buff) return; - _rtw_memset(buff, 0, IW_CUSTOM_MAX); + memset(buff, 0, IW_CUSTOM_MAX); p = buff; p += sprintf(p, "WPS_PBC_START.request=TRUE"); - _rtw_memset(&wrqu, 0, sizeof(wrqu)); + memset(&wrqu, 0, sizeof(wrqu)); wrqu.data.length = p - buff; @@ -208,7 +208,7 @@ void indicate_wx_scan_complete_event(_adapter *padapter) union iwreq_data wrqu; struct mlme_priv *pmlmepriv = &padapter->mlmepriv; - _rtw_memset(&wrqu, 0, sizeof(union iwreq_data)); + memset(&wrqu, 0, sizeof(union iwreq_data)); /* RTW_INFO("+rtw_indicate_wx_scan_complete_event\n"); */ #ifndef CONFIG_IOCTL_CFG80211 @@ -225,7 +225,7 @@ void rtw_indicate_wx_assoc_event(_adapter *padapter) struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); WLAN_BSSID_EX *pnetwork = (WLAN_BSSID_EX *)(&(pmlmeinfo->network)); - _rtw_memset(&wrqu, 0, sizeof(union iwreq_data)); + memset(&wrqu, 0, sizeof(union iwreq_data)); wrqu.ap_addr.sa_family = ARPHRD_ETHER; @@ -244,10 +244,10 @@ void rtw_indicate_wx_disassoc_event(_adapter *padapter) { union iwreq_data wrqu; - _rtw_memset(&wrqu, 0, sizeof(union iwreq_data)); + memset(&wrqu, 0, sizeof(union iwreq_data)); wrqu.ap_addr.sa_family = ARPHRD_ETHER; - _rtw_memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN); + memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN); #ifndef CONFIG_IOCTL_CFG80211 RTW_INFO("indicate disassoc\n"); @@ -556,7 +556,7 @@ static inline char *iwe_stream_wpa_wpa2_process(_adapter *padapter, if (wpa_len > 0) { - _rtw_memset(pbuf, 0, buf_size); + memset(pbuf, 0, buf_size); p += sprintf(p, "wpa_ie="); for (i = 0; i < wpa_len; i++) p += sprintf(p, "%02x", wpa_ie[i]); @@ -569,28 +569,28 @@ static inline char *iwe_stream_wpa_wpa2_process(_adapter *padapter, printk("-----------------Len %d----------------\n", wpa_len); } - _rtw_memset(iwe, 0, sizeof(*iwe)); + memset(iwe, 0, sizeof(*iwe)); iwe->cmd = IWEVCUSTOM; iwe->u.data.length = strlen(pbuf); start = iwe_stream_add_point(info, start, stop, iwe, pbuf); - _rtw_memset(iwe, 0, sizeof(*iwe)); + memset(iwe, 0, sizeof(*iwe)); iwe->cmd = IWEVGENIE; iwe->u.data.length = wpa_len; start = iwe_stream_add_point(info, start, stop, iwe, wpa_ie); } if (rsn_len > 0) { - _rtw_memset(pbuf, 0, buf_size); + memset(pbuf, 0, buf_size); p += sprintf(p, "rsn_ie="); for (i = 0; i < rsn_len; i++) p += sprintf(p, "%02x", rsn_ie[i]); - _rtw_memset(iwe, 0, sizeof(*iwe)); + memset(iwe, 0, sizeof(*iwe)); iwe->cmd = IWEVCUSTOM; iwe->u.data.length = strlen(pbuf); start = iwe_stream_add_point(info, start, stop, iwe, pbuf); - _rtw_memset(iwe, 0, sizeof(*iwe)); + memset(iwe, 0, sizeof(*iwe)); iwe->cmd = IWEVGENIE; iwe->u.data.length = rsn_len; start = iwe_stream_add_point(info, start, stop, iwe, rsn_ie); @@ -657,17 +657,17 @@ static inline char *iwe_stream_wapi_process(_adapter *padapter, if (wapi_len > 0) { p = buf_wapi; - /* _rtw_memset(buf_wapi, 0, MAX_WAPI_IE_LEN*2); */ + /* memset(buf_wapi, 0, MAX_WAPI_IE_LEN*2); */ p += sprintf(p, "wapi_ie="); for (i = 0; i < wapi_len; i++) p += sprintf(p, "%02x", wapi_ie[i]); - _rtw_memset(iwe, 0, sizeof(*iwe)); + memset(iwe, 0, sizeof(*iwe)); iwe->cmd = IWEVCUSTOM; iwe->u.data.length = strlen(buf_wapi); start = iwe_stream_add_point(info, start, stop, iwe, buf_wapi); - _rtw_memset(iwe, 0, sizeof(*iwe)); + memset(iwe, 0, sizeof(*iwe)); iwe->cmd = IWEVGENIE; iwe->u.data.length = wapi_len; start = iwe_stream_add_point(info, start, stop, iwe, wapi_ie); @@ -756,7 +756,7 @@ static inline char *iwe_stream_net_rsv_process(_adapter *padapter, pos = pnetwork->network.Reserved; p += sprintf(p, "fm=%02X%02X", pos[1], pos[0]); - _rtw_memset(iwe, 0, sizeof(*iwe)); + memset(iwe, 0, sizeof(*iwe)); iwe->cmd = IWEVCUSTOM; iwe->u.data.length = strlen(buf); start = iwe_stream_add_point(info, start, stop, iwe, buf); @@ -771,7 +771,7 @@ static char *translate_scan(_adapter *padapter, u16 cap = 0; __le16 le_tmp; - _rtw_memset(&iwe, 0, sizeof(iwe)); + memset(&iwe, 0, sizeof(iwe)); if (_FALSE == search_p2p_wfd_ie(padapter, info, pnetwork, start, stop)) return start; @@ -1551,14 +1551,14 @@ static int rtw_wx_set_pmkid(struct net_device *dev, for (j = 0 ; j < NUM_PMKID_CACHE; j++) { if (_rtw_memcmp(psecuritypriv->PMKIDList[j].Bssid, strIssueBssid, ETH_ALEN) == _TRUE) { /* BSSID is matched, the same AP => Remove this PMKID information and reset it. */ - _rtw_memset(psecuritypriv->PMKIDList[j].Bssid, 0x00, ETH_ALEN); + memset(psecuritypriv->PMKIDList[j].Bssid, 0x00, ETH_ALEN); psecuritypriv->PMKIDList[j].bUsed = _FALSE; break; } } } else if (pPMK->cmd == IW_PMKSA_FLUSH) { RTW_INFO("[rtw_wx_set_pmkid] IW_PMKSA_FLUSH!\n"); - _rtw_memset(&psecuritypriv->PMKIDList[0], 0x00, sizeof(RT_PMKID_LIST) * NUM_PMKID_CACHE); + memset(&psecuritypriv->PMKIDList[0], 0x00, sizeof(RT_PMKID_LIST) * NUM_PMKID_CACHE); psecuritypriv->PMKIDIndex = 0; intReturn = _TRUE; } @@ -1606,7 +1606,7 @@ static int rtw_wx_get_range(struct net_device *dev, wrqu->data.length = sizeof(*range); - _rtw_memset(range, 0, sizeof(*range)); + memset(range, 0, sizeof(*range)); /* Let's try to keep this struct in the same order as in * linux/include/wireless.h @@ -1863,7 +1863,7 @@ static int rtw_wx_get_wap(struct net_device *dev, wrqu->ap_addr.sa_family = ARPHRD_ETHER; - _rtw_memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN); + memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN); @@ -1873,7 +1873,7 @@ static int rtw_wx_get_wap(struct net_device *dev, _rtw_memcpy(wrqu->ap_addr.sa_data, pcur_bss->MacAddress, ETH_ALEN); else - _rtw_memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN); + memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN); return 0; @@ -2000,7 +2000,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a, } #endif /* CONFIG_P2P */ - _rtw_memset(ssid, 0, sizeof(NDIS_802_11_SSID) * RTW_SSID_SCAN_AMOUNT); + memset(ssid, 0, sizeof(NDIS_802_11_SSID) * RTW_SSID_SCAN_AMOUNT); #if WIRELESS_EXT >= 17 if (wrqu->data.length == sizeof(struct iw_scan_req)) { @@ -2294,7 +2294,7 @@ static int rtw_wx_set_essid(struct net_device *dev, if (wrqu->essid.length != 33) RTW_INFO("ssid=%s, len=%d\n", extra, wrqu->essid.length); - _rtw_memset(&ndis_ssid, 0, sizeof(NDIS_802_11_SSID)); + memset(&ndis_ssid, 0, sizeof(NDIS_802_11_SSID)); ndis_ssid.SsidLength = len; _rtw_memcpy(ndis_ssid.Ssid, extra, len); src_ssid = ndis_ssid.Ssid; @@ -2597,7 +2597,7 @@ static int rtw_wx_set_enc(struct net_device *dev, struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); RTW_INFO("+rtw_wx_set_enc, flags=0x%x\n", erq->flags); - _rtw_memset(&wep, 0, sizeof(NDIS_802_11_WEP)); + memset(&wep, 0, sizeof(NDIS_802_11_WEP)); key = erq->flags & IW_ENCODE_INDEX; @@ -2987,10 +2987,10 @@ static int rtw_wx_set_enc_ext(struct net_device *dev, if (param == NULL) return -1; - _rtw_memset(param, 0, param_len); + memset(param, 0, param_len); param->cmd = IEEE_CMD_SET_ENCRYPTION; - _rtw_memset(param->sta_addr, 0xff, ETH_ALEN); + memset(param->sta_addr, 0xff, ETH_ALEN); switch (pext->alg) { @@ -3966,7 +3966,7 @@ static int rtw_p2p_profilefound(struct net_device *dev, if (!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) { if (extra[0] == '0') { /* Remove all the profile information of wifidirect_info structure. */ - _rtw_memset(&pwdinfo->profileinfo[0], 0x00, sizeof(struct profile_info) * P2P_MAX_PERSISTENT_GROUP_NUM); + memset(&pwdinfo->profileinfo[0], 0x00, sizeof(struct profile_info) * P2P_MAX_PERSISTENT_GROUP_NUM); pwdinfo->profileindex = 0; } else { if (pwdinfo->profileindex >= P2P_MAX_PERSISTENT_GROUP_NUM) @@ -4001,7 +4001,7 @@ static int rtw_p2p_setDN(struct net_device *dev, RTW_INFO("[%s] %s %d\n", __func__, extra, wrqu->data.length - 1); - _rtw_memset(pwdinfo->device_name, 0x00, WPS_MAX_DEVICE_NAME_LEN); + memset(pwdinfo->device_name, 0x00, WPS_MAX_DEVICE_NAME_LEN); _rtw_memcpy(pwdinfo->device_name, extra, wrqu->data.length - 1); pwdinfo->device_name_len = wrqu->data.length - 1; @@ -4370,7 +4370,7 @@ static int rtw_p2p_get_go_device_address(struct net_device *dev, /* The P2P Device ID attribute is included in the Beacon frame. */ /* The P2P Device Info attribute is included in the probe response frame. */ - _rtw_memset(attr_content, 0x00, 100); + memset(attr_content, 0x00, 100); if (rtw_get_p2p_attr_content(p2pie, p2pielen, P2P_ATTR_DEVICE_ID, attr_content, &attr_contentlen)) { /* Handle the P2P Device ID attribute of Beacon first */ blnMatch = 1; @@ -4598,7 +4598,7 @@ static int rtw_p2p_get_invitation_procedure(struct net_device *dev, p2pie = rtw_bss_ex_get_p2p_ie(&pnetwork->network, NULL, &p2pielen); if (p2pie) { while (p2pie) { - /* _rtw_memset( attr_content, 0x00, 2); */ + /* memset( attr_content, 0x00, 2); */ if (rtw_get_p2p_attr_content(p2pie, p2pielen, P2P_ATTR_CAPABILITY, attr_content, &attr_contentlen)) { /* Handle the P2P capability attribute */ blnMatch = 1; @@ -4714,8 +4714,8 @@ static int rtw_p2p_connect(struct net_device *dev, _cancel_timer_ex(&pwdinfo->ap_p2p_switch_timer); #endif /* CONFIG_CONCURRENT_MODE */ - _rtw_memset(&pwdinfo->nego_req_info, 0x00, sizeof(struct tx_nego_req_info)); - _rtw_memset(&pwdinfo->groupid_info, 0x00, sizeof(struct group_id_info)); + memset(&pwdinfo->nego_req_info, 0x00, sizeof(struct tx_nego_req_info)); + memset(&pwdinfo->groupid_info, 0x00, sizeof(struct group_id_info)); pwdinfo->nego_req_info.peer_channel_num[0] = uintPeerChannel; _rtw_memcpy(pwdinfo->nego_req_info.peerDevAddr, pnetwork->network.MacAddress, ETH_ALEN); @@ -4816,11 +4816,11 @@ static int rtw_p2p_invite_req(struct net_device *dev, } else { /* Reset the content of struct tx_invite_req_info */ pinvite_req_info->benable = _FALSE; - _rtw_memset(pinvite_req_info->go_bssid, 0x00, ETH_ALEN); - _rtw_memset(pinvite_req_info->go_ssid, 0x00, WLAN_SSID_MAXLEN); + memset(pinvite_req_info->go_bssid, 0x00, ETH_ALEN); + memset(pinvite_req_info->go_ssid, 0x00, WLAN_SSID_MAXLEN); pinvite_req_info->ssidlen = 0x00; pinvite_req_info->operating_ch = pwdinfo->operating_channel; - _rtw_memset(pinvite_req_info->peer_macaddr, 0x00, ETH_ALEN); + memset(pinvite_req_info->peer_macaddr, 0x00, ETH_ALEN); pinvite_req_info->token = 3; } @@ -5344,9 +5344,9 @@ static int rtw_p2p_prov_disc(struct net_device *dev, #endif /* CONFIG_INTEL_WIDI */ /* Reset the content of struct tx_provdisc_req_info excluded the wps_config_method_request. */ - _rtw_memset(pwdinfo->tx_prov_disc_info.peerDevAddr, 0x00, ETH_ALEN); - _rtw_memset(pwdinfo->tx_prov_disc_info.peerIFAddr, 0x00, ETH_ALEN); - _rtw_memset(&pwdinfo->tx_prov_disc_info.ssid, 0x00, sizeof(NDIS_802_11_SSID)); + memset(pwdinfo->tx_prov_disc_info.peerDevAddr, 0x00, ETH_ALEN); + memset(pwdinfo->tx_prov_disc_info.peerIFAddr, 0x00, ETH_ALEN); + memset(&pwdinfo->tx_prov_disc_info.ssid, 0x00, sizeof(NDIS_802_11_SSID)); pwdinfo->tx_prov_disc_info.peer_channel_num[0] = 0; pwdinfo->tx_prov_disc_info.peer_channel_num[1] = 0; pwdinfo->tx_prov_disc_info.benable = _FALSE; @@ -6874,7 +6874,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, goto exit; } - _rtw_memset(pwep, 0, wep_total_len); + memset(pwep, 0, wep_total_len); pwep->KeyLength = wep_key_len; pwep->Length = wep_total_len; @@ -8235,7 +8235,7 @@ int rtw_vendor_ie_set(struct net_device *dev, struct iw_request_info *info, unio return ret; _clear_path: - _rtw_memset(pmlmepriv->vendor_ie[vendor_ie_num] , 0 , sizeof(u32) * WLAN_MAX_VENDOR_IE_LEN); + memset(pmlmepriv->vendor_ie[vendor_ie_num] , 0 , sizeof(u32) * WLAN_MAX_VENDOR_IE_LEN); pmlmepriv->vendor_ielen[vendor_ie_num] = 0; pmlmepriv->vendor_ie_mask[vendor_ie_num] = 0; return -EFAULT; @@ -8440,7 +8440,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, goto exit; } - _rtw_memset(extra, '\0', strlen(extra)); + memset(extra, '\0', strlen(extra)); shift = blksz * raw_order; rawdata += shift; @@ -8487,7 +8487,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, goto exit; } #endif - _rtw_memset(extra, '\0', strlen(extra)); + memset(extra, '\0', strlen(extra)); shift = blksz * bt_raw_order; rawdata += shift; @@ -9413,7 +9413,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, for (jj = 0, kk = 0; jj < cnts; jj++, kk += 2) pEfuseHal->fakeEfuseModifiedMap[addr + jj] = key_2char2num(tmp[2][kk], tmp[2][kk + 1]); - _rtw_memset(extra, '\0', strlen(extra)); + memset(extra, '\0', strlen(extra)); sprintf(extra, "wlwfake OK\n"); } @@ -9452,7 +9452,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, for (jj = 0, kk = 0; jj < cnts; jj++, kk += 2) pEfuseHal->fakeEfuseModifiedMap[addr + jj] = key_2char2num(tmp[1][kk], tmp[1][kk + 1]); - _rtw_memset(extra, '\0', strlen(extra)); + memset(extra, '\0', strlen(extra)); sprintf(extra, "write mac addr to fake map OK\n"); } else if(strcmp(tmp[0], "update") == 0) { RTW_INFO("To Use new eFuse map\n"); @@ -9475,7 +9475,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, err = -EINVAL; goto exit; } - _rtw_memset(extra, '\0', strlen(extra)); + memset(extra, '\0', strlen(extra)); sprintf(extra, "eFuse Update OK\n"); } @@ -9551,7 +9551,7 @@ static int rtw_mp_customer_str( return -EFAULT; } - _rtw_memset(param, 0xFF, RTW_CUSTOMER_STR_LEN); + memset(param, 0xFF, RTW_CUSTOMER_STR_LEN); if (strcmp(pch, "read") == 0) { read = 1; @@ -9820,7 +9820,7 @@ static int rtw_mp_sd_iread(struct net_device *dev goto exit; } - _rtw_memset(extra, 0, wrqu->length); + memset(extra, 0, wrqu->length); if (sscanf(input, "%hhu,%lx", &width, &addr) != 2) { RTW_INFO(FUNC_ADPT_FMT" sscanf fail\n", FUNC_ADPT_ARG(padapter)); @@ -9883,7 +9883,7 @@ static int rtw_mp_sd_iwrite(struct net_device *dev goto exit; } - _rtw_memset(extra, 0, wrqu->length); + memset(extra, 0, wrqu->length); if (sscanf(input, "%hhu,%lx,%lx", &width, &addr, &data) != 3) { RTW_INFO(FUNC_ADPT_FMT" sscanf fail\n", FUNC_ADPT_ARG(padapter)); @@ -10122,8 +10122,8 @@ static int rtw_tdls_enable(struct net_device *dev, RTW_INFO("[%s] %s %d\n", __func__, extra, wrqu->data.length - 1); - _rtw_memset(tdls_sta, 0x00, sizeof(tdls_sta)); - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(tdls_sta, 0x00, sizeof(tdls_sta)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); if (extra[0] == '0') { ptdlsinfo->tdls_enable = 0; @@ -10184,7 +10184,7 @@ static int rtw_tdls_setup(struct net_device *dev, return ret; } - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); for (i = 0, j = 0 ; i < ETH_ALEN; i++, j += 3) txmgmt.peer[i] = key_2char2num(*(extra + j), *(extra + j + 1)); @@ -10228,7 +10228,7 @@ static int rtw_tdls_teardown(struct net_device *dev, return ret; } - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); for (i = 0, j = 0; i < ETH_ALEN; i++, j += 3) txmgmt.peer[i] = key_2char2num(*(extra + j), *(extra + j + 1)); @@ -10261,7 +10261,7 @@ static int rtw_tdls_discovery(struct net_device *dev, RTW_INFO("[%s] %s %d\n", __func__, extra, wrqu->data.length - 1); - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); for (i = 0, j = 0 ; i < ETH_ALEN; i++, j += 3) txmgmt.peer[i] = key_2char2num(*(extra + j), *(extra + j + 1)); @@ -10348,7 +10348,7 @@ static int rtw_tdls_ch_switch_off(struct net_device *dev, struct sta_info *ptdls_sta = NULL; struct tdls_txmgmt txmgmt; - _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); + memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); RTW_INFO("[%s] %s %d\n", __func__, extra, wrqu->data.length - 1); @@ -10371,7 +10371,7 @@ static int rtw_tdls_ch_switch_off(struct net_device *dev, pchsw_info->ch_sw_state &= ~(TDLS_CH_SW_INITIATOR_STATE | TDLS_CH_SWITCH_ON_STATE | TDLS_PEER_AT_OFF_STATE); - _rtw_memset(pchsw_info->addr, 0x00, ETH_ALEN); + memset(pchsw_info->addr, 0x00, ETH_ALEN); ptdls_sta->ch_switch_time = 0; ptdls_sta->ch_switch_timeout = 0; @@ -10996,7 +10996,7 @@ static s32 initLoopback(PADAPTER padapter) ploopback->bstop = _TRUE; ploopback->cnt = 0; ploopback->size = 300; - _rtw_memset(ploopback->msg, 0, sizeof(ploopback->msg)); + memset(ploopback->msg, 0, sizeof(ploopback->msg)); padapter->ploopback = ploopback; } @@ -11053,7 +11053,7 @@ static s32 createpseudoadhoc(PADAPTER padapter) return _FAIL; passoc_ssid = &pmlmepriv->assoc_ssid; - _rtw_memset(passoc_ssid, 0, sizeof(NDIS_802_11_SSID)); + memset(passoc_ssid, 0, sizeof(NDIS_802_11_SSID)); passoc_ssid->SsidLength = sizeof(ssid) - 1; _rtw_memcpy(passoc_ssid->Ssid, ssid, passoc_ssid->SsidLength); @@ -11141,12 +11141,12 @@ static struct xmit_frame *createloopbackpkt(PADAPTER padapter, u32 size) pattrib = &pframe->attrib; /* init xmitframe attribute */ - _rtw_memset(pattrib, 0, sizeof(struct pkt_attrib)); + memset(pattrib, 0, sizeof(struct pkt_attrib)); pattrib->ether_type = 0x8723; _rtw_memcpy(pattrib->src, adapter_mac_addr(padapter), ETH_ALEN); _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); - _rtw_memset(pattrib->dst, 0xFF, ETH_ALEN); + memset(pattrib->dst, 0xFF, ETH_ALEN); _rtw_memcpy(pattrib->ra, pattrib->dst, ETH_ALEN); /* pattrib->dhcp_pkt = 0; @@ -11177,7 +11177,7 @@ static struct xmit_frame *createloopbackpkt(PADAPTER padapter, u32 size) /* 2 4. fill TX descriptor */ desc = (struct tx_desc *)pframe->buf_addr; - _rtw_memset(desc, 0, TXDESC_SIZE); + memset(desc, 0, TXDESC_SIZE); fill_default_txdesc(pframe, (u8 *)desc); @@ -11383,9 +11383,9 @@ thread_return lbk_thread(thread_context context) fail++; ploopback->txsize = 0; - _rtw_memset(ploopback->txbuf, 0, 0x8000); + memset(ploopback->txbuf, 0, 0x8000); ploopback->rxsize = 0; - _rtw_memset(ploopback->rxbuf, 0, 0x8000); + memset(ploopback->rxbuf, 0, 0x8000); freeloopbackpkt(padapter, pxmitframe); pxmitframe = NULL; diff --git a/os_dep/ioctl_mp.c b/os_dep/ioctl_mp.c index e497ad2..b54aa64 100644 --- a/os_dep/ioctl_mp.c +++ b/os_dep/ioctl_mp.c @@ -50,7 +50,7 @@ int rtw_mp_write_reg(struct net_device *dev, if (copy_from_user(input, wrqu->pointer, wrqu->length)) return -EFAULT; - _rtw_memset(extra, 0, wrqu->length); + memset(extra, 0, wrqu->length); pch = input; @@ -66,7 +66,7 @@ int rtw_mp_write_reg(struct net_device *dev, return -EINVAL; *pnext = 0; /*addr = simple_strtoul(pch, &ptmp, 16); - _rtw_memset(buf, '\0', sizeof(buf)); + memset(buf, '\0', sizeof(buf)); _rtw_memcpy(buf, pch, pnext-pch); ret = kstrtoul(buf, 16, &addr);*/ ret = sscanf(pch, "%x", &addr); @@ -143,9 +143,9 @@ int rtw_mp_read_reg(struct net_device *dev, if (copy_from_user(input, wrqu->pointer, wrqu->length)) return -EFAULT; - _rtw_memset(extra, 0, wrqu->length); - _rtw_memset(data, '\0', sizeof(data)); - _rtw_memset(tmp, '\0', sizeof(tmp)); + memset(extra, 0, wrqu->length); + memset(data, '\0', sizeof(data)); + memset(tmp, '\0', sizeof(tmp)); pch = input; pnext = strpbrk(pch, " ,.-"); if (pnext == NULL) @@ -263,7 +263,7 @@ int rtw_mp_write_rf(struct net_device *dev, if (wrqu->length > 128) return -EFAULT; - _rtw_memset(input, 0, wrqu->length); + memset(input, 0, wrqu->length); if (copy_from_user(input, wrqu->pointer, wrqu->length)) return -EFAULT; @@ -279,7 +279,7 @@ int rtw_mp_write_rf(struct net_device *dev, if (data > 0xFFFFF) return -EINVAL; - _rtw_memset(extra, 0, wrqu->length); + memset(extra, 0, wrqu->length); write_rfreg(padapter, path, addr, data); @@ -311,7 +311,7 @@ int rtw_mp_read_rf(struct net_device *dev, if (wrqu->length > 128) return -EFAULT; - _rtw_memset(input, 0, wrqu->length); + memset(input, 0, wrqu->length); if (copy_from_user(input, wrqu->pointer, wrqu->length)) return -EFAULT; @@ -324,7 +324,7 @@ int rtw_mp_read_rf(struct net_device *dev, if (addr > 0xFF) return -EINVAL; - _rtw_memset(extra, 0, wrqu->length); + memset(extra, 0, wrqu->length); sprintf(data, "%08x", read_rfreg(padapter, path, addr)); /*add read data format blank*/ @@ -377,7 +377,7 @@ int rtw_mp_start(struct net_device *dev, if (rtw_mp_cmd(padapter, MP_START, RTW_CMDF_WAIT_ACK) != _SUCCESS) ret = -EPERM; - _rtw_memset(extra, 0, wrqu->length); + memset(extra, 0, wrqu->length); sprintf(extra, "mp_start %s\n", ret == 0 ? "ok" : "fail"); wrqu->length = strlen(extra); @@ -397,7 +397,7 @@ int rtw_mp_stop(struct net_device *dev, if (rtw_mp_cmd(padapter, MP_STOP, RTW_CMDF_WAIT_ACK) != _SUCCESS) ret = -EPERM; - _rtw_memset(extra, 0, wrqu->length); + memset(extra, 0, wrqu->length); sprintf(extra, "mp_stop %s\n", ret == 0 ? "ok" : "fail"); wrqu->length = strlen(extra); @@ -437,7 +437,7 @@ int rtw_mp_rate(struct net_device *dev, rate =(rate - MPT_RATE_VHT1SS_MCS0); */ } - _rtw_memset(extra, 0, wrqu->length); + memset(extra, 0, wrqu->length); sprintf(extra, "Set data rate to %s index %d" , input, padapter->mppriv.rateidx); RTW_INFO("%s: %s rate index=%d\n", __func__, input, padapter->mppriv.rateidx); @@ -471,7 +471,7 @@ int rtw_mp_channel(struct net_device *dev, channel = rtw_atoi(input); /*RTW_INFO("%s: channel=%d\n", __func__, channel);*/ - _rtw_memset(extra, 0, wrqu->length); + memset(extra, 0, wrqu->length); sprintf(extra, "Change channel %d to channel %d", padapter->mppriv.channel , channel); padapter->mppriv.channel = channel; SetChannel(padapter); @@ -507,7 +507,7 @@ int rtw_mp_bandwidth(struct net_device *dev, padapter->mppriv.bandwidth = (u8)bandwidth; padapter->mppriv.preamble = sg; - _rtw_memset(extra, 0, wrqu->length); + memset(extra, 0, wrqu->length); sprintf(extra, "Change BW %d to BW %d\n", pHalData->current_channel_bw , bandwidth); SetBandwidth(padapter); @@ -647,7 +647,7 @@ int rtw_mp_ant_rx(struct net_device *dev, if (copy_from_user(input, wrqu->pointer, wrqu->length)) return -EFAULT; /*RTW_INFO("%s: input=%s\n", __func__, input);*/ - _rtw_memset(extra, 0, wrqu->length); + memset(extra, 0, wrqu->length); sprintf(extra, "switch Rx antenna to %s", input); @@ -757,7 +757,7 @@ int rtw_mp_ctx(struct net_device *dev, } /*RTW_INFO("%s: count=%d countPkTx=%d cotuTx=%d CarrSprTx=%d scTx=%d sgleTx=%d pkTx=%d stop=%d\n", __func__, count, countPkTx, cotuTx, CarrSprTx, pkTx, sgleTx, scTx, stop);*/ - _rtw_memset(extra, '\0', strlen(extra)); + memset(extra, '\0', strlen(extra)); if (pktinterval != 0) { sprintf(extra, "Pkt Interval = %d", pktinterval); @@ -940,7 +940,7 @@ int rtw_mp_arx(struct net_device *dev, pmppriv->bSetRxBssid = _FALSE; sprintf(extra, "Received packet OK:%d CRC error:%d ,Filter out:%d", padapter->mppriv.rx_pktcount, padapter->mppriv.rx_crcerrpktcount, padapter->mppriv.rx_pktcount_filter_out); } else if (bQueryPhy) { - _rtw_memset(&rx_counter, 0, sizeof(struct dbg_rx_counter)); + memset(&rx_counter, 0, sizeof(struct dbg_rx_counter)); rtw_dump_phy_rx_counters(padapter, &rx_counter); RTW_INFO("%s: OFDM_FA =%d\n", __func__, rx_counter.rx_ofdm_fa); @@ -949,7 +949,7 @@ int rtw_mp_arx(struct net_device *dev, } else if (bQueryMac) { - _rtw_memset(&rx_counter, 0, sizeof(struct dbg_rx_counter)); + memset(&rx_counter, 0, sizeof(struct dbg_rx_counter)); rtw_dump_mac_rx_counters(padapter, &rx_counter); sprintf(extra, "Mac Received packet OK: %d , CRC error: %d , Drop Packets: %d\n", rx_counter.rx_pkt_ok, rx_counter.rx_pkt_crc_error, rx_counter.rx_pkt_drop); @@ -1014,7 +1014,7 @@ int rtw_mp_trx_query(struct net_device *dev, rxfail = padapter->mppriv.rx_crcerrpktcount; rxfilterout = padapter->mppriv.rx_pktcount_filter_out; - _rtw_memset(extra, '\0', 128); + memset(extra, '\0', 128); sprintf(extra, "Tx OK:%d, Tx Fail:%d, Rx OK:%d, CRC error:%d ,Rx Filter out:%d\n", txok, txfail, rxok, rxfail, rxfilterout); @@ -1040,7 +1040,7 @@ int rtw_mp_pwrtrk(struct net_device *dev, if (copy_from_user(input, wrqu->pointer, wrqu->length)) return -EFAULT; - _rtw_memset(extra, 0, wrqu->length); + memset(extra, 0, wrqu->length); enable = 1; if (wrqu->length > 1) { @@ -1146,7 +1146,7 @@ int rtw_mp_reset_stats(struct net_device *dev, rtw_reset_phy_rx_counters(padapter); rtw_reset_mac_rx_counters(padapter); - _rtw_memset(extra, 0, wrqu->length); + memset(extra, 0, wrqu->length); sprintf(extra, "mp_reset_stats ok\n"); wrqu->length = strlen(extra); @@ -1230,7 +1230,7 @@ int rtw_mp_SetRFPath(struct net_device *dev, bMain = strncmp(input, "1", 2); /* strncmp TRUE is 0*/ bTurnoff = strncmp(input, "0", 3); /* strncmp TRUE is 0*/ - _rtw_memset(extra, 0, wrqu->length); + memset(extra, 0, wrqu->length); if (bMain == 0) { MP_PHY_SetRFPathSwitch(padapter, _TRUE); @@ -1508,7 +1508,7 @@ int rtw_mp_tx(struct net_device *dev, pmp_priv->tx.count = count; return 0; } else if (strncmp(extra, "setting", 7) == 0) { - _rtw_memset(extra, 0, wrqu->data.length); + memset(extra, 0, wrqu->data.length); sprintf(extra, "Current Setting :\n Channel:%d", pmp_priv->channel); sprintf(extra, "%s\n Bandwidth:%d", extra, pmp_priv->bandwidth); sprintf(extra, "%s\n Rate index:%d", extra, pmp_priv->rateidx); @@ -1521,7 +1521,7 @@ int rtw_mp_tx(struct net_device *dev, #ifdef CONFIG_MP_VHT_HW_TX_MODE } else if (strncmp(extra, "pmact", 5) == 0) { if (strncmp(extra, "pmact=", 6) == 0) { - _rtw_memset(&pMptCtx->PMacTxInfo, 0, sizeof(pMptCtx->PMacTxInfo)); + memset(&pMptCtx->PMacTxInfo, 0, sizeof(pMptCtx->PMacTxInfo)); if (strncmp(extra, "pmact=start", 11) == 0) { pMptCtx->PMacTxInfo.bEnPMacTx = _TRUE; sprintf(extra, "Set PMac Tx Mode start\n"); @@ -1566,7 +1566,7 @@ int rtw_mp_tx(struct net_device *dev, pMptCtx->PMacTxInfo.Ntx++; } - _rtw_memset(pMptCtx->PMacTxInfo.MacAddress, 0xFF, ETH_ALEN); + memset(pMptCtx->PMacTxInfo.MacAddress, 0xFF, ETH_ALEN); PMAC_Get_Pkt_Param(&pMptCtx->PMacTxInfo, &pMptCtx->PMacPktInfo); @@ -1652,7 +1652,7 @@ int rtw_mp_tx(struct net_device *dev, if (sscanf(extra, "ch=%d,bw=%d,rate=%d,pwr=%d,ant=%d,tx=%d", &channel, &bandwidth, &rate, &txpower, &ant, &txmode) < 6) { RTW_INFO("Invalid format [ch=%d,bw=%d,rate=%d,pwr=%d,ant=%d,tx=%d]\n", channel, bandwidth, rate, txpower, ant, txmode); - _rtw_memset(extra, 0, wrqu->data.length); + memset(extra, 0, wrqu->data.length); sprintf(extra, "\n Please input correct format as bleow:\n"); sprintf(extra, "%s\t ch=%d,bw=%d,rate=%d,pwr=%d,ant=%d,tx=%d\n", extra, channel, bandwidth, rate, txpower, ant, txmode); sprintf(extra, "%s\n [ ch : BGN = <1~14> , A or AC = <36~165> ]", extra); @@ -1670,7 +1670,7 @@ int rtw_mp_tx(struct net_device *dev, } else { RTW_INFO("Got format [ch=%d,bw=%d,rate=%d,pwr=%d,ant=%d,tx=%d]\n", channel, bandwidth, rate, txpower, ant, txmode); - _rtw_memset(extra, 0, wrqu->data.length); + memset(extra, 0, wrqu->data.length); sprintf(extra, "Change Current channel %d to channel %d", padapter->mppriv.channel , channel); padapter->mppriv.channel = channel; SetChannel(padapter); @@ -1813,7 +1813,7 @@ int rtw_mp_rx(struct net_device *dev, #endif if (strncmp(extra, "stop", 4) == 0) { - _rtw_memset(extra, 0, wrqu->data.length); + memset(extra, 0, wrqu->data.length); SetPacketRx(padapter, bStartRx, _FALSE); pmp_priv->bmac_filter = _FALSE; sprintf(extra, "Received packet OK:%d CRC error:%d ,Filter out:%d", padapter->mppriv.rx_pktcount, padapter->mppriv.rx_crcerrpktcount, padapter->mppriv.rx_pktcount_filter_out); @@ -1822,7 +1822,7 @@ int rtw_mp_rx(struct net_device *dev, } else if (sscanf(extra, "ch=%d,bw=%d,ant=%d", &channel, &bandwidth, &ant) < 3) { RTW_INFO("Invalid format [ch=%d,bw=%d,ant=%d]\n", channel, bandwidth, ant); - _rtw_memset(extra, 0, wrqu->data.length); + memset(extra, 0, wrqu->data.length); sprintf(extra, "\n Please input correct format as bleow:\n"); sprintf(extra, "%s\t ch=%d,bw=%d,ant=%d\n", extra, channel, bandwidth, ant); sprintf(extra, "%s\n [ ch : BGN = <1~14> , A or AC = <36~165> ]", extra); @@ -1834,7 +1834,7 @@ int rtw_mp_rx(struct net_device *dev, } else { bStartRx = 1; RTW_INFO("Got format [ch=%d,bw=%d,ant=%d]\n", channel, bandwidth, ant); - _rtw_memset(extra, 0, wrqu->data.length); + memset(extra, 0, wrqu->data.length); sprintf(extra, "Change Current channel %d to channel %d", padapter->mppriv.channel , channel); padapter->mppriv.channel = channel; SetChannel(padapter); @@ -1929,7 +1929,7 @@ int rtw_efuse_mask_file(struct net_device *dev, u8 Status; PADAPTER padapter = rtw_netdev_priv(dev); - _rtw_memset(maskfileBuffer, 0x00, sizeof(maskfileBuffer)); + memset(maskfileBuffer, 0x00, sizeof(maskfileBuffer)); if (copy_from_user(extra, wrqu->data.pointer, wrqu->data.length)) return -EFAULT; @@ -2021,7 +2021,7 @@ int rtw_efuse_file_map(struct net_device *dev, rtw_efuse_file_map_path = extra; - _rtw_memset(pEfuseHal->fakeEfuseModifiedMap, 0xFF, EFUSE_MAX_MAP_LEN); + memset(pEfuseHal->fakeEfuseModifiedMap, 0xFF, EFUSE_MAX_MAP_LEN); if (rtw_is_file_readable(rtw_efuse_file_map_path) == _TRUE) { RTW_INFO("%s do rtw_efuse_mask_file_read = %s!\n", __func__, rtw_efuse_file_map_path); diff --git a/os_dep/mlme_linux.c b/os_dep/mlme_linux.c index bdab085..c2815d7 100644 --- a/os_dep/mlme_linux.c +++ b/os_dep/mlme_linux.c @@ -240,7 +240,7 @@ void rtw_reset_securitypriv(_adapter *adapter) /* Backup the btkip_countermeasure information. */ /* When the countermeasure is trigger, the driver have to disconnect with AP for 60 seconds. */ - _rtw_memset(&backupPMKIDList[0], 0x00, sizeof(RT_PMKID_LIST) * NUM_PMKID_CACHE); + memset(&backupPMKIDList[0], 0x00, sizeof(RT_PMKID_LIST) * NUM_PMKID_CACHE); _rtw_memcpy(&backupPMKIDList[0], &adapter->securitypriv.PMKIDList[0], sizeof(RT_PMKID_LIST) * NUM_PMKID_CACHE); backupPMKIDIndex = adapter->securitypriv.PMKIDIndex; @@ -250,7 +250,7 @@ void rtw_reset_securitypriv(_adapter *adapter) /* reset RX BIP packet number */ pmlmeext->mgnt_80211w_IPN_rx = 0; #endif /* CONFIG_IEEE80211W */ - _rtw_memset((unsigned char *)&adapter->securitypriv, 0, sizeof(struct security_priv)); + memset((unsigned char *)&adapter->securitypriv, 0, sizeof(struct security_priv)); /* _init_timer(&(adapter->securitypriv.tkip_timer),adapter->pnetdev, rtw_use_tkipkey_handler, adapter); */ /* Added by Albert 2009/02/18 */ @@ -336,7 +336,7 @@ void rtw_report_sec_ie(_adapter *adapter, u8 authmode, u8 *sec_ie) p += sprintf(p, ")"); - _rtw_memset(&wrqu, 0, sizeof(wrqu)); + memset(&wrqu, 0, sizeof(wrqu)); wrqu.data.length = p - buff; diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index acbb317..19700c4 100644 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -755,7 +755,7 @@ uint loadparam(_adapter *padapter) ) { if (rtw_country_code != rtw_country_unspecified) RTW_ERR("%s discard rtw_country_code not in alpha2\n", __func__); - _rtw_memset(registry_par->alpha2, 0xFF, 2); + memset(registry_par->alpha2, 0xFF, 2); } else _rtw_memcpy(registry_par->alpha2, rtw_country_code, 2); @@ -1735,7 +1735,7 @@ struct dvobj_priv *devobj_init(void) #ifdef CONFIG_RTW_CUSTOMER_STR _rtw_mutex_init(&pdvobj->customer_str_mutex); - _rtw_memset(pdvobj->customer_str, 0xFF, RTW_CUSTOMER_STR_LEN); + memset(pdvobj->customer_str, 0xFF, RTW_CUSTOMER_STR_LEN); #endif pdvobj->processing_dev_remove = _FALSE; @@ -1972,7 +1972,7 @@ u8 rtw_init_drv_sw(_adapter *padapter) spin_lock_init(&padapter->security_key_mutex); /* We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). */ - /* _rtw_memset((unsigned char *)&padapter->securitypriv, 0, sizeof (struct security_priv)); */ + /* memset((unsigned char *)&padapter->securitypriv, 0, sizeof (struct security_priv)); */ /* _init_timer(&(padapter->securitypriv.tkip_timer), padapter->pifp, rtw_use_tkipkey_handler, padapter); */ @@ -2002,7 +2002,7 @@ u8 rtw_init_drv_sw(_adapter *padapter) rtw_init_pwrctrl_priv(padapter); - /* _rtw_memset((u8 *)&padapter->qospriv, 0, sizeof (struct qos_priv)); */ /* move to mlme_priv */ + /* memset((u8 *)&padapter->qospriv, 0, sizeof (struct qos_priv)); */ /* move to mlme_priv */ #ifdef CONFIG_MP_INCLUDED if (init_mp_priv(padapter) == _FAIL) diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 5e6e8af..5b3fab9 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -712,11 +712,6 @@ int _rtw_memcmp(const void *dst, const void *src, u32 sz) return _FALSE; } -void _rtw_memset(void *pbuf, int c, u32 sz) -{ - memset(pbuf, c, sz); -} - void _rtw_init_listhead(_list *list) { INIT_LIST_HEAD(list); @@ -1727,7 +1722,7 @@ int map_readN(const struct map_t *map, u16 offset, u16 len, u8 *buf) goto exit; } - _rtw_memset(buf, map->init_value, len); + memset(buf, map->init_value, len); for (i = 0; i < map->seg_num; i++) { u8 *c_dst, *c_src; diff --git a/os_dep/recv_linux.c b/os_dep/recv_linux.c index e402f93..f8eb0cf 100644 --- a/os_dep/recv_linux.c +++ b/os_dep/recv_linux.c @@ -528,7 +528,7 @@ void rtw_handle_tkip_mic_err(_adapter *padapter, struct sta_info *sta, u8 bgroup cfg80211_michael_mic_failure(padapter->pnetdev, sta->hwaddr, key_type, -1, NULL, GFP_ATOMIC); #endif - _rtw_memset(&ev, 0x00, sizeof(ev)); + memset(&ev, 0x00, sizeof(ev)); if (bgroup) ev.flags |= IW_MICFAILURE_GROUP; else @@ -537,7 +537,7 @@ void rtw_handle_tkip_mic_err(_adapter *padapter, struct sta_info *sta, u8 bgroup ev.src_addr.sa_family = ARPHRD_ETHER; _rtw_memcpy(ev.src_addr.sa_data, sta->hwaddr, ETH_ALEN); - _rtw_memset(&wrqu, 0x00, sizeof(wrqu)); + memset(&wrqu, 0x00, sizeof(wrqu)); wrqu.data.length = sizeof(ev); #ifndef CONFIG_IOCTL_CFG80211 @@ -577,7 +577,7 @@ void rtw_hostapd_mlme_rx(_adapter *padapter, union recv_frame *precv_frame) skb_reset_mac_header(skb); /* skb_pull(skb, 24); */ - _rtw_memset(skb->cb, 0, sizeof(skb->cb)); + memset(skb->cb, 0, sizeof(skb->cb)); rtw_netif_rx(pmgnt_netdev, skb); diff --git a/os_dep/rtw_proc.c b/os_dep/rtw_proc.c index c0b5c9c..b9012ab 100644 --- a/os_dep/rtw_proc.c +++ b/os_dep/rtw_proc.c @@ -1778,7 +1778,7 @@ ssize_t proc_set_btinfo_evt(struct file *file, const char __user *buffer, size_t if (buffer && !copy_from_user(tmp, buffer, count)) { int num = 0; - _rtw_memset(btinfo, 0, 8); + memset(btinfo, 0, 8); num = sscanf(tmp, "%hhx %hhx %hhx %hhx %hhx %hhx %hhx %hhx" , &btinfo[0], &btinfo[1], &btinfo[2], &btinfo[3] @@ -2693,7 +2693,7 @@ static ssize_t proc_set_phydm_cmd(struct file *file, const char __user *buffer, if (NULL == phydm_msg) return -ENOMEM; } else - _rtw_memset(phydm_msg, 0, PHYDM_MSG_LEN); + memset(phydm_msg, 0, PHYDM_MSG_LEN); phydm_cmd(phydm, tmp, count, 1, phydm_msg, PHYDM_MSG_LEN); diff --git a/os_dep/usb_ops_linux.c b/os_dep/usb_ops_linux.c index 7e6a8f2..7600f4c 100644 --- a/os_dep/usb_ops_linux.c +++ b/os_dep/usb_ops_linux.c @@ -89,7 +89,7 @@ int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u16 inde } while (++vendorreq_times <= MAX_USBCTRL_VENDORREQ_TIMES) { - _rtw_memset(pIo_buf, 0, len); + memset(pIo_buf, 0, len); if (requesttype == 0x01) { pipe = usb_rcvctrlpipe(udev, 0);/* read_in */