skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-29 23:43:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Replace all instances if __FUNCTION__ with __func__

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2018-11-03 14:22:43 -05:00
parent 2b8372b0af
commit 22421e29fb
69 changed files with 1290 additions and 1852 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
core/rtw_ap.c
View file

@ -661,7 +661,7 @@ void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level, u8 is_u
if (psta->aid < NUM_STA) { if (psta->aid < NUM_STA) {
RTW_INFO("%s=> mac_id:%d , raid:%d, tx_ra_bitmap:0x%016llx, networkType:0x%02x\n", RTW_INFO("%s=> mac_id:%d , raid:%d, tx_ra_bitmap:0x%016llx, networkType:0x%02x\n",
__FUNCTION__, psta->mac_id, psta->raid, tx_ra_bitmap, psta->wireless_mode); __func__, psta->mac_id, psta->raid, tx_ra_bitmap, psta->wireless_mode);
rtw_update_ramask(padapter, psta, psta->mac_id, rssi_level, is_update_bw); rtw_update_ramask(padapter, psta, psta->mac_id, rssi_level, is_update_bw);
} else } else
@ -736,7 +736,7 @@ void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta)
/* set intf_tag to if1 */ /* set intf_tag to if1 */
/* psta->intf_tag = 0; */ /* psta->intf_tag = 0; */
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
/*alloc macid when call rtw_alloc_stainfo(),release macid when call rtw_free_stainfo()*/ /*alloc macid when call rtw_alloc_stainfo(),release macid when call rtw_free_stainfo()*/
@ -1075,7 +1075,7 @@ static void update_hw_ht_param(_adapter *padapter)
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
/* handle A-MPDU parameter field */ /* handle A-MPDU parameter field */
@ -1094,7 +1094,7 @@ static void update_hw_ht_param(_adapter *padapter)
/* Config SM Power Save setting */ /* Config SM Power Save setting */
pmlmeinfo->SM_PS = (le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) & 0x0C) >> 2; pmlmeinfo->SM_PS = (le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) & 0x0C) >> 2;
if (pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC) if (pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC)
RTW_INFO("%s(): WLAN_HT_CAP_SM_PS_STATIC\n", __FUNCTION__); RTW_INFO("%s(): WLAN_HT_CAP_SM_PS_STATIC\n", __func__);
} }
static void rtw_ap_check_scan(_adapter *padapter) static void rtw_ap_check_scan(_adapter *padapter)
@ -1471,7 +1471,7 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len)
/* ht_capab, ht_oper */ /* ht_capab, ht_oper */
/* WPS IE */ /* WPS IE */
RTW_INFO("%s, len=%d\n", __FUNCTION__, len); RTW_INFO("%s, len=%d\n", __func__, len);
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE)
return _FAIL; return _FAIL;
@ -2181,7 +2181,7 @@ static int rtw_ap_set_key(_adapter *padapter, u8 *key, u8 alg, int keyid, u8 set
struct cmd_priv *pcmdpriv = &(padapter->cmdpriv); struct cmd_priv *pcmdpriv = &(padapter->cmdpriv);
int res = _SUCCESS; int res = _SUCCESS;
/* RTW_INFO("%s\n", __FUNCTION__); */ /* RTW_INFO("%s\n", __func__); */
pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj)); pcmd = (struct cmd_obj *)rtw_zmalloc(sizeof(struct cmd_obj));
if (pcmd == NULL) { if (pcmd == NULL) {
@ -2239,7 +2239,7 @@ exit:
int rtw_ap_set_group_key(_adapter *padapter, u8 *key, u8 alg, int keyid) int rtw_ap_set_group_key(_adapter *padapter, u8 *key, u8 alg, int keyid)
{ {
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
return rtw_ap_set_key(padapter, key, alg, keyid, 1); return rtw_ap_set_key(padapter, key, alg, keyid, 1);
} }
@ -2259,7 +2259,7 @@ int rtw_ap_set_wep_key(_adapter *padapter, u8 *key, u8 keylen, int keyid, u8 set
alg = _NO_PRIVACY_; alg = _NO_PRIVACY_;
} }
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
return rtw_ap_set_key(padapter, key, alg, keyid, set_tx); return rtw_ap_set_key(padapter, key, alg, keyid, set_tx);
} }
@ -2432,7 +2432,7 @@ static void update_bcn_ext_capab_ie(_adapter *padapter)
static void update_bcn_fixed_ie(_adapter *padapter) static void update_bcn_fixed_ie(_adapter *padapter)
{ {
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
} }
@ -2445,7 +2445,7 @@ static void update_bcn_erpinfo_ie(_adapter *padapter)
unsigned char *p, *ie = pnetwork->IEs; unsigned char *p, *ie = pnetwork->IEs;
u32 len = 0; u32 len = 0;
RTW_INFO("%s, ERP_enable=%d\n", __FUNCTION__, pmlmeinfo->ERP_enable); RTW_INFO("%s, ERP_enable=%d\n", __func__, pmlmeinfo->ERP_enable);
if (!pmlmeinfo->ERP_enable) if (!pmlmeinfo->ERP_enable)
return; return;
@ -2472,7 +2472,7 @@ static void update_bcn_erpinfo_ie(_adapter *padapter)
static void update_bcn_htcap_ie(_adapter *padapter) static void update_bcn_htcap_ie(_adapter *padapter)
{ {
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
} }
@ -2497,7 +2497,7 @@ static void update_bcn_htinfo_ie(_adapter *padapter)
RTW_INFO("%s current operation mode=0x%X\n", RTW_INFO("%s current operation mode=0x%X\n",
__FUNCTION__, pmlmepriv->ht_op_mode); __func__, pmlmepriv->ht_op_mode);
RTW_INFO("num_sta_40mhz_intolerant(%d), 20mhz_width_req(%d), intolerant_ch_rpt(%d), olbc(%d)\n", RTW_INFO("num_sta_40mhz_intolerant(%d), 20mhz_width_req(%d), intolerant_ch_rpt(%d), olbc(%d)\n",
pmlmepriv->num_sta_40mhz_intolerant, pmlmepriv->ht_20mhz_width_req, pmlmepriv->ht_intolerant_ch_reported, ATOMIC_READ(&pmlmepriv->olbc)); pmlmepriv->num_sta_40mhz_intolerant, pmlmepriv->ht_20mhz_width_req, pmlmepriv->ht_intolerant_ch_reported, ATOMIC_READ(&pmlmepriv->olbc));
@ -2522,7 +2522,7 @@ static void update_bcn_htinfo_ie(_adapter *padapter)
beacon_updated = _TRUE; beacon_updated = _TRUE;
*/ */
RTW_INFO("%s:switching to 20Mhz\n", __FUNCTION__); RTW_INFO("%s:switching to 20Mhz\n", __func__);
/*TODO : cur_bwmode/cur_ch_offset switches to 20Mhz*/ /*TODO : cur_bwmode/cur_ch_offset switches to 20Mhz*/
} }
@ -2545,7 +2545,7 @@ static void update_bcn_htinfo_ie(_adapter *padapter)
beacon_updated = _TRUE; beacon_updated = _TRUE;
*/ */
RTW_INFO("%s:switching back to 40Mhz\n", __FUNCTION__); RTW_INFO("%s:switching back to 40Mhz\n", __func__);
} }
} }
} }
@ -2561,19 +2561,19 @@ static void update_bcn_htinfo_ie(_adapter *padapter)
static void update_bcn_rsn_ie(_adapter *padapter) static void update_bcn_rsn_ie(_adapter *padapter)
{ {
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
} }
static void update_bcn_wpa_ie(_adapter *padapter) static void update_bcn_wpa_ie(_adapter *padapter)
{ {
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
} }
static void update_bcn_wmm_ie(_adapter *padapter) static void update_bcn_wmm_ie(_adapter *padapter)
{ {
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
} }
@ -2589,7 +2589,7 @@ static void update_bcn_wps_ie(_adapter *padapter)
u32 ielen = pnetwork->IELength; u32 ielen = pnetwork->IELength;
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
pwps_ie = rtw_get_wps_ie(ie + _FIXED_IE_LENGTH_, ielen - _FIXED_IE_LENGTH_, NULL, &wps_ielen); pwps_ie = rtw_get_wps_ie(ie + _FIXED_IE_LENGTH_, ielen - _FIXED_IE_LENGTH_, NULL, &wps_ielen);
@ -2651,7 +2651,7 @@ static void update_bcn_p2p_ie(_adapter *padapter)
static void update_bcn_vendor_spec_ie(_adapter *padapter, u8 *oui) static void update_bcn_vendor_spec_ie(_adapter *padapter, u8 *oui)
{ {
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
if (_rtw_memcmp(RTW_WPA_OUI, oui, 4)) if (_rtw_memcmp(RTW_WPA_OUI, oui, 4))
update_bcn_wpa_ie(padapter); update_bcn_wpa_ie(padapter);
@ -2674,7 +2674,7 @@ void _update_beacon(_adapter *padapter, u8 ie_id, u8 *oui, u8 tx, const char *ta
struct mlme_ext_priv *pmlmeext; struct mlme_ext_priv *pmlmeext;
/* struct mlme_ext_info *pmlmeinfo; */ /* struct mlme_ext_info *pmlmeinfo; */
/* RTW_INFO("%s\n", __FUNCTION__); */ /* RTW_INFO("%s\n", __func__); */
if (!padapter) if (!padapter)
return; return;
@ -2881,7 +2881,7 @@ int rtw_ht_operation_update(_adapter *padapter)
return 0;*/ return 0;*/
RTW_INFO("%s current operation mode=0x%X\n", RTW_INFO("%s current operation mode=0x%X\n",
__FUNCTION__, pmlmepriv->ht_op_mode); __func__, pmlmepriv->ht_op_mode);
if (!(pmlmepriv->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT) if (!(pmlmepriv->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT)
&& pmlmepriv->num_sta_ht_no_gf) { && pmlmepriv->num_sta_ht_no_gf) {
@ -2932,7 +2932,7 @@ int rtw_ht_operation_update(_adapter *padapter)
} }
RTW_INFO("%s new operation mode=0x%X changes=%d\n", RTW_INFO("%s new operation mode=0x%X changes=%d\n",
__FUNCTION__, pmlmepriv->ht_op_mode, op_mode_changes); __func__, pmlmepriv->ht_op_mode, op_mode_changes);
return op_mode_changes; return op_mode_changes;
@ -3111,7 +3111,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
} }
RTW_INFO("%s STA " MAC_FMT " - no " RTW_INFO("%s STA " MAC_FMT " - no "
"greenfield, num of non-gf stations %d\n", "greenfield, num of non-gf stations %d\n",
__FUNCTION__, MAC_ARG(psta->hwaddr), __func__, MAC_ARG(psta->hwaddr),
pmlmepriv->num_sta_ht_no_gf); pmlmepriv->num_sta_ht_no_gf);
} }
@ -3122,7 +3122,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
} }
RTW_INFO("%s STA " MAC_FMT " - 20 MHz HT, " RTW_INFO("%s STA " MAC_FMT " - 20 MHz HT, "
"num of 20MHz HT STAs %d\n", "num of 20MHz HT STAs %d\n",
__FUNCTION__, MAC_ARG(psta->hwaddr), __func__, MAC_ARG(psta->hwaddr),
pmlmepriv->num_sta_ht_20mhz); pmlmepriv->num_sta_ht_20mhz);
} }
@ -3134,7 +3134,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
if (pmlmepriv->htpriv.ht_option == _TRUE) { if (pmlmepriv->htpriv.ht_option == _TRUE) {
RTW_INFO("%s STA " MAC_FMT RTW_INFO("%s STA " MAC_FMT
" - no HT, num of non-HT stations %d\n", " - no HT, num of non-HT stations %d\n",
__FUNCTION__, MAC_ARG(psta->hwaddr), __func__, MAC_ARG(psta->hwaddr),
pmlmepriv->num_sta_no_ht); pmlmepriv->num_sta_no_ht);
} }
} }

166
core/rtw_beamforming.c
View file

@ -53,7 +53,7 @@ static void _get_txvector_parameter(PADAPTER adapter, struct sta_info *sta, u8 *
aid = sta->aid; aid = sta->aid;
bssid = adapter_mac_addr(adapter); bssid = adapter_mac_addr(adapter);
RTW_INFO("%s: AID=0x%x BSSID=" MAC_FMT "\n", RTW_INFO("%s: AID=0x%x BSSID=" MAC_FMT "\n",
__FUNCTION__, sta->aid, MAC_ARG(bssid)); __func__, sta->aid, MAC_ARG(bssid));
/* AID[0:8] */ /* AID[0:8] */
aid &= 0x1FF; aid &= 0x1FF;
@ -76,7 +76,7 @@ static void _get_txvector_parameter(PADAPTER adapter, struct sta_info *sta, u8 *
} else { } else {
/* Addressed to AP */ /* Addressed to AP */
bssid = sta->hwaddr; bssid = sta->hwaddr;
RTW_INFO("%s: BSSID=" MAC_FMT "\n", __FUNCTION__, MAC_ARG(bssid)); RTW_INFO("%s: BSSID=" MAC_FMT "\n", __func__, MAC_ARG(bssid));
/* BSSID[39:47] */ /* BSSID[39:47] */
*p_aid = (bssid[5] << 1) | (bssid[4] >> 7); *p_aid = (bssid[5] << 1) | (bssid[4] >> 7);
@ -84,7 +84,7 @@ static void _get_txvector_parameter(PADAPTER adapter, struct sta_info *sta, u8 *
} }
RTW_INFO("%s: GROUP_ID=0x%02x PARTIAL_AID=0x%04x\n", RTW_INFO("%s: GROUP_ID=0x%02x PARTIAL_AID=0x%04x\n",
__FUNCTION__, *g_id, *p_aid); __func__, *g_id, *p_aid);
} }
/* /*
@ -188,20 +188,20 @@ static u8 _send_ht_ndpa_packet(PADAPTER adapter, u8 *ra, CHANNEL_WIDTH bw)
u8 aSifsTime = 0; u8 aSifsTime = 0;
RTW_INFO("+%s: Send to " MAC_FMT "\n", __FUNCTION__, MAC_ARG(ra)); RTW_INFO("+%s: Send to " MAC_FMT "\n", __func__, MAC_ARG(ra));
pxmitpriv = &adapter->xmitpriv; pxmitpriv = &adapter->xmitpriv;
pmlmeext = &adapter->mlmeextpriv; pmlmeext = &adapter->mlmeextpriv;
pmlmeinfo = &pmlmeext->mlmext_info; pmlmeinfo = &pmlmeext->mlmext_info;
bfee = rtw_bf_bfee_get_entry_by_addr(adapter, ra); bfee = rtw_bf_bfee_get_entry_by_addr(adapter, ra);
if (!bfee) { if (!bfee) {
RTW_ERR("%s: Cann't find beamformee entry!\n", __FUNCTION__); RTW_ERR("%s: Cann't find beamformee entry!\n", __func__);
return _FALSE; return _FALSE;
} }
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (!pmgntframe) { if (!pmgntframe) {
RTW_ERR("%s: alloc mgnt frame fail!\n", __FUNCTION__); RTW_ERR("%s: alloc mgnt frame fail!\n", __func__);
return _FALSE; return _FALSE;
} }
@ -284,20 +284,20 @@ static u8 _send_vht_ndpa_packet(PADAPTER adapter, u8 *ra, u16 aid, CHANNEL_WIDTH
u8 sequence = 0, aSifsTime = 0; u8 sequence = 0, aSifsTime = 0;
RTW_INFO("+%s: Send to " MAC_FMT "\n", __FUNCTION__, MAC_ARG(ra)); RTW_INFO("+%s: Send to " MAC_FMT "\n", __func__, MAC_ARG(ra));
pxmitpriv = &adapter->xmitpriv; pxmitpriv = &adapter->xmitpriv;
pmlmeext = &adapter->mlmeextpriv; pmlmeext = &adapter->mlmeextpriv;
info = GET_BEAMFORM_INFO(adapter); info = GET_BEAMFORM_INFO(adapter);
bfee = rtw_bf_bfee_get_entry_by_addr(adapter, ra); bfee = rtw_bf_bfee_get_entry_by_addr(adapter, ra);
if (!bfee) { if (!bfee) {
RTW_ERR("%s: Cann't find beamformee entry!\n", __FUNCTION__); RTW_ERR("%s: Cann't find beamformee entry!\n", __func__);
return _FALSE; return _FALSE;
} }
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (!pmgntframe) { if (!pmgntframe) {
RTW_ERR("%s: alloc mgnt frame fail!\n", __FUNCTION__); RTW_ERR("%s: alloc mgnt frame fail!\n", __func__);
return _FALSE; return _FALSE;
} }
@ -393,7 +393,7 @@ static u8 _send_vht_mu_ndpa_packet(PADAPTER adapter, CHANNEL_WIDTH bw)
u8 i; u8 i;
RTW_INFO("+%s\n", __FUNCTION__); RTW_INFO("+%s\n", __func__);
pxmitpriv = &adapter->xmitpriv; pxmitpriv = &adapter->xmitpriv;
pmlmeext = &adapter->mlmeextpriv; pmlmeext = &adapter->mlmeextpriv;
@ -412,7 +412,7 @@ static u8 _send_vht_mu_ndpa_packet(PADAPTER adapter, CHANNEL_WIDTH bw)
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (!pmgntframe) { if (!pmgntframe) {
RTW_ERR("%s: alloc mgnt frame fail!\n", __FUNCTION__); RTW_ERR("%s: alloc mgnt frame fail!\n", __func__);
return _FALSE; return _FALSE;
} }
@ -499,13 +499,13 @@ static u8 _send_bf_report_poll(PADAPTER adapter, u8 *ra, u8 bFinalPoll)
u8 *pframe; u8 *pframe;
RTW_INFO("+%s: Send to " MAC_FMT "\n", __FUNCTION__, MAC_ARG(ra)); RTW_INFO("+%s: Send to " MAC_FMT "\n", __func__, MAC_ARG(ra));
pxmitpriv = &adapter->xmitpriv; pxmitpriv = &adapter->xmitpriv;
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (!pmgntframe) { if (!pmgntframe) {
RTW_ERR("%s: alloc mgnt frame fail!\n", __FUNCTION__); RTW_ERR("%s: alloc mgnt frame fail!\n", __func__);
return _FALSE; return _FALSE;
} }
@ -646,7 +646,7 @@ static int _sounding_get_list(PADAPTER adapter)
continue; continue;
if (bfee->state != BEAMFORM_ENTRY_HW_STATE_ADDED) { if (bfee->state != BEAMFORM_ENTRY_HW_STATE_ADDED) {
RTW_ERR("%s: Invalid BFee idx(%d) Hw state=%d\n", __FUNCTION__, i, bfee->state); RTW_ERR("%s: Invalid BFee idx(%d) Hw state=%d\n", __func__, i, bfee->state);
not_ready++; not_ready++;
continue; continue;
} }
@ -671,7 +671,7 @@ static int _sounding_get_list(PADAPTER adapter)
if (bfee->cap & BEAMFORMEE_CAP_VHT_MU) { if (bfee->cap & BEAMFORMEE_CAP_VHT_MU) {
/* MU BFee */ /* MU BFee */
if (mu_idx >= MAX_NUM_BEAMFORMEE_MU) { if (mu_idx >= MAX_NUM_BEAMFORMEE_MU) {
RTW_ERR("%s: Too much MU bfee entry(Limit:%d)\n", __FUNCTION__, MAX_NUM_BEAMFORMEE_MU); RTW_ERR("%s: Too much MU bfee entry(Limit:%d)\n", __func__, MAX_NUM_BEAMFORMEE_MU);
continue; continue;
} }
@ -684,7 +684,7 @@ static int _sounding_get_list(PADAPTER adapter)
} else if (bfee->cap & (BEAMFORMEE_CAP_VHT_SU|BEAMFORMEE_CAP_HT_EXPLICIT)) { } else if (bfee->cap & (BEAMFORMEE_CAP_VHT_SU|BEAMFORMEE_CAP_HT_EXPLICIT)) {
/* SU BFee (HT/VHT) */ /* SU BFee (HT/VHT) */
if (su_idx >= MAX_NUM_BEAMFORMEE_SU) { if (su_idx >= MAX_NUM_BEAMFORMEE_SU) {
RTW_ERR("%s: Too much SU bfee entry(Limit:%d)\n", __FUNCTION__, MAX_NUM_BEAMFORMEE_SU); RTW_ERR("%s: Too much SU bfee entry(Limit:%d)\n", __func__, MAX_NUM_BEAMFORMEE_SU);
continue; continue;
} }
@ -709,7 +709,7 @@ static int _sounding_get_list(PADAPTER adapter)
ret = -2; ret = -2;
} }
RTW_INFO("-%s: There are %d SU and %d MU BFees in this sounding period\n", __FUNCTION__, su_idx, mu_idx); RTW_INFO("-%s: There are %d SU and %d MU BFees in this sounding period\n", __func__, su_idx, mu_idx);
return ret; return ret;
} }
@ -729,17 +729,17 @@ static void _sounding_handler(PADAPTER adapter)
info = GET_BEAMFORM_INFO(adapter); info = GET_BEAMFORM_INFO(adapter);
sounding = &info->sounding_info; sounding = &info->sounding_info;
RTW_DBG("+%s: state=%d\n", __FUNCTION__, sounding->state); RTW_DBG("+%s: state=%d\n", __func__, sounding->state);
if ((sounding->state != SOUNDING_STATE_INIT) if ((sounding->state != SOUNDING_STATE_INIT)
&& (sounding->state != SOUNDING_STATE_SU_SOUNDDOWN) && (sounding->state != SOUNDING_STATE_SU_SOUNDDOWN)
&& (sounding->state != SOUNDING_STATE_MU_SOUNDDOWN) && (sounding->state != SOUNDING_STATE_MU_SOUNDDOWN)
&& (sounding->state != SOUNDING_STATE_SOUNDING_TIMEOUT)) { && (sounding->state != SOUNDING_STATE_SOUNDING_TIMEOUT)) {
RTW_WARN("%s: Invalid State(%d) and return!\n", __FUNCTION__, sounding->state); RTW_WARN("%s: Invalid State(%d) and return!\n", __func__, sounding->state);
return; return;
} }
if (sounding->state == SOUNDING_STATE_INIT) { if (sounding->state == SOUNDING_STATE_INIT) {
RTW_INFO("%s: Sounding start\n", __FUNCTION__); RTW_INFO("%s: Sounding start\n", __func__);
/* Init Var */ /* Init Var */
_sounding_reset_vars(adapter); _sounding_reset_vars(adapter);
@ -749,25 +749,25 @@ static void _sounding_handler(PADAPTER adapter)
if (ret == -1) { if (ret == -1) {
wait_cnt = 0; wait_cnt = 0;
sounding->state = SOUNDING_STATE_NONE; sounding->state = SOUNDING_STATE_NONE;
RTW_ERR("%s: No BFees found, set to SOUNDING_STATE_NONE\n", __FUNCTION__); RTW_ERR("%s: No BFees found, set to SOUNDING_STATE_NONE\n", __func__);
info->sounding_running--; info->sounding_running--;
return; return;
} }
if (ret == -2) { if (ret == -2) {
RTW_WARN("%s: Temporarily cann't find BFee to sounding\n", __FUNCTION__); RTW_WARN("%s: Temporarily cann't find BFee to sounding\n", __func__);
if (wait_cnt < 5) { if (wait_cnt < 5) {
wait_cnt++; wait_cnt++;
} else { } else {
wait_cnt = 0; wait_cnt = 0;
sounding->state = SOUNDING_STATE_NONE; sounding->state = SOUNDING_STATE_NONE;
RTW_ERR("%s: Wait changing state timeout!! Set to SOUNDING_STATE_NONE\n", __FUNCTION__); RTW_ERR("%s: Wait changing state timeout!! Set to SOUNDING_STATE_NONE\n", __func__);
} }
info->sounding_running--; info->sounding_running--;
return; return;
} }
if (ret != 0) { if (ret != 0) {
wait_cnt = 0; wait_cnt = 0;
RTW_ERR("%s: Unkown state(%d)!\n", __FUNCTION__, ret); RTW_ERR("%s: Unkown state(%d)!\n", __func__, ret);
info->sounding_running--; info->sounding_running--;
return; return;
@ -776,7 +776,7 @@ static void _sounding_handler(PADAPTER adapter)
wait_cnt = 0; wait_cnt = 0;
if (check_fwstate(&adapter->mlmepriv, WIFI_SITE_MONITOR) == _TRUE) { if (check_fwstate(&adapter->mlmepriv, WIFI_SITE_MONITOR) == _TRUE) {
RTW_INFO("%s: Sounding abort! scanning APs...\n", __FUNCTION__); RTW_INFO("%s: Sounding abort! scanning APs...\n", __func__);
info->sounding_running--; info->sounding_running--;
return; return;
} }
@ -798,7 +798,7 @@ static void _sounding_handler(PADAPTER adapter)
sounding->su_bfee_curidx = su_idx; sounding->su_bfee_curidx = su_idx;
/* Set to sounding start state */ /* Set to sounding start state */
sounding->state = SOUNDING_STATE_SU_START; sounding->state = SOUNDING_STATE_SU_START;
RTW_DBG("%s: Set to SOUNDING_STATE_SU_START\n", __FUNCTION__); RTW_DBG("%s: Set to SOUNDING_STATE_SU_START\n", __func__);
bfee->sounding = _TRUE; bfee->sounding = _TRUE;
/* Reset sounding timeout flag for the new sounding */ /* Reset sounding timeout flag for the new sounding */
@ -828,7 +828,7 @@ static void _sounding_handler(PADAPTER adapter)
* <tynli_note> Need to check the MU starting condition. 2015.12.15. * <tynli_note> Need to check the MU starting condition. 2015.12.15.
*/ */
sounding->state = SOUNDING_STATE_MU_START; sounding->state = SOUNDING_STATE_MU_START;
RTW_DBG("%s: Set to SOUNDING_STATE_MU_START\n", __FUNCTION__); RTW_DBG("%s: Set to SOUNDING_STATE_MU_START\n", __func__);
/* Update MU BFee info */ /* Update MU BFee info */
for (i = 0; i < sounding->candidate_mu_bfee_cnt; i++) { for (i = 0; i < sounding->candidate_mu_bfee_cnt; i++) {
@ -859,7 +859,7 @@ static void _sounding_handler(PADAPTER adapter)
info->sounding_running--; info->sounding_running--;
sounding->state = SOUNDING_STATE_INIT; sounding->state = SOUNDING_STATE_INIT;
RTW_INFO("%s: Sounding finished!\n", __FUNCTION__); RTW_INFO("%s: Sounding finished!\n", __func__);
rtw_ps_deny_cancel(adapter, PS_DENY_BEAMFORMING); rtw_ps_deny_cancel(adapter, PS_DENY_BEAMFORMING);
} }
@ -883,7 +883,7 @@ static void _sounding_force_stop(PADAPTER adapter)
info->sounding_running--; info->sounding_running--;
sounding->state = SOUNDING_STATE_INIT; sounding->state = SOUNDING_STATE_INIT;
RTW_INFO("%s: Sounding finished!\n", __FUNCTION__); RTW_INFO("%s: Sounding finished!\n", __func__);
rtw_ps_deny_cancel(adapter, PS_DENY_BEAMFORMING); rtw_ps_deny_cancel(adapter, PS_DENY_BEAMFORMING);
} }
@ -895,17 +895,17 @@ static void _sounding_timer_handler(void *FunctionContext)
static u8 delay = 0; static u8 delay = 0;
RTW_DBG("+%s\n", __FUNCTION__); RTW_DBG("+%s\n", __func__);
adapter = (PADAPTER)FunctionContext; adapter = (PADAPTER)FunctionContext;
info = GET_BEAMFORM_INFO(adapter); info = GET_BEAMFORM_INFO(adapter);
sounding = &info->sounding_info; sounding = &info->sounding_info;
if (SOUNDING_STATE_NONE == sounding->state) { if (SOUNDING_STATE_NONE == sounding->state) {
RTW_INFO("%s: Stop!\n", __FUNCTION__); RTW_INFO("%s: Stop!\n", __func__);
if (info->sounding_running) if (info->sounding_running)
RTW_WARN("%s: souding_running=%d when thread stop!\n", RTW_WARN("%s: souding_running=%d when thread stop!\n",
__FUNCTION__, info->sounding_running); __func__, info->sounding_running);
return; return;
} }
@ -913,7 +913,7 @@ static void _sounding_timer_handler(void *FunctionContext)
if (!info->sounding_running) { if (!info->sounding_running) {
if (SOUNDING_STATE_INIT != sounding->state) { if (SOUNDING_STATE_INIT != sounding->state) {
RTW_WARN("%s: state(%d) != SOUNDING_STATE_INIT!!\n", __FUNCTION__, sounding->state); RTW_WARN("%s: state(%d) != SOUNDING_STATE_INIT!!\n", __func__, sounding->state);
sounding->state = SOUNDING_STATE_INIT; sounding->state = SOUNDING_STATE_INIT;
} }
delay = 0; delay = 0;
@ -923,9 +923,9 @@ static void _sounding_timer_handler(void *FunctionContext)
if (delay != 0xFF) if (delay != 0xFF)
delay++; delay++;
RTW_WARN("%s: souding is still processing...(state:%d, running:%d, delay:%d)\n", RTW_WARN("%s: souding is still processing...(state:%d, running:%d, delay:%d)\n",
__FUNCTION__, sounding->state, info->sounding_running, delay); __func__, sounding->state, info->sounding_running, delay);
if (delay > 3) { if (delay > 3) {
RTW_WARN("%s: Stop sounding!!\n", __FUNCTION__); RTW_WARN("%s: Stop sounding!!\n", __func__);
_sounding_force_stop(adapter); _sounding_force_stop(adapter);
} }
} }
@ -939,7 +939,7 @@ static void _sounding_timeout_timer_handler(void *FunctionContext)
struct beamformee_entry *bfee; struct beamformee_entry *bfee;
RTW_WARN("+%s\n", __FUNCTION__); RTW_WARN("+%s\n", __func__);
adapter = (PADAPTER)FunctionContext; adapter = (PADAPTER)FunctionContext;
info = GET_BEAMFORM_INFO(adapter); info = GET_BEAMFORM_INFO(adapter);
@ -947,16 +947,16 @@ static void _sounding_timeout_timer_handler(void *FunctionContext)
if (SOUNDING_STATE_SU_START == sounding->state) { if (SOUNDING_STATE_SU_START == sounding->state) {
sounding->state = SOUNDING_STATE_SOUNDING_TIMEOUT; sounding->state = SOUNDING_STATE_SOUNDING_TIMEOUT;
RTW_ERR("%s: Set to SU SOUNDING_STATE_SOUNDING_TIMEOUT\n", __FUNCTION__); RTW_ERR("%s: Set to SU SOUNDING_STATE_SOUNDING_TIMEOUT\n", __func__);
/* SU BFee */ /* SU BFee */
bfee = &info->bfee_entry[sounding->su_bfee_curidx]; bfee = &info->bfee_entry[sounding->su_bfee_curidx];
bfee->bSoundingTimeout = _TRUE; bfee->bSoundingTimeout = _TRUE;
RTW_WARN("%s: The BFee entry[%d] is Sounding Timeout!\n", __FUNCTION__, sounding->su_bfee_curidx); RTW_WARN("%s: The BFee entry[%d] is Sounding Timeout!\n", __func__, sounding->su_bfee_curidx);
} else if (SOUNDING_STATE_MU_START == sounding->state) { } else if (SOUNDING_STATE_MU_START == sounding->state) {
sounding->state = SOUNDING_STATE_SOUNDING_TIMEOUT; sounding->state = SOUNDING_STATE_SOUNDING_TIMEOUT;
RTW_ERR("%s: Set to MU SOUNDING_STATE_SOUNDING_TIMEOUT\n", __FUNCTION__); RTW_ERR("%s: Set to MU SOUNDING_STATE_SOUNDING_TIMEOUT\n", __func__);
} else { } else {
RTW_WARN("%s: unexpected sounding state:0x%02x\n", __FUNCTION__, sounding->state); RTW_WARN("%s: unexpected sounding state:0x%02x\n", __func__, sounding->state);
return; return;
} }
@ -1044,7 +1044,7 @@ static struct beamformer_entry *_bfer_add_entry(PADAPTER adapter,
} }
} }
RTW_INFO("%s: Add BFer entry beamformer_su_reg_maping=%#x, su_reg_index=%d\n", RTW_INFO("%s: Add BFer entry beamformer_su_reg_maping=%#x, su_reg_index=%d\n",
__FUNCTION__, info->beamformer_su_reg_maping, bfer->su_reg_index); __func__, info->beamformer_su_reg_maping, bfer->su_reg_index);
} }
return bfer; return bfer;
@ -1080,7 +1080,7 @@ static u8 _bfer_set_entry_gid(PADAPTER adapter, u8 *addr, u8 *gid, u8 *position)
bfer = _bfer_get_entry_by_addr(adapter, addr); bfer = _bfer_get_entry_by_addr(adapter, addr);
if (!bfer) { if (!bfer) {
RTW_INFO("%s: Cannot find BFer entry!!\n", __FUNCTION__); RTW_INFO("%s: Cannot find BFer entry!!\n", __func__);
return _FAIL; return _FAIL;
} }
@ -1251,7 +1251,7 @@ static struct beamformee_entry *_bfee_add_entry(PADAPTER adapter,
info->TargetSUBFee->bSuspendSUCap = _TRUE; info->TargetSUBFee->bSuspendSUCap = _TRUE;
info->TargetSUBFee->bDeleteSounding = _TRUE; info->TargetSUBFee->bDeleteSounding = _TRUE;
} else { } else {
RTW_ERR("%s: UNEXPECTED!! info->TargetSUBFee is NULL!", __FUNCTION__); RTW_ERR("%s: UNEXPECTED!! info->TargetSUBFee is NULL!", __func__);
} }
info->TargetSUBFee = NULL; info->TargetSUBFee = NULL;
_rtw_memset(&info->TargetCSIInfo, 0, sizeof(struct _RT_CSI_INFO)); _rtw_memset(&info->TargetCSIInfo, 0, sizeof(struct _RT_CSI_INFO));
@ -1268,7 +1268,7 @@ static struct beamformee_entry *_bfee_add_entry(PADAPTER adapter,
} }
} }
RTW_INFO("%s: Add BFee entry beamformee_mu_reg_maping=%#x, mu_reg_index=%d\n", RTW_INFO("%s: Add BFee entry beamformee_mu_reg_maping=%#x, mu_reg_index=%d\n",
__FUNCTION__, info->beamformee_mu_reg_maping, bfee->mu_reg_index); __func__, info->beamformee_mu_reg_maping, bfee->mu_reg_index);
} else if (TEST_FLAG(bf_cap, BEAMFORMEE_CAP_VHT_SU|BEAMFORMEE_CAP_HT_EXPLICIT)) { } else if (TEST_FLAG(bf_cap, BEAMFORMEE_CAP_VHT_SU|BEAMFORMEE_CAP_HT_EXPLICIT)) {
info->beamformee_su_cnt += 1; info->beamformee_su_cnt += 1;
@ -1293,7 +1293,7 @@ static struct beamformee_entry *_bfee_add_entry(PADAPTER adapter,
} }
} }
RTW_INFO("%s: Add BFee entry beamformee_su_reg_maping=%#x, su_reg_index=%d\n", RTW_INFO("%s: Add BFee entry beamformee_su_reg_maping=%#x, su_reg_index=%d\n",
__FUNCTION__, info->beamformee_su_reg_maping, bfee->su_reg_index); __func__, info->beamformee_su_reg_maping, bfee->su_reg_index);
} }
return bfee; return bfee;
@ -1392,19 +1392,19 @@ static void _beamforming_enter(PADAPTER adapter, void *p)
sta = rtw_get_stainfo(&adapter->stapriv, sta_copy->hwaddr); sta = rtw_get_stainfo(&adapter->stapriv, sta_copy->hwaddr);
if (!sta) { if (!sta) {
RTW_ERR("%s: Cann't find STA info for " MAC_FMT "\n", RTW_ERR("%s: Cann't find STA info for " MAC_FMT "\n",
__FUNCTION__, MAC_ARG(sta_copy->hwaddr)); __func__, MAC_ARG(sta_copy->hwaddr));
return; return;
} }
if (sta != sta_copy) { if (sta != sta_copy) {
RTW_WARN("%s: Origin sta(fake)=%p realsta=%p for " MAC_FMT "\n", RTW_WARN("%s: Origin sta(fake)=%p realsta=%p for " MAC_FMT "\n",
__FUNCTION__, sta_copy, sta, MAC_ARG(sta_copy->hwaddr)); __func__, sta_copy, sta, MAC_ARG(sta_copy->hwaddr));
} }
/* The current setting does not support Beaforming */ /* The current setting does not support Beaforming */
wireless_mode = sta->wireless_mode; wireless_mode = sta->wireless_mode;
if ((is_supported_ht(wireless_mode) == _FALSE) if ((is_supported_ht(wireless_mode) == _FALSE)
&& (is_supported_vht(wireless_mode) == _FALSE)) { && (is_supported_vht(wireless_mode) == _FALSE)) {
RTW_WARN("%s: Not support HT or VHT mode\n", __FUNCTION__); RTW_WARN("%s: Not support HT or VHT mode\n", __func__);
return; return;
} }
@ -1435,13 +1435,13 @@ static void _beamforming_enter(PADAPTER adapter, void *p)
/* The other side is beamformer */ /* The other side is beamformer */
bfer = _bfer_add_entry(adapter, sta, sta_bf_cap, sounding_dim, comp_steering_num); bfer = _bfer_add_entry(adapter, sta, sta_bf_cap, sounding_dim, comp_steering_num);
if (!bfer) if (!bfer)
RTW_ERR("%s: Fail to allocate bfer entry!\n", __FUNCTION__); RTW_ERR("%s: Fail to allocate bfer entry!\n", __func__);
} }
if (sta_bf_cap & BEAMFORMEE_CAP) { if (sta_bf_cap & BEAMFORMEE_CAP) {
/* The other side is beamformee */ /* The other side is beamformee */
bfee = _bfee_add_entry(adapter, sta, sta_bf_cap, sounding_dim, comp_steering_num); bfee = _bfee_add_entry(adapter, sta, sta_bf_cap, sounding_dim, comp_steering_num);
if (!bfee) if (!bfee)
RTW_ERR("%s: Fail to allocate bfee entry!\n", __FUNCTION__); RTW_ERR("%s: Fail to allocate bfee entry!\n", __func__);
} }
if (!bfer && !bfee) if (!bfer && !bfee)
return; return;
@ -1461,7 +1461,7 @@ static void _beamforming_enter(PADAPTER adapter, void *p)
static void _beamforming_reset(PADAPTER adapter) static void _beamforming_reset(PADAPTER adapter)
{ {
RTW_ERR("%s: Not ready!!\n", __FUNCTION__); RTW_ERR("%s: Not ready!!\n", __func__);
} }
static void _beamforming_leave(PADAPTER adapter, u8 *ra) static void _beamforming_leave(PADAPTER adapter, u8 *ra)
@ -1472,7 +1472,7 @@ static void _beamforming_leave(PADAPTER adapter, u8 *ra)
u8 bHwStateAddInit = _FALSE; u8 bHwStateAddInit = _FALSE;
RTW_INFO("+%s\n", __FUNCTION__); RTW_INFO("+%s\n", __func__);
info = GET_BEAMFORM_INFO(adapter); info = GET_BEAMFORM_INFO(adapter);
bfer = _bfer_get_entry_by_addr(adapter, ra); bfer = _bfer_get_entry_by_addr(adapter, ra);
@ -1480,7 +1480,7 @@ static void _beamforming_leave(PADAPTER adapter, u8 *ra)
if (!bfer && !bfee) { if (!bfer && !bfee) {
RTW_WARN("%s: " MAC_FMT " is neither beamforming ee or er!!\n", RTW_WARN("%s: " MAC_FMT " is neither beamforming ee or er!!\n",
__FUNCTION__, MAC_ARG(ra)); __func__, MAC_ARG(ra));
return; return;
} }
@ -1500,7 +1500,7 @@ static void _beamforming_leave(PADAPTER adapter, u8 *ra)
_sounding_init(&info->sounding_info); _sounding_init(&info->sounding_info);
} }
RTW_INFO("-%s\n", __FUNCTION__); RTW_INFO("-%s\n", __func__);
} }
static void _beamforming_sounding_down(PADAPTER adapter, u8 status) static void _beamforming_sounding_down(PADAPTER adapter, u8 status)
@ -1513,19 +1513,19 @@ static void _beamforming_sounding_down(PADAPTER adapter, u8 status)
info = GET_BEAMFORM_INFO(adapter); info = GET_BEAMFORM_INFO(adapter);
sounding = &info->sounding_info; sounding = &info->sounding_info;
RTW_INFO("+%s: sounding=%d, status=0x%02x\n", __FUNCTION__, sounding->state, status); RTW_INFO("+%s: sounding=%d, status=0x%02x\n", __func__, sounding->state, status);
if (sounding->state == SOUNDING_STATE_MU_START) { if (sounding->state == SOUNDING_STATE_MU_START) {
RTW_INFO("%s: MU sounding done\n", __FUNCTION__); RTW_INFO("%s: MU sounding done\n", __func__);
sounding->state = SOUNDING_STATE_MU_SOUNDDOWN; sounding->state = SOUNDING_STATE_MU_SOUNDDOWN;
RTW_INFO("%s: Set to SOUNDING_STATE_MU_SOUNDDOWN\n", __FUNCTION__); RTW_INFO("%s: Set to SOUNDING_STATE_MU_SOUNDDOWN\n", __func__);
info->SetHalSoundownOnDemandCnt++; info->SetHalSoundownOnDemandCnt++;
rtw_hal_set_hwreg(adapter, HW_VAR_SOUNDING_STATUS, &status); rtw_hal_set_hwreg(adapter, HW_VAR_SOUNDING_STATUS, &status);
} else if (sounding->state == SOUNDING_STATE_SU_START) { } else if (sounding->state == SOUNDING_STATE_SU_START) {
RTW_INFO("%s: SU entry[%d] sounding down\n", __FUNCTION__, sounding->su_bfee_curidx); RTW_INFO("%s: SU entry[%d] sounding down\n", __func__, sounding->su_bfee_curidx);
bfee = &info->bfee_entry[sounding->su_bfee_curidx]; bfee = &info->bfee_entry[sounding->su_bfee_curidx];
sounding->state = SOUNDING_STATE_SU_SOUNDDOWN; sounding->state = SOUNDING_STATE_SU_SOUNDDOWN;
RTW_INFO("%s: Set to SOUNDING_STATE_SU_SOUNDDOWN\n", __FUNCTION__); RTW_INFO("%s: Set to SOUNDING_STATE_SU_SOUNDDOWN\n", __func__);
/* /*
* <tynli_note> * <tynli_note>
@ -1534,7 +1534,7 @@ static void _beamforming_sounding_down(PADAPTER adapter, u8 status)
* 2015.12.10 * 2015.12.10
*/ */
if (_TRUE == bfee->bSoundingTimeout) { if (_TRUE == bfee->bSoundingTimeout) {
RTW_WARN("%s: The entry[%d] is bSoundingTimeout!\n", __FUNCTION__, sounding->su_bfee_curidx); RTW_WARN("%s: The entry[%d] is bSoundingTimeout!\n", __func__, sounding->su_bfee_curidx);
bfee->bSoundingTimeout = _FALSE; bfee->bSoundingTimeout = _FALSE;
return; return;
} }
@ -1545,19 +1545,19 @@ static void _beamforming_sounding_down(PADAPTER adapter, u8 status)
info->SetHalSoundownOnDemandCnt++; info->SetHalSoundownOnDemandCnt++;
rtw_hal_set_hwreg(adapter, HW_VAR_SOUNDING_STATUS, &status); rtw_hal_set_hwreg(adapter, HW_VAR_SOUNDING_STATUS, &status);
} else if (_TRUE == bfee->bDeleteSounding) { } else if (_TRUE == bfee->bDeleteSounding) {
RTW_WARN("%s: Delete entry[%d] sounding info!\n", __FUNCTION__, sounding->su_bfee_curidx); RTW_WARN("%s: Delete entry[%d] sounding info!\n", __func__, sounding->su_bfee_curidx);
rtw_hal_set_hwreg(adapter, HW_VAR_SOUNDING_STATUS, &status); rtw_hal_set_hwreg(adapter, HW_VAR_SOUNDING_STATUS, &status);
bfee->bDeleteSounding = _FALSE; bfee->bDeleteSounding = _FALSE;
} else { } else {
bfee->LogStatusFailCnt++; bfee->LogStatusFailCnt++;
RTW_WARN("%s: LogStatusFailCnt=%d\n", __FUNCTION__, bfee->LogStatusFailCnt); RTW_WARN("%s: LogStatusFailCnt=%d\n", __func__, bfee->LogStatusFailCnt);
if (bfee->LogStatusFailCnt > 30) { if (bfee->LogStatusFailCnt > 30) {
RTW_ERR("%s: LogStatusFailCnt > 30, Stop SOUNDING!!\n", __FUNCTION__); RTW_ERR("%s: LogStatusFailCnt > 30, Stop SOUNDING!!\n", __func__);
rtw_bf_cmd(adapter, BEAMFORMING_CTRL_LEAVE, bfee->mac_addr, ETH_ALEN, 1); rtw_bf_cmd(adapter, BEAMFORMING_CTRL_LEAVE, bfee->mac_addr, ETH_ALEN, 1);
} }
} }
} else { } else {
RTW_WARN("%s: unexpected sounding state:0x%02x\n", __FUNCTION__, sounding->state); RTW_WARN("%s: unexpected sounding state:0x%02x\n", __func__, sounding->state);
return; return;
} }
@ -1576,7 +1576,7 @@ static void _c2h_snd_txbf(PADAPTER adapter, u8 *buf, u8 buf_len)
_cancel_timer(&info->sounding_timeout_timer, &cancelled); _cancel_timer(&info->sounding_timeout_timer, &cancelled);
res = C2H_SND_TXBF_GET_SND_RESULT(buf) ? _TRUE : _FALSE; res = C2H_SND_TXBF_GET_SND_RESULT(buf) ? _TRUE : _FALSE;
RTW_INFO("+%s: %s\n", __FUNCTION__, res==_TRUE?"Success":"Fail!"); RTW_INFO("+%s: %s\n", __func__, res==_TRUE?"Success":"Fail!");
rtw_bf_cmd(adapter, BEAMFORMING_CTRL_END_PERIOD, &res, 1, 1); rtw_bf_cmd(adapter, BEAMFORMING_CTRL_END_PERIOD, &res, 1, 1);
} }
@ -1609,7 +1609,7 @@ struct beamformee_entry *rtw_bf_bfee_get_entry_by_addr(PADAPTER adapter, u8 *ra)
void rtw_bf_get_ndpa_packet(PADAPTER adapter, union recv_frame *precv_frame) void rtw_bf_get_ndpa_packet(PADAPTER adapter, union recv_frame *precv_frame)
{ {
RTW_DBG("+%s\n", __FUNCTION__); RTW_DBG("+%s\n", __func__);
} }
u32 rtw_bf_get_report_packet(PADAPTER adapter, union recv_frame *precv_frame) u32 rtw_bf_get_report_packet(PADAPTER adapter, union recv_frame *precv_frame)
@ -1627,7 +1627,7 @@ u32 rtw_bf_get_report_packet(PADAPTER adapter, union recv_frame *precv_frame)
u16 CSIMatrixLen = 0; u16 CSIMatrixLen = 0;
RTW_INFO("+%s\n", __FUNCTION__); RTW_INFO("+%s\n", __func__);
info = GET_BEAMFORM_INFO(adapter); info = GET_BEAMFORM_INFO(adapter);
pframe = precv_frame->u.hdr.rx_data; pframe = precv_frame->u.hdr.rx_data;
@ -1692,7 +1692,7 @@ u32 rtw_bf_get_report_packet(PADAPTER adapter, union recv_frame *precv_frame)
} }
RTW_INFO("%s: pkt type=%d-%d, Nc=%d, Nr=%d, CH_W=%d, Ng=%d, CodeBook=%d\n", RTW_INFO("%s: pkt type=%d-%d, Nc=%d, Nr=%d, CH_W=%d, Ng=%d, CodeBook=%d\n",
__FUNCTION__, category, action, Nc, Nr, CH_W, Ng, CodeBook); __func__, category, action, Nc, Nr, CH_W, Ng, CodeBook);
return ret; return ret;
} }
@ -1765,7 +1765,7 @@ void rtw_bf_get_vht_gid_mgnt_packet(PADAPTER adapter, union recv_frame *precv_fr
u8 *ta, *gid, *position; u8 *ta, *gid, *position;
RTW_DBG("+%s\n", __FUNCTION__); RTW_DBG("+%s\n", __func__);
pframe = precv_frame->u.hdr.rx_data; pframe = precv_frame->u.hdr.rx_data;
@ -1956,7 +1956,7 @@ void rtw_bf_update_traffic(PADAPTER adapter)
sta = rtw_get_stainfo(&adapter->stapriv, bfee->mac_addr); sta = rtw_get_stainfo(&adapter->stapriv, bfee->mac_addr);
if (!sta) { if (!sta) {
RTW_ERR("%s: Cann't find sta_info for " MAC_FMT "!\n", __FUNCTION__, MAC_ARG(bfee->mac_addr)); RTW_ERR("%s: Cann't find sta_info for " MAC_FMT "!\n", __func__, MAC_ARG(bfee->mac_addr));
continue; continue;
} }
@ -1974,7 +1974,7 @@ void rtw_bf_update_traffic(PADAPTER adapter)
tp[i] = toMbps(tx_bytes, time); tp[i] = toMbps(tx_bytes, time);
tx_rate[i] = rtw_get_current_tx_rate(adapter, bfee->mac_id); tx_rate[i] = rtw_get_current_tx_rate(adapter, bfee->mac_id);
RTW_INFO("%s: BFee idx(%d), MadId(%d), TxTP=%lld bytes (%d Mbps), txrate=%d\n", RTW_INFO("%s: BFee idx(%d), MadId(%d), TxTP=%lld bytes (%d Mbps), txrate=%d\n",
__FUNCTION__, i, bfee->mac_id, tx_bytes, tp[i], tx_rate[i]); __func__, i, bfee->mac_id, tx_bytes, tp[i], tx_rate[i]);
} }
} }
@ -1984,7 +1984,7 @@ void rtw_bf_update_traffic(PADAPTER adapter)
bfee = &info->bfee_entry[i]; bfee = &info->bfee_entry[i];
if (_FALSE == bfee->used) { if (_FALSE == bfee->used) {
if (sounding_idx & BIT(i)) if (sounding_idx & BIT(i))
RTW_WARN("%s: bfee(%d) not in used but need sounding?!\n", __FUNCTION__, i); RTW_WARN("%s: bfee(%d) not in used but need sounding?!\n", __func__, i);
continue; continue;
} }
@ -2633,7 +2633,7 @@ void beamforming_end_fw(PADAPTER adapter)
rtw_hal_set_hwreg(adapter, HW_VAR_SOUNDING_FW_NDPA, (u8 *)&idx); rtw_hal_set_hwreg(adapter, HW_VAR_SOUNDING_FW_NDPA, (u8 *)&idx);
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
} }
BOOLEAN beamforming_start_period(PADAPTER adapter) BOOLEAN beamforming_start_period(PADAPTER adapter)
@ -2652,7 +2652,7 @@ BOOLEAN beamforming_start_period(PADAPTER adapter)
else else
ret = _FALSE; ret = _FALSE;
RTW_INFO("%s Idx %d Mode %d BW %d Period %d\n", __FUNCTION__, RTW_INFO("%s Idx %d Mode %d BW %d Period %d\n", __func__,
pSoundInfo->sound_idx, pSoundInfo->sound_mode, pSoundInfo->sound_bw, pSoundInfo->sound_period); pSoundInfo->sound_idx, pSoundInfo->sound_mode, pSoundInfo->sound_bw, pSoundInfo->sound_period);
return ret; return ret;
@ -2697,9 +2697,9 @@ void beamforming_notify(PADAPTER adapter)
pBeamInfo->beamforming_state = BEAMFORMING_STATE_START; pBeamInfo->beamforming_state = BEAMFORMING_STATE_START;
} }
} else } else
RTW_INFO("%s BeamformState %d\n", __FUNCTION__, pBeamInfo->beamforming_state); RTW_INFO("%s BeamformState %d\n", __func__, pBeamInfo->beamforming_state);
RTW_INFO("%s BeamformState %d bSounding %d\n", __FUNCTION__, pBeamInfo->beamforming_state, bSounding); RTW_INFO("%s BeamformState %d bSounding %d\n", __func__, pBeamInfo->beamforming_state, bSounding);
} }
BOOLEAN beamforming_init_entry(PADAPTER adapter, struct sta_info *psta, u8 *idx) BOOLEAN beamforming_init_entry(PADAPTER adapter, struct sta_info *psta, u8 *idx)
@ -2787,7 +2787,7 @@ BOOLEAN beamforming_init_entry(PADAPTER adapter, struct sta_info *psta, u8 *idx)
psta->txbf_paid = pBeamformEntry->p_aid; psta->txbf_paid = pBeamformEntry->p_aid;
psta->txbf_gid = pBeamformEntry->g_id; psta->txbf_gid = pBeamformEntry->g_id;
RTW_INFO("%s Idx %d\n", __FUNCTION__, *idx); RTW_INFO("%s Idx %d\n", __func__, *idx);
} else } else
return _FALSE; return _FALSE;
@ -2802,7 +2802,7 @@ void beamforming_deinit_entry(PADAPTER adapter, u8 *ra)
if (beamforming_remove_entry(pmlmepriv, ra, &idx) == _TRUE) if (beamforming_remove_entry(pmlmepriv, ra, &idx) == _TRUE)
rtw_hal_set_hwreg(adapter, HW_VAR_SOUNDING_LEAVE, (u8 *)&idx); rtw_hal_set_hwreg(adapter, HW_VAR_SOUNDING_LEAVE, (u8 *)&idx);
RTW_INFO("%s Idx %d\n", __FUNCTION__, idx); RTW_INFO("%s Idx %d\n", __func__, idx);
} }
void beamforming_reset(PADAPTER adapter) void beamforming_reset(PADAPTER adapter)
@ -2820,7 +2820,7 @@ void beamforming_reset(PADAPTER adapter)
} }
} }
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
} }
void beamforming_sounding_fail(PADAPTER Adapter) void beamforming_sounding_fail(PADAPTER Adapter)
@ -2844,10 +2844,10 @@ void beamforming_check_sounding_success(PADAPTER Adapter, BOOLEAN status)
pEntry->LogStatusFailCnt = 0; pEntry->LogStatusFailCnt = 0;
else { else {
pEntry->LogStatusFailCnt++; pEntry->LogStatusFailCnt++;
RTW_INFO("%s LogStatusFailCnt %d\n", __FUNCTION__, pEntry->LogStatusFailCnt); RTW_INFO("%s LogStatusFailCnt %d\n", __func__, pEntry->LogStatusFailCnt);
} }
if (pEntry->LogStatusFailCnt > 20) { if (pEntry->LogStatusFailCnt > 20) {
RTW_INFO("%s LogStatusFailCnt > 20, Stop SOUNDING\n", __FUNCTION__); RTW_INFO("%s LogStatusFailCnt > 20, Stop SOUNDING\n", __func__);
/* pEntry->bSound = _FALSE; */ /* pEntry->bSound = _FALSE; */
/* rtw_hal_set_hwreg(Adapter, HW_VAR_SOUNDING_FW_NDPA, (u8 *)&pBeamInfo->beamforming_cur_idx); */ /* rtw_hal_set_hwreg(Adapter, HW_VAR_SOUNDING_FW_NDPA, (u8 *)&pBeamInfo->beamforming_cur_idx); */
/* beamforming_deinit_entry(Adapter, pEntry->mac_addr); */ /* beamforming_deinit_entry(Adapter, pEntry->mac_addr); */
@ -2862,7 +2862,7 @@ void beamforming_enter(PADAPTER adapter, PVOID psta)
if (beamforming_init_entry(adapter, (struct sta_info *)psta, &idx)) if (beamforming_init_entry(adapter, (struct sta_info *)psta, &idx))
rtw_hal_set_hwreg(adapter, HW_VAR_SOUNDING_ENTER, (u8 *)&idx); rtw_hal_set_hwreg(adapter, HW_VAR_SOUNDING_ENTER, (u8 *)&idx);
/* RTW_INFO("%s Idx %d\n", __FUNCTION__, idx); */ /* RTW_INFO("%s Idx %d\n", __func__, idx); */
} }
void beamforming_leave(PADAPTER adapter, u8 *ra) void beamforming_leave(PADAPTER adapter, u8 *ra)
@ -2948,7 +2948,7 @@ u32 rtw_beamforming_get_report_frame(PADAPTER Adapter, union recv_frame *precv_
else else
return ret; return ret;
/*RTW_INFO("%s MacId %d offset=%d\n", __FUNCTION__, pBeamformEntry->mac_id, offset);*/ /*RTW_INFO("%s MacId %d offset=%d\n", __func__, pBeamformEntry->mac_id, offset);*/
if (_rtw_memcmp(pBeamformEntry->PreCsiReport + offset, pframe + offset, frame_len - offset) == _FALSE) if (_rtw_memcmp(pBeamformEntry->PreCsiReport + offset, pframe + offset, frame_len - offset) == _FALSE)
pBeamformEntry->DefaultCsiCnt = 0; pBeamformEntry->DefaultCsiCnt = 0;

8
core/rtw_cmd.c
View file

@ -270,7 +270,7 @@ sint _rtw_enqueue_cmd(_queue *queue, struct cmd_obj *obj, bool to_head)
#ifdef DBG_CMD_QUEUE #ifdef DBG_CMD_QUEUE
if (dump_cmd_id) { if (dump_cmd_id) {
RTW_INFO("%s===> cmdcode:0x%02x\n", __FUNCTION__, obj->cmdcode); RTW_INFO("%s===> cmdcode:0x%02x\n", __func__, obj->cmdcode);
if (obj->cmdcode == GEN_CMD_CODE(_Set_MLME_EVT)) { if (obj->cmdcode == GEN_CMD_CODE(_Set_MLME_EVT)) {
if (obj->parmbuf) { if (obj->parmbuf) {
struct C2HEvent_Header *pc2h_evt_hdr = (struct C2HEvent_Header *)(obj->parmbuf); struct C2HEvent_Header *pc2h_evt_hdr = (struct C2HEvent_Header *)(obj->parmbuf);
@ -289,7 +289,7 @@ sint _rtw_enqueue_cmd(_queue *queue, struct cmd_obj *obj, bool to_head)
RTW_INFO("[%d] head %p, tail %p, tail->prev->next %p[tail], tail->next %p[head]\n", __LINE__, RTW_INFO("[%d] head %p, tail %p, tail->prev->next %p[tail], tail->next %p[head]\n", __LINE__,
&queue->queue, queue->queue.prev, queue->queue.prev->prev->next, queue->queue.prev->next); &queue->queue, queue->queue.prev, queue->queue.prev->prev->next, queue->queue.prev->next);
RTW_INFO("==========%s============\n", __FUNCTION__); RTW_INFO("==========%s============\n", __func__);
RTW_INFO("head:%p,obj_addr:%p\n", &queue->queue, obj); RTW_INFO("head:%p,obj_addr:%p\n", &queue->queue, obj);
RTW_INFO("padapter: %p\n", obj->padapter); RTW_INFO("padapter: %p\n", obj->padapter);
RTW_INFO("cmdcode: 0x%02x\n", obj->cmdcode); RTW_INFO("cmdcode: 0x%02x\n", obj->cmdcode);
@ -337,7 +337,7 @@ struct cmd_obj *_rtw_dequeue_cmd(_queue *queue)
#ifdef DBG_CMD_QUEUE #ifdef DBG_CMD_QUEUE
if (queue->queue.prev->next != &queue->queue) { if (queue->queue.prev->next != &queue->queue) {
RTW_INFO("==========%s============\n", __FUNCTION__); RTW_INFO("==========%s============\n", __func__);
RTW_INFO("head:%p,obj_addr:%p\n", &queue->queue, obj); RTW_INFO("head:%p,obj_addr:%p\n", &queue->queue, obj);
RTW_INFO("padapter: %p\n", obj->padapter); RTW_INFO("padapter: %p\n", obj->padapter);
RTW_INFO("cmdcode: 0x%02x\n", obj->cmdcode); RTW_INFO("cmdcode: 0x%02x\n", obj->cmdcode);
@ -352,7 +352,7 @@ struct cmd_obj *_rtw_dequeue_cmd(_queue *queue)
} }
if (dump_cmd_id) { if (dump_cmd_id) {
RTW_INFO("%s===> cmdcode:0x%02x\n", __FUNCTION__, obj->cmdcode); RTW_INFO("%s===> cmdcode:0x%02x\n", __func__, obj->cmdcode);
if (obj->cmdcode == GEN_CMD_CODE(_Set_Drv_Extra)) { if (obj->cmdcode == GEN_CMD_CODE(_Set_Drv_Extra)) {
if (obj->parmbuf) { if (obj->parmbuf) {
struct drvextra_cmd_parm *pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)(obj->parmbuf); struct drvextra_cmd_parm *pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)(obj->parmbuf);

2
core/rtw_debug.c
View file

@ -345,7 +345,7 @@ void rtw_sink_rtp_seq_dbg(_adapter *adapter, _pkt *pkt)
precvpriv->pre_rtp_rxseq = precvpriv->cur_rtp_rxseq; precvpriv->pre_rtp_rxseq = precvpriv->cur_rtp_rxseq;
precvpriv->cur_rtp_rxseq = be16_to_cpu(*((__be16 *)((pkt->data) + 0x2C))); precvpriv->cur_rtp_rxseq = be16_to_cpu(*((__be16 *)((pkt->data) + 0x2C)));
if (precvpriv->pre_rtp_rxseq + 1 != precvpriv->cur_rtp_rxseq) if (precvpriv->pre_rtp_rxseq + 1 != precvpriv->cur_rtp_rxseq)
RTW_INFO("%s : RTP Seq num from %d to %d\n", __FUNCTION__, precvpriv->pre_rtp_rxseq, precvpriv->cur_rtp_rxseq); RTW_INFO("%s : RTP Seq num from %d to %d\n", __func__, precvpriv->pre_rtp_rxseq, precvpriv->cur_rtp_rxseq);
} }
} }
} }

120
core/rtw_efuse.c
View file

@ -174,7 +174,7 @@ u8 efuse_bt_GetCurrentSize(PADAPTER adapter, u16 *usesize)
*usesize = 0; *usesize = 0;
efuse_map = rtw_malloc(EFUSE_BT_MAP_LEN); efuse_map = rtw_malloc(EFUSE_BT_MAP_LEN);
if (efuse_map == NULL) { if (efuse_map == NULL) {
RTW_DBG("%s: malloc FAIL\n", __FUNCTION__); RTW_DBG("%s: malloc FAIL\n", __func__);
return _FAIL; return _FAIL;
} }
@ -308,10 +308,10 @@ u8 rtw_efuse_bt_access(PADAPTER adapter, u8 write, u16 addr, u16 cnts, u8 *data)
if (_TRUE == write) { if (_TRUE == write) {
err = rtw_halmac_write_bt_physical_efuse(d, addr, cnts, data); err = rtw_halmac_write_bt_physical_efuse(d, addr, cnts, data);
if (err == -1) { if (err == -1) {
RTW_ERR("%s: rtw_halmac_write_bt_physical_efuse fail!\n", __FUNCTION__); RTW_ERR("%s: rtw_halmac_write_bt_physical_efuse fail!\n", __func__);
return _FAIL; return _FAIL;
} }
RTW_INFO("%s: rtw_halmac_write_bt_physical_efuse OK! data 0x%x\n", __FUNCTION__, *data); RTW_INFO("%s: rtw_halmac_write_bt_physical_efuse OK! data 0x%x\n", __func__, *data);
} else { } else {
efuse = rtw_zmalloc(size); efuse = rtw_zmalloc(size);
@ -319,7 +319,7 @@ u8 rtw_efuse_bt_access(PADAPTER adapter, u8 write, u16 addr, u16 cnts, u8 *data)
err = rtw_halmac_read_bt_physical_efuse_map(d, efuse, size); err = rtw_halmac_read_bt_physical_efuse_map(d, efuse, size);
if (err == -1) { if (err == -1) {
RTW_ERR("%s: rtw_halmac_read_bt_physical_efuse_map fail!\n", __FUNCTION__); RTW_ERR("%s: rtw_halmac_read_bt_physical_efuse_map fail!\n", __func__);
rtw_mfree(efuse, size); rtw_mfree(efuse, size);
return _FAIL; return _FAIL;
} }
@ -327,7 +327,7 @@ u8 rtw_efuse_bt_access(PADAPTER adapter, u8 write, u16 addr, u16 cnts, u8 *data)
_rtw_memcpy(data, efuse + addr, cnts); _rtw_memcpy(data, efuse + addr, cnts);
RTW_INFO("%s: rtw_halmac_read_bt_physical_efuse_map ok! data 0x%x\n", __FUNCTION__, *data); RTW_INFO("%s: rtw_halmac_read_bt_physical_efuse_map ok! data 0x%x\n", __func__, *data);
rtw_mfree(efuse, size); rtw_mfree(efuse, size);
} }
} }
@ -456,7 +456,7 @@ u8 rtw_BT_efuse_map_write(PADAPTER adapter, u16 addr, u16 cnts, u8 *data)
#define RT_ASSERT_RET(expr) \ #define RT_ASSERT_RET(expr) \
if (!(expr)) { \ if (!(expr)) { \
RTW_INFO("Assertion failed! %s at ......\n", #expr); \ RTW_INFO("Assertion failed! %s at ......\n", #expr); \
RTW_INFO(" ......%s,%s, line=%d\n",__FILE__, __FUNCTION__, __LINE__); \ RTW_INFO(" ......%s,%s, line=%d\n",__FILE__, __func__, __LINE__); \
return _FAIL; \ return _FAIL; \
} }
@ -509,7 +509,7 @@ u8 rtw_BT_efuse_map_write(PADAPTER adapter, u16 addr, u16 cnts, u8 *data)
ret = EfusePgPacketWrite_BT(adapter, offset, word_en, newdata, _FALSE); ret = EfusePgPacketWrite_BT(adapter, offset, word_en, newdata, _FALSE);
RTW_INFO("offset=%x\n", offset); RTW_INFO("offset=%x\n", offset);
RTW_INFO("word_en=%x\n", word_en); RTW_INFO("word_en=%x\n", word_en);
RTW_INFO("%s: data=", __FUNCTION__); RTW_INFO("%s: data=", __func__);
for (i = 0; i < PGPKT_DATA_SIZE; i++) for (i = 0; i < PGPKT_DATA_SIZE; i++)
RTW_INFO("0x%02X ", newdata[i]); RTW_INFO("0x%02X ", newdata[i]);
RTW_INFO("\n"); RTW_INFO("\n");
@ -547,14 +547,14 @@ VOID hal_ReadEFuse_BT_logic_map(
/* Do NOT excess total size of EFuse table. Added by Roger, 2008.11.10. */ /* Do NOT excess total size of EFuse table. Added by Roger, 2008.11.10. */
/* */ /* */
if ((_offset + _size_byte) > EFUSE_BT_MAP_LEN) { if ((_offset + _size_byte) > EFUSE_BT_MAP_LEN) {
RTW_INFO("%s: Invalid offset(%#x) with read bytes(%#x)!!\n", __FUNCTION__, _offset, _size_byte); RTW_INFO("%s: Invalid offset(%#x) with read bytes(%#x)!!\n", __func__, _offset, _size_byte);
return; return;
} }
efuseTbl = rtw_malloc(EFUSE_BT_MAP_LEN); efuseTbl = rtw_malloc(EFUSE_BT_MAP_LEN);
phyefuse = rtw_malloc(EFUSE_BT_REAL_CONTENT_LEN); phyefuse = rtw_malloc(EFUSE_BT_REAL_CONTENT_LEN);
if (efuseTbl == NULL || phyefuse == NULL) { if (efuseTbl == NULL || phyefuse == NULL) {
RTW_INFO("%s: efuseTbl or phyefuse malloc fail!\n", __FUNCTION__); RTW_INFO("%s: efuseTbl or phyefuse malloc fail!\n", __func__);
goto exit; goto exit;
} }
@ -575,17 +575,17 @@ VOID hal_ReadEFuse_BT_logic_map(
if (efuseHeader == 0xFF) if (efuseHeader == 0xFF)
break; break;
RTW_INFO("%s: efuse[%#X]=0x%02x (header)\n", __FUNCTION__, (((bank - 1) * EFUSE_BT_REAL_CONTENT_LEN) + eFuse_Addr - 1), efuseHeader); RTW_INFO("%s: efuse[%#X]=0x%02x (header)\n", __func__, (((bank - 1) * EFUSE_BT_REAL_CONTENT_LEN) + eFuse_Addr - 1), efuseHeader);
/* Check PG header for section num. */ /* Check PG header for section num. */
if (EXT_HEADER(efuseHeader)) { /* extended header */ if (EXT_HEADER(efuseHeader)) { /* extended header */
offset = GET_HDR_OFFSET_2_0(efuseHeader); offset = GET_HDR_OFFSET_2_0(efuseHeader);
RTW_INFO("%s: extended header offset_2_0=0x%X\n", __FUNCTION__, offset); RTW_INFO("%s: extended header offset_2_0=0x%X\n", __func__, offset);
/* ReadEFuseByte(padapter, eFuse_Addr++, &efuseExtHdr, bPseudoTest); */ /* ReadEFuseByte(padapter, eFuse_Addr++, &efuseExtHdr, bPseudoTest); */
efuseExtHdr = phyefuse[eFuse_Addr++]; efuseExtHdr = phyefuse[eFuse_Addr++];
RTW_INFO("%s: efuse[%#X]=0x%02x (ext header)\n", __FUNCTION__, (((bank - 1) * EFUSE_BT_REAL_CONTENT_LEN) + eFuse_Addr - 1), efuseExtHdr); RTW_INFO("%s: efuse[%#X]=0x%02x (ext header)\n", __func__, (((bank - 1) * EFUSE_BT_REAL_CONTENT_LEN) + eFuse_Addr - 1), efuseExtHdr);
if (ALL_WORDS_DISABLED(efuseExtHdr)) if (ALL_WORDS_DISABLED(efuseExtHdr))
continue; continue;
@ -600,7 +600,7 @@ VOID hal_ReadEFuse_BT_logic_map(
u16 addr; u16 addr;
/* Get word enable value from PG header */ /* Get word enable value from PG header */
RTW_INFO("%s: Offset=%d Worden=%#X\n", __FUNCTION__, offset, wden); RTW_INFO("%s: Offset=%d Worden=%#X\n", __func__, offset, wden);
addr = offset * PGPKT_DATA_SIZE; addr = offset * PGPKT_DATA_SIZE;
for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) { for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) {
@ -610,26 +610,26 @@ VOID hal_ReadEFuse_BT_logic_map(
/* ReadEFuseByte(padapter, eFuse_Addr++, &efuseData, bPseudoTest); */ /* ReadEFuseByte(padapter, eFuse_Addr++, &efuseData, bPseudoTest); */
efuseData = phyefuse[eFuse_Addr++]; efuseData = phyefuse[eFuse_Addr++];
RTW_INFO("%s: efuse[%#X]=0x%02X\n", __FUNCTION__, eFuse_Addr - 1, efuseData); RTW_INFO("%s: efuse[%#X]=0x%02X\n", __func__, eFuse_Addr - 1, efuseData);
efuseTbl[addr] = efuseData; efuseTbl[addr] = efuseData;
efuseData = 0; efuseData = 0;
/* ReadEFuseByte(padapter, eFuse_Addr++, &efuseData, bPseudoTest); */ /* ReadEFuseByte(padapter, eFuse_Addr++, &efuseData, bPseudoTest); */
efuseData = phyefuse[eFuse_Addr++]; efuseData = phyefuse[eFuse_Addr++];
RTW_INFO("%s: efuse[%#X]=0x%02X\n", __FUNCTION__, eFuse_Addr - 1, efuseData); RTW_INFO("%s: efuse[%#X]=0x%02X\n", __func__, eFuse_Addr - 1, efuseData);
efuseTbl[addr + 1] = efuseData; efuseTbl[addr + 1] = efuseData;
} }
addr += 2; addr += 2;
} }
} else { } else {
RTW_INFO("%s: offset(%d) is illegal!!\n", __FUNCTION__, offset); RTW_INFO("%s: offset(%d) is illegal!!\n", __func__, offset);
eFuse_Addr += Efuse_CalculateWordCnts(wden) * 2; eFuse_Addr += Efuse_CalculateWordCnts(wden) * 2;
} }
} }
if ((eFuse_Addr - 1) < total) { if ((eFuse_Addr - 1) < total) {
RTW_INFO("%s: bank(%d) data end at %#x\n", __FUNCTION__, bank, eFuse_Addr - 1); RTW_INFO("%s: bank(%d) data end at %#x\n", __func__, bank, eFuse_Addr - 1);
break; break;
} }
} }
@ -651,7 +651,7 @@ VOID hal_ReadEFuse_BT_logic_map(
efuse_usage = 100; efuse_usage = 100;
fakeBTEfuseUsedBytes = used; fakeBTEfuseUsedBytes = used;
RTW_INFO("%s: BTEfuseUsed last Bytes = %#x\n", __FUNCTION__, fakeBTEfuseUsedBytes); RTW_INFO("%s: BTEfuseUsed last Bytes = %#x\n", __func__, fakeBTEfuseUsedBytes);
exit: exit:
if (efuseTbl) if (efuseTbl)
@ -677,24 +677,24 @@ static u8 hal_EfusePartialWriteCheck(
startAddr = (u16)fakeBTEfuseUsedBytes; startAddr = (u16)fakeBTEfuseUsedBytes;
startAddr %= efuse_max; startAddr %= efuse_max;
RTW_INFO("%s: startAddr=%#X\n", __FUNCTION__, startAddr); RTW_INFO("%s: startAddr=%#X\n", __func__, startAddr);
while (1) { while (1) {
if (startAddr >= efuse_max_available_len) { if (startAddr >= efuse_max_available_len) {
bRet = _FALSE; bRet = _FALSE;
RTW_INFO("%s: startAddr(%d) >= efuse_max_available_len(%d)\n", RTW_INFO("%s: startAddr(%d) >= efuse_max_available_len(%d)\n",
__FUNCTION__, startAddr, efuse_max_available_len); __func__, startAddr, efuse_max_available_len);
break; break;
} }
if (rtw_efuse_bt_access(padapter, _FALSE, startAddr, 1, &efuse_data)&& (efuse_data != 0xFF)) { if (rtw_efuse_bt_access(padapter, _FALSE, startAddr, 1, &efuse_data)&& (efuse_data != 0xFF)) {
bRet = _FALSE; bRet = _FALSE;
RTW_INFO("%s: Something Wrong! last bytes(%#X=0x%02X) is not 0xFF\n", RTW_INFO("%s: Something Wrong! last bytes(%#X=0x%02X) is not 0xFF\n",
__FUNCTION__, startAddr, efuse_data); __func__, startAddr, efuse_data);
break; break;
} else { } else {
/* not used header, 0xff */ /* not used header, 0xff */
*pAddr = startAddr; *pAddr = startAddr;
/* RTW_INFO("%s: Started from unused header offset=%d\n", __FUNCTION__, startAddr)); */ /* RTW_INFO("%s: Started from unused header offset=%d\n", __func__, startAddr)); */
bRet = _TRUE; bRet = _TRUE;
break; break;
} }
@ -715,16 +715,16 @@ static u8 hal_EfusePgPacketWrite2ByteHeader(
u8 pg_header = 0, tmp_header = 0; u8 pg_header = 0, tmp_header = 0;
u8 repeatcnt = 0; u8 repeatcnt = 0;
/* RTW_INFO("%s\n", __FUNCTION__); */ /* RTW_INFO("%s\n", __func__); */
efuse_addr = *pAddr; efuse_addr = *pAddr;
if (efuse_addr >= efuse_max_available_len) { if (efuse_addr >= efuse_max_available_len) {
RTW_INFO("%s: addr(%d) over avaliable(%d)!!\n", __FUNCTION__, efuse_addr, efuse_max_available_len); RTW_INFO("%s: addr(%d) over avaliable(%d)!!\n", __func__, efuse_addr, efuse_max_available_len);
return _FALSE; return _FALSE;
} }
pg_header = ((pTargetPkt->offset & 0x07) << 5) | 0x0F; pg_header = ((pTargetPkt->offset & 0x07) << 5) | 0x0F;
/* RTW_INFO("%s: pg_header=0x%x\n", __FUNCTION__, pg_header); */ /* RTW_INFO("%s: pg_header=0x%x\n", __func__, pg_header); */
do { do {
@ -734,13 +734,13 @@ static u8 hal_EfusePgPacketWrite2ByteHeader(
if (tmp_header != 0xFF) if (tmp_header != 0xFF)
break; break;
if (repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) { if (repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) {
RTW_INFO("%s: Repeat over limit for pg_header!!\n", __FUNCTION__); RTW_INFO("%s: Repeat over limit for pg_header!!\n", __func__);
return _FALSE; return _FALSE;
} }
} while (1); } while (1);
if (tmp_header != pg_header) { if (tmp_header != pg_header) {
RTW_ERR("%s: PG Header Fail!!(pg=0x%02X read=0x%02X)\n", __FUNCTION__, pg_header, tmp_header); RTW_ERR("%s: PG Header Fail!!(pg=0x%02X read=0x%02X)\n", __func__, pg_header, tmp_header);
return _FALSE; return _FALSE;
} }
@ -755,13 +755,13 @@ static u8 hal_EfusePgPacketWrite2ByteHeader(
if (tmp_header != 0xFF) if (tmp_header != 0xFF)
break; break;
if (repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) { if (repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) {
RTW_INFO("%s: Repeat over limit for ext_header!!\n", __FUNCTION__); RTW_INFO("%s: Repeat over limit for ext_header!!\n", __func__);
return _FALSE; return _FALSE;
} }
} while (1); } while (1);
if (tmp_header != pg_header) { /* offset PG fail */ if (tmp_header != pg_header) { /* offset PG fail */
RTW_ERR("%s: PG EXT Header Fail!!(pg=0x%02X read=0x%02X)\n", __FUNCTION__, pg_header, tmp_header); RTW_ERR("%s: PG EXT Header Fail!!(pg=0x%02X read=0x%02X)\n", __func__, pg_header, tmp_header);
return _FALSE; return _FALSE;
} }
@ -784,7 +784,7 @@ static u8 hal_EfusePgPacketWrite1ByteHeader(
u8 repeatcnt = 0; u8 repeatcnt = 0;
/* RTW_INFO("%s\n", __FUNCTION__); */ /* RTW_INFO("%s\n", __func__); */
pg_header = ((pTargetPkt->offset << 4) & 0xf0) | pTargetPkt->word_en; pg_header = ((pTargetPkt->offset << 4) & 0xf0) | pTargetPkt->word_en;
do { do {
@ -794,13 +794,13 @@ static u8 hal_EfusePgPacketWrite1ByteHeader(
if (tmp_header != 0xFF) if (tmp_header != 0xFF)
break; break;
if (repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) { if (repeatcnt++ > EFUSE_REPEAT_THRESHOLD_) {
RTW_INFO("%s: Repeat over limit for pg_header!!\n", __FUNCTION__); RTW_INFO("%s: Repeat over limit for pg_header!!\n", __func__);
return _FALSE; return _FALSE;
} }
} while (1); } while (1);
if (tmp_header != pg_header) { if (tmp_header != pg_header) {
RTW_ERR("%s: PG Header Fail!!(pg=0x%02X read=0x%02X)\n", __FUNCTION__, pg_header, tmp_header); RTW_ERR("%s: PG Header Fail!!(pg=0x%02X read=0x%02X)\n", __func__, pg_header, tmp_header);
return _FALSE; return _FALSE;
} }
@ -841,7 +841,7 @@ Hal_EfuseWordEnableDataWrite(
u8 tmpdata[PGPKT_DATA_SIZE]; u8 tmpdata[PGPKT_DATA_SIZE];
/* RTW_INFO("%s: efuse_addr=%#x word_en=%#x\n", __FUNCTION__, efuse_addr, word_en); */ /* RTW_INFO("%s: efuse_addr=%#x word_en=%#x\n", __func__, efuse_addr, word_en); */
_rtw_memset(tmpdata, 0xFF, PGPKT_DATA_SIZE); _rtw_memset(tmpdata, 0xFF, PGPKT_DATA_SIZE);
if (!(word_en & BIT(0))) { if (!(word_en & BIT(0))) {
@ -913,10 +913,10 @@ hal_EfusePgPacketWriteData(
efuse_addr = *pAddr; efuse_addr = *pAddr;
badworden = Hal_EfuseWordEnableDataWrite(pAdapter, efuse_addr + 1, pTargetPkt->word_en, pTargetPkt->data, bPseudoTest); badworden = Hal_EfuseWordEnableDataWrite(pAdapter, efuse_addr + 1, pTargetPkt->word_en, pTargetPkt->data, bPseudoTest);
if (badworden != 0x0F) { if (badworden != 0x0F) {
RTW_INFO("%s: Fail!!\n", __FUNCTION__); RTW_INFO("%s: Fail!!\n", __func__);
return _FALSE; return _FALSE;
} else } else
RTW_INFO("%s: OK!!\n", __FUNCTION__); RTW_INFO("%s: OK!!\n", __func__);
return _TRUE; return _TRUE;
} }
@ -938,7 +938,7 @@ hal_EfuseSwitchToBank(
#endif #endif
RTW_INFO("%s: Efuse switch bank to %d\n", __FUNCTION__, bank); RTW_INFO("%s: Efuse switch bank to %d\n", __func__, bank);
if (bPseudoTest) { if (bPseudoTest) {
#ifdef HAL_EFUSE_MEMORY #ifdef HAL_EFUSE_MEMORY
pEfuseHal->fakeEfuseBank = bank; pEfuseHal->fakeEfuseBank = bank;
@ -1020,8 +1020,8 @@ efuse_OneByteRead(
} else { } else {
*data = 0xff; *data = 0xff;
bResult = _FALSE; bResult = _FALSE;
RTW_INFO("%s: [ERROR] addr=0x%x bResult=%d time out 1s !!!\n", __FUNCTION__, addr, bResult); RTW_INFO("%s: [ERROR] addr=0x%x bResult=%d time out 1s !!!\n", __func__, addr, bResult);
RTW_INFO("%s: [ERROR] EFUSE_CTRL =0x%08x !!!\n", __FUNCTION__, rtw_read32(pAdapter, EFUSE_CTRL)); RTW_INFO("%s: [ERROR] EFUSE_CTRL =0x%08x !!!\n", __func__, rtw_read32(pAdapter, EFUSE_CTRL));
} }
return bResult; return bResult;
@ -1051,12 +1051,12 @@ hal_EfuseGetCurrentSize_BT(
efuse_addr = (u16)((btusedbytes % EFUSE_BT_REAL_BANK_CONTENT_LEN)); efuse_addr = (u16)((btusedbytes % EFUSE_BT_REAL_BANK_CONTENT_LEN));
startBank = (u8)(1 + (btusedbytes / EFUSE_BT_REAL_BANK_CONTENT_LEN)); startBank = (u8)(1 + (btusedbytes / EFUSE_BT_REAL_BANK_CONTENT_LEN));
RTW_INFO("%s: start from bank=%d addr=0x%X\n", __FUNCTION__, startBank, efuse_addr); RTW_INFO("%s: start from bank=%d addr=0x%X\n", __func__, startBank, efuse_addr);
retU2 = EFUSE_BT_REAL_CONTENT_LEN - EFUSE_PROTECT_BYTES_BANK; retU2 = EFUSE_BT_REAL_CONTENT_LEN - EFUSE_PROTECT_BYTES_BANK;
for (bank = startBank; bank < 3; bank++) { for (bank = startBank; bank < 3; bank++) {
if (hal_EfuseSwitchToBank(padapter, bank, bPseudoTest) == _FALSE) { if (hal_EfuseSwitchToBank(padapter, bank, bPseudoTest) == _FALSE) {
RTW_ERR("%s: switch bank(%d) Fail!!\n", __FUNCTION__, bank); RTW_ERR("%s: switch bank(%d) Fail!!\n", __func__, bank);
/* bank = EFUSE_MAX_BANK; */ /* bank = EFUSE_MAX_BANK; */
break; break;
} }
@ -1068,11 +1068,11 @@ hal_EfuseGetCurrentSize_BT(
while (AVAILABLE_EFUSE_ADDR(efuse_addr)) { while (AVAILABLE_EFUSE_ADDR(efuse_addr)) {
if (rtw_efuse_bt_access(padapter, _FALSE, efuse_addr, 1, &efuse_data) == _FALSE) { if (rtw_efuse_bt_access(padapter, _FALSE, efuse_addr, 1, &efuse_data) == _FALSE) {
RTW_ERR("%s: efuse_OneByteRead Fail! addr=0x%X !!\n", __FUNCTION__, efuse_addr); RTW_ERR("%s: efuse_OneByteRead Fail! addr=0x%X !!\n", __func__, efuse_addr);
/* bank = EFUSE_MAX_BANK; */ /* bank = EFUSE_MAX_BANK; */
break; break;
} }
RTW_INFO("%s: efuse_OneByteRead ! addr=0x%X !efuse_data=0x%X! bank =%d\n", __FUNCTION__, efuse_addr, efuse_data, bank); RTW_INFO("%s: efuse_OneByteRead ! addr=0x%X !efuse_data=0x%X! bank =%d\n", __func__, efuse_addr, efuse_data, bank);
if (efuse_data == 0xFF) if (efuse_data == 0xFF)
break; break;
@ -1081,7 +1081,7 @@ hal_EfuseGetCurrentSize_BT(
hoffset = GET_HDR_OFFSET_2_0(efuse_data); hoffset = GET_HDR_OFFSET_2_0(efuse_data);
efuse_addr++; efuse_addr++;
rtw_efuse_bt_access(padapter, _FALSE, efuse_addr, 1, &efuse_data); rtw_efuse_bt_access(padapter, _FALSE, efuse_addr, 1, &efuse_data);
RTW_INFO("%s: efuse_OneByteRead EXT_HEADER ! addr=0x%X !efuse_data=0x%X! bank =%d\n", __FUNCTION__, efuse_addr, efuse_data, bank); RTW_INFO("%s: efuse_OneByteRead EXT_HEADER ! addr=0x%X !efuse_data=0x%X! bank =%d\n", __func__, efuse_addr, efuse_data, bank);
if (ALL_WORDS_DISABLED(efuse_data)) { if (ALL_WORDS_DISABLED(efuse_data)) {
efuse_addr++; efuse_addr++;
@ -1110,7 +1110,7 @@ hal_EfuseGetCurrentSize_BT(
retU2 = ((bank - 1) * EFUSE_BT_REAL_BANK_CONTENT_LEN) + efuse_addr; retU2 = ((bank - 1) * EFUSE_BT_REAL_BANK_CONTENT_LEN) + efuse_addr;
fakeBTEfuseUsedBytes = retU2; fakeBTEfuseUsedBytes = retU2;
RTW_INFO("%s: CurrentSize=%d\n", __FUNCTION__, retU2); RTW_INFO("%s: CurrentSize=%d\n", __func__, retU2);
return retU2; return retU2;
} }
@ -1123,10 +1123,10 @@ hal_BT_EfusePgCheckAvailableAddr(
u16 max_available = EFUSE_BT_REAL_CONTENT_LEN - EFUSE_PROTECT_BYTES_BANK; u16 max_available = EFUSE_BT_REAL_CONTENT_LEN - EFUSE_PROTECT_BYTES_BANK;
u16 current_size = 0; u16 current_size = 0;
RTW_INFO("%s: max_available=%d\n", __FUNCTION__, max_available); RTW_INFO("%s: max_available=%d\n", __func__, max_available);
current_size = hal_EfuseGetCurrentSize_BT(pAdapter, bPseudoTest); current_size = hal_EfuseGetCurrentSize_BT(pAdapter, bPseudoTest);
if (current_size >= max_available) { if (current_size >= max_available) {
RTW_INFO("%s: Error!! current_size(%d)>max_available(%d)\n", __FUNCTION__, current_size, max_available); RTW_INFO("%s: Error!! current_size(%d)>max_available(%d)\n", __func__, current_size, max_available);
return _FALSE; return _FALSE;
} }
return _TRUE; return _TRUE;
@ -1454,8 +1454,8 @@ efuse_OneByteRead(
} else { } else {
*data = 0xff; *data = 0xff;
bResult = _FALSE; bResult = _FALSE;
RTW_INFO("%s: [ERROR] addr=0x%x bResult=%d time out 1s !!!\n", __FUNCTION__, addr, bResult); RTW_INFO("%s: [ERROR] addr=0x%x bResult=%d time out 1s !!!\n", __func__, addr, bResult);
RTW_INFO("%s: [ERROR] EFUSE_CTRL =0x%08x !!!\n", __FUNCTION__, rtw_read32(pAdapter, EFUSE_CTRL)); RTW_INFO("%s: [ERROR] EFUSE_CTRL =0x%08x !!!\n", __func__, rtw_read32(pAdapter, EFUSE_CTRL));
} }
return bResult; return bResult;
@ -1518,8 +1518,8 @@ efuse_OneByteWrite(
else { else {
bResult = _FALSE; bResult = _FALSE;
RTW_INFO("%s: [ERROR] addr=0x%x ,efuseValue=0x%x ,bResult=%d time out 1s !!!\n", RTW_INFO("%s: [ERROR] addr=0x%x ,efuseValue=0x%x ,bResult=%d time out 1s !!!\n",
__FUNCTION__, addr, efuseValue, bResult); __func__, addr, efuseValue, bResult);
RTW_INFO("%s: [ERROR] EFUSE_CTRL =0x%08x !!!\n", __FUNCTION__, rtw_read32(pAdapter, EFUSE_CTRL)); RTW_INFO("%s: [ERROR] EFUSE_CTRL =0x%08x !!!\n", __func__, rtw_read32(pAdapter, EFUSE_CTRL));
} }
/* disable Efuse program enable */ /* disable Efuse program enable */
@ -1727,7 +1727,7 @@ u8 rtw_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
#define RT_ASSERT_RET(expr) \ #define RT_ASSERT_RET(expr) \
if (!(expr)) { \ if (!(expr)) { \
RTW_INFO("Assertion failed! %s at ......\n", #expr); \ RTW_INFO("Assertion failed! %s at ......\n", #expr); \
RTW_INFO(" ......%s,%s, line=%d\n",__FILE__, __FUNCTION__, __LINE__); \ RTW_INFO(" ......%s,%s, line=%d\n",__FILE__, __func__, __LINE__); \
return _FAIL; \ return _FAIL; \
} }
@ -1861,7 +1861,7 @@ u8 rtw_BT_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
#define RT_ASSERT_RET(expr) \ #define RT_ASSERT_RET(expr) \
if (!(expr)) { \ if (!(expr)) { \
RTW_INFO("Assertion failed! %s at ......\n", #expr); \ RTW_INFO("Assertion failed! %s at ......\n", #expr); \
RTW_INFO(" ......%s,%s, line=%d\n",__FILE__, __FUNCTION__, __LINE__); \ RTW_INFO(" ......%s,%s, line=%d\n",__FILE__, __func__, __LINE__); \
return _FAIL; \ return _FAIL; \
} }
@ -1916,7 +1916,7 @@ u8 rtw_BT_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
if (word_en != 0xF) { if (word_en != 0xF) {
RTW_INFO("offset=%x\n", offset); RTW_INFO("offset=%x\n", offset);
RTW_INFO("word_en=%x\n", word_en); RTW_INFO("word_en=%x\n", word_en);
RTW_INFO("%s: data=", __FUNCTION__); RTW_INFO("%s: data=", __func__);
for (i = 0; i < PGPKT_DATA_SIZE; i++) for (i = 0; i < PGPKT_DATA_SIZE; i++)
RTW_INFO("0x%02X ", newdata[i]); RTW_INFO("0x%02X ", newdata[i]);
RTW_INFO("\n"); RTW_INFO("\n");
@ -2296,19 +2296,19 @@ void EFUSE_ShadowMapUpdate(
EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (PVOID)&mapLen, bPseudoTest); EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (PVOID)&mapLen, bPseudoTest);
if (!mapLen) { if (!mapLen) {
RTW_WARN("%s: <ERROR> fail to get efuse size!\n", __FUNCTION__); RTW_WARN("%s: <ERROR> fail to get efuse size!\n", __func__);
mapLen = EEPROM_MAX_SIZE; mapLen = EEPROM_MAX_SIZE;
} }
if (mapLen > EEPROM_MAX_SIZE) { if (mapLen > EEPROM_MAX_SIZE) {
RTW_WARN("%s: <ERROR> size of efuse data(%d) is large than expected(%d)!\n", RTW_WARN("%s: <ERROR> size of efuse data(%d) is large than expected(%d)!\n",
__FUNCTION__, mapLen, EEPROM_MAX_SIZE); __func__, mapLen, EEPROM_MAX_SIZE);
mapLen = EEPROM_MAX_SIZE; mapLen = EEPROM_MAX_SIZE;
} }
if (pHalData->bautoload_fail_flag == _FALSE) { if (pHalData->bautoload_fail_flag == _FALSE) {
err = rtw_halmac_read_logical_efuse_map(adapter_to_dvobj(pAdapter), efuse_map, mapLen); err = rtw_halmac_read_logical_efuse_map(adapter_to_dvobj(pAdapter), efuse_map, mapLen);
if (err) if (err)
RTW_ERR("%s: <ERROR> fail to get efuse map!\n", __FUNCTION__); RTW_ERR("%s: <ERROR> fail to get efuse map!\n", __func__);
} }
#else /* !RTW_HALMAC */ #else /* !RTW_HALMAC */
EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (PVOID)&mapLen, bPseudoTest); EFUSE_GetEfuseDefinition(pAdapter, efuseType, TYPE_EFUSE_MAP_LEN, (PVOID)&mapLen, bPseudoTest);
@ -2387,7 +2387,7 @@ int storeAdaptorInfoFile(char *path, u8 *efuse_data)
else else
ret = _FAIL; ret = _FAIL;
} else { } else {
RTW_INFO("%s NULL pointer\n", __FUNCTION__); RTW_INFO("%s NULL pointer\n", __func__);
ret = _FAIL; ret = _FAIL;
} }
return ret; return ret;
@ -2408,7 +2408,7 @@ int retriveAdaptorInfoFile(char *path, u8 *efuse_data)
else else
ret = _FAIL; ret = _FAIL;
} else { } else {
RTW_INFO("%s NULL pointer\n", __FUNCTION__); RTW_INFO("%s NULL pointer\n", __func__);
ret = _FAIL; ret = _FAIL;
} }
return ret; return ret;
@ -2430,7 +2430,7 @@ u8 rtw_efuse_file_read(PADAPTER padapter, u8 *filepatch, u8 *buf, u32 len)
count = rtw_retrieve_from_file(filepatch, ptmpbuf, bufsize); count = rtw_retrieve_from_file(filepatch, ptmpbuf, bufsize);
if (count <= 100) { if (count <= 100) {
rtw_mfree(ptmpbuf, bufsize); rtw_mfree(ptmpbuf, bufsize);
RTW_ERR("%s, filepatch %s, size=%d, FAIL!!\n", __FUNCTION__, filepatch, count); RTW_ERR("%s, filepatch %s, size=%d, FAIL!!\n", __func__, filepatch, count);
return _FALSE; return _FALSE;
} }
@ -2467,7 +2467,7 @@ u8 rtw_efuse_file_read(PADAPTER padapter, u8 *filepatch, u8 *buf, u32 len)
} }
rtw_mfree(ptmpbuf, bufsize); rtw_mfree(ptmpbuf, bufsize);
RTW_INFO("%s, filepatch %s, size=%d, done\n", __FUNCTION__, filepatch, count); RTW_INFO("%s, filepatch %s, size=%d, done\n", __func__, filepatch, count);
return _TRUE; return _TRUE;
} }

12
core/rtw_ieee80211.c
View file

@ -847,7 +847,7 @@ u8 *rtw_get_wps_ie_from_scan_queue(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps
{ {
u8 *wps = NULL; u8 *wps = NULL;
RTW_INFO("[%s] frame_type = %d\n", __FUNCTION__, frame_type); RTW_INFO("[%s] frame_type = %d\n", __func__, frame_type);
switch (frame_type) { switch (frame_type) {
case 1: case 1:
case 3: { case 3: {
@ -950,7 +950,7 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id , u8 *buf_at
u16 attr_data_len = RTW_GET_BE16(attr_ptr + 2); u16 attr_data_len = RTW_GET_BE16(attr_ptr + 2);
u16 attr_len = attr_data_len + 4; u16 attr_len = attr_data_len + 4;
/* RTW_INFO("%s attr_ptr:%p, id:%u, length:%u\n", __FUNCTION__, attr_ptr, attr_id, attr_data_len); */ /* RTW_INFO("%s attr_ptr:%p, id:%u, length:%u\n", __func__, attr_ptr, attr_id, attr_data_len); */
if (attr_id == target_attr_id) { if (attr_id == target_attr_id) {
target_attr_ptr = attr_ptr; target_attr_ptr = attr_ptr;
@ -1298,7 +1298,7 @@ int rtw_get_mac_addr_intel(unsigned char *buf)
char fname[] = "/config/wifi/mac.txt"; char fname[] = "/config/wifi/mac.txt";
int jj, kk; int jj, kk;
RTW_INFO("%s Enter\n", __FUNCTION__); RTW_INFO("%s Enter\n", __func__);
ret = rtw_retrieve_from_file(fname, c_mac, MAC_ADDRESS_LEN); ret = rtw_retrieve_from_file(fname, c_mac, MAC_ADDRESS_LEN);
if (ret < MAC_ADDRESS_LEN) if (ret < MAC_ADDRESS_LEN)
@ -1308,7 +1308,7 @@ int rtw_get_mac_addr_intel(unsigned char *buf)
buf[jj] = key_2char2num(c_mac[kk], c_mac[kk + 1]); buf[jj] = key_2char2num(c_mac[kk], c_mac[kk + 1]);
RTW_INFO("%s: read from file mac address: "MAC_FMT"\n", RTW_INFO("%s: read from file mac address: "MAC_FMT"\n",
__FUNCTION__, MAC_ARG(buf)); __func__, MAC_ARG(buf));
return 0; return 0;
} }
@ -1462,7 +1462,7 @@ void dump_ies(void *sel, u8 *buf, u32 buf_len)
id = *pos; id = *pos;
len = *(pos + 1); len = *(pos + 1);
RTW_PRINT_SEL(sel, "%s ID:%u, LEN:%u\n", __FUNCTION__, id, len); RTW_PRINT_SEL(sel, "%s ID:%u, LEN:%u\n", __func__, id, len);
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
dump_ht_cap_ie(sel, pos, len + 2); dump_ht_cap_ie(sel, pos, len + 2);
#endif #endif
@ -2571,7 +2571,7 @@ u8 rtw_ht_mcsset_to_nss(u8 *supp_mcs_set)
nss = 1; nss = 1;
else else
RTW_INFO("%s,%d, warning! supp_mcs_set is zero\n", __func__, __LINE__); RTW_INFO("%s,%d, warning! supp_mcs_set is zero\n", __func__, __LINE__);
/* RTW_INFO("%s HT: %dSS\n", __FUNCTION__, nss); */ /* RTW_INFO("%s HT: %dSS\n", __func__, nss); */
return nss; return nss;
} }

2
core/rtw_ioctl_set.c
View file

@ -494,7 +494,7 @@ u8 rtw_set_802_11_disassociate(_adapter *padapter)
/* modify for CONFIG_IEEE80211W, none 11w can use it */ /* modify for CONFIG_IEEE80211W, none 11w can use it */
rtw_free_assoc_resources_cmd(padapter); rtw_free_assoc_resources_cmd(padapter);
if (_FAIL == rtw_pwr_wakeup(padapter)) if (_FAIL == rtw_pwr_wakeup(padapter))
RTW_INFO("%s(): rtw_pwr_wakeup fail !!!\n", __FUNCTION__); RTW_INFO("%s(): rtw_pwr_wakeup fail !!!\n", __func__);
} }
_exit_critical_bh(&pmlmepriv->lock, &irqL); _exit_critical_bh(&pmlmepriv->lock, &irqL);

26
core/rtw_iol.c
View file

@ -31,13 +31,13 @@ struct xmit_frame *rtw_IOL_accquire_xmit_frame(ADAPTER *adapter)
#if 1 #if 1
xmit_frame = rtw_alloc_xmitframe(pxmitpriv); xmit_frame = rtw_alloc_xmitframe(pxmitpriv);
if (xmit_frame == NULL) { if (xmit_frame == NULL) {
RTW_INFO("%s rtw_alloc_xmitframe return null\n", __FUNCTION__); RTW_INFO("%s rtw_alloc_xmitframe return null\n", __func__);
goto exit; goto exit;
} }
xmitbuf = rtw_alloc_xmitbuf(pxmitpriv); xmitbuf = rtw_alloc_xmitbuf(pxmitpriv);
if (xmitbuf == NULL) { if (xmitbuf == NULL) {
RTW_INFO("%s rtw_alloc_xmitbuf return null\n", __FUNCTION__); RTW_INFO("%s rtw_alloc_xmitbuf return null\n", __func__);
rtw_free_xmitframe(pxmitpriv, xmit_frame); rtw_free_xmitframe(pxmitpriv, xmit_frame);
xmit_frame = NULL; xmit_frame = NULL;
goto exit; goto exit;
@ -57,7 +57,7 @@ struct xmit_frame *rtw_IOL_accquire_xmit_frame(ADAPTER *adapter)
#else #else
xmit_frame = alloc_mgtxmitframe(pxmitpriv); xmit_frame = alloc_mgtxmitframe(pxmitpriv);
if (xmit_frame == NULL) if (xmit_frame == NULL)
RTW_INFO("%s alloc_mgtxmitframe return null\n", __FUNCTION__); RTW_INFO("%s alloc_mgtxmitframe return null\n", __func__);
else { else {
pattrib = &xmit_frame->attrib; pattrib = &xmit_frame->attrib;
update_mgntframe_attrib(adapter, pattrib); update_mgntframe_attrib(adapter, pattrib);
@ -82,7 +82,7 @@ int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len
/* check if the io_buf can accommodate new cmds */ /* check if the io_buf can accommodate new cmds */
if (ori_len + cmd_len + 8 > MAX_XMITBUF_SZ) { if (ori_len + cmd_len + 8 > MAX_XMITBUF_SZ) {
RTW_INFO("%s %u is large than MAX_XMITBUF_SZ:%u, can't accommodate new cmds\n", __FUNCTION__ RTW_INFO("%s %u is large than MAX_XMITBUF_SZ:%u, can't accommodate new cmds\n", __func__
, ori_len + cmd_len + 8, MAX_XMITBUF_SZ); , ori_len + cmd_len + 8, MAX_XMITBUF_SZ);
return _FAIL; return _FAIL;
} }
@ -91,7 +91,7 @@ int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len
pattrib->pktlen += cmd_len; pattrib->pktlen += cmd_len;
pattrib->last_txcmdsz += cmd_len; pattrib->last_txcmdsz += cmd_len;
/* RTW_INFO("%s ori:%u + cmd_len:%u = %u\n", __FUNCTION__, ori_len, cmd_len, buf_offset+pattrib->pktlen); */ /* RTW_INFO("%s ori:%u + cmd_len:%u = %u\n", __func__, ori_len, cmd_len, buf_offset+pattrib->pktlen); */
return _SUCCESS; return _SUCCESS;
} }
@ -134,7 +134,7 @@ int _rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, u8
cmd.mask = cpu_to_le32(mask); cmd.mask = cpu_to_le32(mask);
} }
/* RTW_INFO("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FUNCTION__, addr,value,mask); */ /* RTW_INFO("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __func__, addr,value,mask); */
return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, cmd.length); return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, cmd.length);
@ -154,7 +154,7 @@ int _rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, u
cmd.mask = cpu_to_le32(mask); cmd.mask = cpu_to_le32(mask);
} }
/* RTW_INFO("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FUNCTION__, addr,value,mask); */ /* RTW_INFO("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __func__, addr,value,mask); */
return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, cmd.length); return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, cmd.length);
@ -209,7 +209,7 @@ int rtw_IOL_append_DELAY_US_cmd(struct xmit_frame *xmit_frame, u16 us)
/* RTW_PUT_LE16((u8*)&cmd.address, us); */ /* RTW_PUT_LE16((u8*)&cmd.address, us); */
cmd.address = cpu_to_le16(us); cmd.address = cpu_to_le16(us);
/* RTW_INFO("%s %u\n", __FUNCTION__, us); */ /* RTW_INFO("%s %u\n", __func__, us); */
return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, 4); return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, 4);
} }
@ -220,7 +220,7 @@ int rtw_IOL_append_DELAY_MS_cmd(struct xmit_frame *xmit_frame, u16 ms)
/* RTW_PUT_LE16((u8*)&cmd.address, ms); */ /* RTW_PUT_LE16((u8*)&cmd.address, ms); */
cmd.address = cpu_to_le16(ms); cmd.address = cpu_to_le16(ms);
/* RTW_INFO("%s %u\n", __FUNCTION__, ms); */ /* RTW_INFO("%s %u\n", __func__, ms); */
return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, 4); return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, 4);
} }
int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame) int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame)
@ -237,7 +237,7 @@ u8 rtw_IOL_cmd_boundary_handle(struct xmit_frame *pxmit_frame)
rtw_IOL_append_END_cmd(pxmit_frame); rtw_IOL_append_END_cmd(pxmit_frame);
pxmit_frame->attrib.pktlen = ((((pxmit_frame->attrib.pktlen + 32) / 256) + 1) * 256); pxmit_frame->attrib.pktlen = ((((pxmit_frame->attrib.pktlen + 32) / 256) + 1) * 256);
/* RTW_INFO("==> %s, pktlen(%d)\n",__FUNCTION__,pxmit_frame->attrib.pktlen); */ /* RTW_INFO("==> %s, pktlen(%d)\n",__func__,pxmit_frame->attrib.pktlen); */
pxmit_frame->attrib.last_txcmdsz = pxmit_frame->attrib.pktlen; pxmit_frame->attrib.last_txcmdsz = pxmit_frame->attrib.pktlen;
is_cmd_bndy = _TRUE; is_cmd_bndy = _TRUE;
} }
@ -249,7 +249,7 @@ void rtw_IOL_cmd_buf_dump(ADAPTER *Adapter, int buf_len, u8 *pbuf)
int i; int i;
int j = 1; int j = 1;
RTW_INFO("###### %s ######\n", __FUNCTION__); RTW_INFO("###### %s ######\n", __func__);
for (i = 0; i < buf_len; i++) { for (i = 0; i < buf_len; i++) {
RTW_INFO("%02x-", *(pbuf + i)); RTW_INFO("%02x-", *(pbuf + i));
@ -335,7 +335,7 @@ int rtw_IOL_append_DELAY_US_cmd(struct xmit_frame *xmit_frame, u16 us)
RTW_PUT_BE32((u8 *)&cmd.value, (u32)us); RTW_PUT_BE32((u8 *)&cmd.value, (u32)us);
/* RTW_INFO("%s %u\n", __FUNCTION__, us); */ /* RTW_INFO("%s %u\n", __func__, us); */
return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, 8); return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, 8);
} }
@ -346,7 +346,7 @@ int rtw_IOL_append_DELAY_MS_cmd(struct xmit_frame *xmit_frame, u16 ms)
RTW_PUT_BE32((u8 *)&cmd.value, (u32)ms); RTW_PUT_BE32((u8 *)&cmd.value, (u32)ms);
/* RTW_INFO("%s %u\n", __FUNCTION__, ms); */ /* RTW_INFO("%s %u\n", __func__, ms); */
return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, 8); return rtw_IOL_append_cmds(xmit_frame, (u8 *)&cmd, 8);
} }

36
core/rtw_mlme.c
View file

@ -1710,7 +1710,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
psta = rtw_alloc_stainfo(pstapriv, pnetwork->network.MacAddress); psta = rtw_alloc_stainfo(pstapriv, pnetwork->network.MacAddress);
if (psta) { /* update ptarget_sta */ if (psta) { /* update ptarget_sta */
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
psta->aid = pnetwork->join_res; psta->aid = pnetwork->join_res;
@ -1784,7 +1784,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
preorder_ctrl->enable = _FALSE; preorder_ctrl->enable = _FALSE;
preorder_ctrl->indicate_seq = 0xffff; preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
RTW_INFO("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__, RTW_INFO("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __func__, __LINE__,
preorder_ctrl->indicate_seq); preorder_ctrl->indicate_seq);
#endif #endif
preorder_ctrl->wend_b = 0xffff; preorder_ctrl->wend_b = 0xffff;
@ -1801,7 +1801,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
preorder_ctrl->enable = _FALSE; preorder_ctrl->enable = _FALSE;
preorder_ctrl->indicate_seq = 0xffff; preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
RTW_INFO("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__, RTW_INFO("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __func__, __LINE__,
preorder_ctrl->indicate_seq); preorder_ctrl->indicate_seq);
#endif #endif
preorder_ctrl->wend_b = 0xffff; preorder_ctrl->wend_b = 0xffff;
@ -1822,7 +1822,7 @@ static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network *
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct wlan_network *cur_network = &(pmlmepriv->cur_network); struct wlan_network *cur_network = &(pmlmepriv->cur_network);
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
@ -2615,7 +2615,7 @@ void _rtw_join_timeout_handler(_adapter *adapter)
RTW_INFO("%s, fw_state=%x\n", __FUNCTION__, get_fwstate(pmlmepriv)); RTW_INFO("%s, fw_state=%x\n", __func__, get_fwstate(pmlmepriv));
if (RTW_CANNOT_RUN(adapter)) if (RTW_CANNOT_RUN(adapter))
return; return;
@ -2629,10 +2629,10 @@ void _rtw_join_timeout_handler(_adapter *adapter)
rtw_dec_to_roam(adapter); rtw_dec_to_roam(adapter);
if (rtw_to_roam(adapter) != 0) { /* try another */ if (rtw_to_roam(adapter) != 0) { /* try another */
int do_join_r; int do_join_r;
RTW_INFO("%s try another roaming\n", __FUNCTION__); RTW_INFO("%s try another roaming\n", __func__);
do_join_r = rtw_do_join(adapter); do_join_r = rtw_do_join(adapter);
if (_SUCCESS != do_join_r) { if (_SUCCESS != do_join_r) {
RTW_INFO("%s roaming do_join return %d\n", __FUNCTION__ , do_join_r); RTW_INFO("%s roaming do_join return %d\n", __func__ , do_join_r);
continue; continue;
} }
break; break;
@ -2644,7 +2644,7 @@ void _rtw_join_timeout_handler(_adapter *adapter)
RTW_INFO("change to widi listen\n"); RTW_INFO("change to widi listen\n");
} }
#endif /* CONFIG_INTEL_WIDI */ #endif /* CONFIG_INTEL_WIDI */
RTW_INFO("%s We've try roaming but fail\n", __FUNCTION__); RTW_INFO("%s We've try roaming but fail\n", __func__);
#ifdef CONFIG_RTW_80211R #ifdef CONFIG_RTW_80211R
rtw_clr_ft_flags(adapter, RTW_FT_SUPPORTED|RTW_FT_OVER_DS_SUPPORTED); rtw_clr_ft_flags(adapter, RTW_FT_SUPPORTED|RTW_FT_OVER_DS_SUPPORTED);
rtw_reset_ft_status(adapter); rtw_reset_ft_status(adapter);
@ -3128,11 +3128,11 @@ int rtw_select_roaming_candidate(struct mlme_priv *mlme)
} }
if (candidate == NULL) { if (candidate == NULL) {
RTW_INFO("%s: return _FAIL(candidate == NULL)\n", __FUNCTION__); RTW_INFO("%s: return _FAIL(candidate == NULL)\n", __func__);
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
} else { } else {
RTW_INFO("%s: candidate: %s("MAC_FMT", ch:%u)\n", __FUNCTION__, RTW_INFO("%s: candidate: %s("MAC_FMT", ch:%u)\n", __func__,
candidate->network.Ssid.Ssid, MAC_ARG(candidate->network.MacAddress), candidate->network.Ssid.Ssid, MAC_ARG(candidate->network.MacAddress),
candidate->network.Configuration.DSConfig); candidate->network.Configuration.DSConfig);
@ -3270,14 +3270,14 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv)
} }
if (candidate == NULL) { if (candidate == NULL) {
RTW_INFO("%s: return _FAIL(candidate == NULL)\n", __FUNCTION__); RTW_INFO("%s: return _FAIL(candidate == NULL)\n", __func__);
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
_clr_fwstate_(pmlmepriv, _FW_LINKED | _FW_UNDER_LINKING); _clr_fwstate_(pmlmepriv, _FW_LINKED | _FW_UNDER_LINKING);
#endif #endif
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
} else { } else {
RTW_INFO("%s: candidate: %s("MAC_FMT", ch:%u)\n", __FUNCTION__, RTW_INFO("%s: candidate: %s("MAC_FMT", ch:%u)\n", __func__,
candidate->network.Ssid.Ssid, MAC_ARG(candidate->network.MacAddress), candidate->network.Ssid.Ssid, MAC_ARG(candidate->network.MacAddress),
candidate->network.Configuration.DSConfig); candidate->network.Configuration.DSConfig);
goto candidate_exist; goto candidate_exist;
@ -3287,11 +3287,11 @@ candidate_exist:
/* check for situation of _FW_LINKED */ /* check for situation of _FW_LINKED */
if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) { if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) {
RTW_INFO("%s: _FW_LINKED while ask_for_joinbss!!!\n", __FUNCTION__); RTW_INFO("%s: _FW_LINKED while ask_for_joinbss!!!\n", __func__);
#if 0 /* for WPA/WPA2 authentication, wpa_supplicant will expect authentication from AP, it is needed to reconnect AP... */ #if 0 /* for WPA/WPA2 authentication, wpa_supplicant will expect authentication from AP, it is needed to reconnect AP... */
if (is_same_network(&pmlmepriv->cur_network.network, &candidate->network)) { if (is_same_network(&pmlmepriv->cur_network.network, &candidate->network)) {
RTW_INFO("%s: _FW_LINKED and is same network, it needn't join again\n", __FUNCTION__); RTW_INFO("%s: _FW_LINKED and is same network, it needn't join again\n", __func__);
rtw_indicate_connect(adapter);/* rtw_indicate_connect again */ rtw_indicate_connect(adapter);/* rtw_indicate_connect again */
@ -4022,7 +4022,7 @@ unsigned int rtw_restructure_ht_ie(_adapter *padapter, u8 *in_ie, u8 *out_ie, ui
rtw_hal_get_def_var(padapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offset); rtw_hal_get_def_var(padapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offset);
rtw_hal_get_def_var(padapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz); rtw_hal_get_def_var(padapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz);
if (max_recvbuf_sz - rx_packet_offset >= (8191 - 256)) { if (max_recvbuf_sz - rx_packet_offset >= (8191 - 256)) {
RTW_INFO("%s IEEE80211_HT_CAP_MAX_AMSDU is set\n", __FUNCTION__); RTW_INFO("%s IEEE80211_HT_CAP_MAX_AMSDU is set\n", __func__);
ht_capie.cap_info = ht_capie.cap_info | cpu_to_le16(IEEE80211_HT_CAP_MAX_AMSDU); ht_capie.cap_info = ht_capie.cap_info | cpu_to_le16(IEEE80211_HT_CAP_MAX_AMSDU);
} }
if (padapter->driver_rx_ampdu_factor != 0xFF) if (padapter->driver_rx_ampdu_factor != 0xFF)
@ -4221,7 +4221,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len, u8 channel)
/* */ /* */
pmlmeinfo->SM_PS = (le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) & 0x0C) >> 2; pmlmeinfo->SM_PS = (le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) & 0x0C) >> 2;
if (pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC) if (pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC)
RTW_INFO("%s(): WLAN_HT_CAP_SM_PS_STATIC\n", __FUNCTION__); RTW_INFO("%s(): WLAN_HT_CAP_SM_PS_STATIC\n", __func__);
/* Config current HT Protection mode. */ /* Config current HT Protection mode. */
pmlmeinfo->HT_protection = pmlmeinfo->HT_info.infos[1] & 0x3; pmlmeinfo->HT_protection = pmlmeinfo->HT_info.infos[1] & 0x3;
@ -4248,7 +4248,7 @@ void rtw_issue_addbareq_cmd_tdls(_adapter *padapter, struct xmit_frame *pxmitfra
issued |= (phtpriv->candidate_tid_bitmap >> priority) & 0x1; issued |= (phtpriv->candidate_tid_bitmap >> priority) & 0x1;
if (0 == issued) { if (0 == issued) {
RTW_INFO("[%s], p=%d\n", __FUNCTION__, priority); RTW_INFO("[%s], p=%d\n", __func__, priority);
ptdls_sta->htpriv.candidate_tid_bitmap |= BIT((u8)priority); ptdls_sta->htpriv.candidate_tid_bitmap |= BIT((u8)priority);
rtw_addbareq_cmd(padapter, (u8)priority, pattrib->dst); rtw_addbareq_cmd(padapter, (u8)priority, pattrib->dst);
} }
@ -4394,7 +4394,7 @@ void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
if (rtw_to_roam(padapter) > 0) if (rtw_to_roam(padapter) > 0)
continue; continue;
else { else {
RTW_INFO("%s(%d) -to roaming fail, indicate_disconnect\n", __FUNCTION__, __LINE__); RTW_INFO("%s(%d) -to roaming fail, indicate_disconnect\n", __func__, __LINE__);
#ifdef CONFIG_RTW_80211R #ifdef CONFIG_RTW_80211R
rtw_clr_ft_flags(padapter, RTW_FT_SUPPORTED|RTW_FT_OVER_DS_SUPPORTED); rtw_clr_ft_flags(padapter, RTW_FT_SUPPORTED|RTW_FT_OVER_DS_SUPPORTED);
rtw_reset_ft_status(padapter); rtw_reset_ft_status(padapter);

158
core/rtw_mlme_ext.c
View file

@ -1648,13 +1648,13 @@ _continue:
goto _non_rc_device; goto _non_rc_device;
if (!_rtw_memcmp(p + 6, get_sa(pframe), ETH_ALEN)) { if (!_rtw_memcmp(p + 6, get_sa(pframe), ETH_ALEN)) {
RTW_INFO("%s, do rc pairing ("MAC_FMT"), but mac addr mismatch!("MAC_FMT")\n", __FUNCTION__, RTW_INFO("%s, do rc pairing ("MAC_FMT"), but mac addr mismatch!("MAC_FMT")\n", __func__,
MAC_ARG(get_sa(pframe)), MAC_ARG(p + 6)); MAC_ARG(get_sa(pframe)), MAC_ARG(p + 6));
goto _non_rc_device; goto _non_rc_device;
} }
RTW_INFO("%s, got the pairing device("MAC_FMT")\n", __FUNCTION__, MAC_ARG(get_sa(pframe))); RTW_INFO("%s, got the pairing device("MAC_FMT")\n", __func__, MAC_ARG(get_sa(pframe)));
/* new a station */ /* new a station */
psta = rtw_get_stainfo(pstapriv, get_sa(pframe)); psta = rtw_get_stainfo(pstapriv, get_sa(pframe));
@ -1809,7 +1809,7 @@ unsigned int OnProbeRsp(_adapter *padapter, union recv_frame *precv_frame)
return _SUCCESS; return _SUCCESS;
} else if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING)) { } else if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING)) {
if (_TRUE == pwdinfo->nego_req_info.benable) { if (_TRUE == pwdinfo->nego_req_info.benable) {
RTW_INFO("[%s] P2P State is GONEGO ING!\n", __FUNCTION__); RTW_INFO("[%s] P2P State is GONEGO ING!\n", __func__);
if (_rtw_memcmp(pwdinfo->nego_req_info.peerDevAddr, get_addr2_ptr(pframe), ETH_ALEN)) { if (_rtw_memcmp(pwdinfo->nego_req_info.peerDevAddr, get_addr2_ptr(pframe), ETH_ALEN)) {
pwdinfo->nego_req_info.benable = _FALSE; pwdinfo->nego_req_info.benable = _FALSE;
issue_p2p_GO_request(padapter, pwdinfo->nego_req_info.peerDevAddr); issue_p2p_GO_request(padapter, pwdinfo->nego_req_info.peerDevAddr);
@ -1817,7 +1817,7 @@ unsigned int OnProbeRsp(_adapter *padapter, union recv_frame *precv_frame)
} }
} else if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_INVITE_REQ)) { } else if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_TX_INVITE_REQ)) {
if (_TRUE == pwdinfo->invitereq_info.benable) { if (_TRUE == pwdinfo->invitereq_info.benable) {
RTW_INFO("[%s] P2P_STATE_TX_INVITE_REQ!\n", __FUNCTION__); RTW_INFO("[%s] P2P_STATE_TX_INVITE_REQ!\n", __func__);
if (_rtw_memcmp(pwdinfo->invitereq_info.peer_macaddr, get_addr2_ptr(pframe), ETH_ALEN)) { if (_rtw_memcmp(pwdinfo->invitereq_info.peer_macaddr, get_addr2_ptr(pframe), ETH_ALEN)) {
pwdinfo->invitereq_info.benable = _FALSE; pwdinfo->invitereq_info.benable = _FALSE;
issue_p2p_invitation_request(padapter, pwdinfo->invitereq_info.peer_macaddr); issue_p2p_invitation_request(padapter, pwdinfo->invitereq_info.peer_macaddr);
@ -2368,7 +2368,7 @@ unsigned int OnAuthClient(_adapter *padapter, union recv_frame *precv_frame)
u8 *pframe = precv_frame->u.hdr.rx_data; u8 *pframe = precv_frame->u.hdr.rx_data;
uint pkt_len = precv_frame->u.hdr.len; uint pkt_len = precv_frame->u.hdr.len;
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
/* check A1 matches or not */ /* check A1 matches or not */
if (!_rtw_memcmp(adapter_mac_addr(padapter), get_da(pframe), ETH_ALEN)) if (!_rtw_memcmp(adapter_mac_addr(padapter), get_da(pframe), ETH_ALEN))
@ -2538,7 +2538,7 @@ unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame)
pos = pframe + (IEEE80211_3ADDR_LEN + ie_offset); pos = pframe + (IEEE80211_3ADDR_LEN + ie_offset);
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
/* check if this stat has been successfully authenticated/assocated */ /* check if this stat has been successfully authenticated/assocated */
if (!((pstat->state) & WIFI_FW_AUTH_SUCCESS)) { if (!((pstat->state) & WIFI_FW_AUTH_SUCCESS)) {
@ -3063,7 +3063,7 @@ unsigned int OnAssocRsp(_adapter *padapter, union recv_frame *precv_frame)
uint pkt_len = precv_frame->u.hdr.len; uint pkt_len = precv_frame->u.hdr.len;
PNDIS_802_11_VARIABLE_IEs pWapiIE = NULL; PNDIS_802_11_VARIABLE_IEs pWapiIE = NULL;
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
/* check A1 matches or not */ /* check A1 matches or not */
if (!_rtw_memcmp(adapter_mac_addr(padapter), get_da(pframe), ETH_ALEN)) if (!_rtw_memcmp(adapter_mac_addr(padapter), get_da(pframe), ETH_ALEN))
@ -3337,7 +3337,7 @@ unsigned int OnDisassoc(_adapter *padapter, union recv_frame *precv_frame)
unsigned int OnAtim(_adapter *padapter, union recv_frame *precv_frame) unsigned int OnAtim(_adapter *padapter, union recv_frame *precv_frame)
{ {
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
return _SUCCESS; return _SUCCESS;
} }
@ -3799,7 +3799,7 @@ unsigned int OnAction_back(_adapter *padapter, union recv_frame *precv_frame)
#ifdef CONFIG_80211N_HT #ifdef CONFIG_80211N_HT
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
/* check RA matches or not */ /* check RA matches or not */
if (!_rtw_memcmp(adapter_mac_addr(padapter), GetAddr1Ptr(pframe), ETH_ALEN)) if (!_rtw_memcmp(adapter_mac_addr(padapter), GetAddr1Ptr(pframe), ETH_ALEN))
@ -3829,14 +3829,14 @@ unsigned int OnAction_back(_adapter *padapter, union recv_frame *precv_frame)
if ((psta->tdls_sta_state & TDLS_LINKED_STATE) && if ((psta->tdls_sta_state & TDLS_LINKED_STATE) &&
(psta->htpriv.ht_option == _TRUE) && (psta->htpriv.ht_option == _TRUE) &&
(psta->htpriv.ampdu_enable == _TRUE)) (psta->htpriv.ampdu_enable == _TRUE))
RTW_INFO("Recv [%s] from direc link\n", __FUNCTION__); RTW_INFO("Recv [%s] from direc link\n", __func__);
else else
#endif /* CONFIG_TDLS */ #endif /* CONFIG_TDLS */
if (!pmlmeinfo->HT_enable) if (!pmlmeinfo->HT_enable)
return _SUCCESS; return _SUCCESS;
action = frame_body[1]; action = frame_body[1];
RTW_INFO("%s, action=%d\n", __FUNCTION__, action); RTW_INFO("%s, action=%d\n", __func__, action);
switch (action) { switch (action) {
case RTW_WLAN_ACTION_ADDBA_REQ: /* ADDBA request */ case RTW_WLAN_ACTION_ADDBA_REQ: /* ADDBA request */
@ -3887,7 +3887,7 @@ unsigned int OnAction_back(_adapter *padapter, union recv_frame *precv_frame)
preorder_ctrl->ampdu_size = RX_AMPDU_SIZE_INVALID; preorder_ctrl->ampdu_size = RX_AMPDU_SIZE_INVALID;
} }
RTW_INFO("%s(): DELBA: %x(%x)\n", __FUNCTION__, pmlmeinfo->agg_enable_bitmap, reason_code); RTW_INFO("%s(): DELBA: %x(%x)\n", __func__, pmlmeinfo->agg_enable_bitmap, reason_code);
/* todo: how to notify the host while receiving DELETE BA */ /* todo: how to notify the host while receiving DELETE BA */
break; break;
@ -3963,7 +3963,7 @@ void issue_p2p_GO_request(_adapter *padapter, u8 *raddr)
if (pmgntframe == NULL) if (pmgntframe == NULL)
return; return;
RTW_INFO("[%s] In\n", __FUNCTION__); RTW_INFO("[%s] In\n", __func__);
/* update attribute */ /* update attribute */
pattrib = &pmgntframe->attrib; pattrib = &pmgntframe->attrib;
update_mgntframe_attrib(padapter, pattrib); update_mgntframe_attrib(padapter, pattrib);
@ -4374,7 +4374,7 @@ static void issue_p2p_GO_response(_adapter *padapter, u8 *raddr, u8 *frame_body,
if (pmgntframe == NULL) if (pmgntframe == NULL)
return; return;
RTW_INFO("[%s] In, result = %d\n", __FUNCTION__, result); RTW_INFO("[%s] In, result = %d\n", __func__, result);
/* update attribute */ /* update attribute */
pattrib = &pmgntframe->attrib; pattrib = &pmgntframe->attrib;
update_mgntframe_attrib(padapter, pattrib); update_mgntframe_attrib(padapter, pattrib);
@ -4799,7 +4799,7 @@ static void issue_p2p_GO_confirm(_adapter *padapter, u8 *raddr, u8 result)
if (pmgntframe == NULL) if (pmgntframe == NULL)
return; return;
RTW_INFO("[%s] In\n", __FUNCTION__); RTW_INFO("[%s] In\n", __func__);
/* update attribute */ /* update attribute */
pattrib = &pmgntframe->attrib; pattrib = &pmgntframe->attrib;
update_mgntframe_attrib(padapter, pattrib); update_mgntframe_attrib(padapter, pattrib);
@ -5599,7 +5599,7 @@ void issue_p2p_provision_request(_adapter *padapter, u8 *pssid, u8 ussidlen, u8
if (pmgntframe == NULL) if (pmgntframe == NULL)
return; return;
RTW_INFO("[%s] In\n", __FUNCTION__); RTW_INFO("[%s] In\n", __func__);
/* update attribute */ /* update attribute */
pattrib = &pmgntframe->attrib; pattrib = &pmgntframe->attrib;
update_mgntframe_attrib(padapter, pattrib); update_mgntframe_attrib(padapter, pattrib);
@ -5686,15 +5686,15 @@ static u8 is_matched_in_profilelist(u8 *peermacaddr, struct profile_info *profil
{ {
u8 i, match_result = 0; u8 i, match_result = 0;
RTW_INFO("[%s] peermac = %.2X %.2X %.2X %.2X %.2X %.2X\n", __FUNCTION__, RTW_INFO("[%s] peermac = %.2X %.2X %.2X %.2X %.2X %.2X\n", __func__,
peermacaddr[0], peermacaddr[1], peermacaddr[2], peermacaddr[3], peermacaddr[4], peermacaddr[5]); peermacaddr[0], peermacaddr[1], peermacaddr[2], peermacaddr[3], peermacaddr[4], peermacaddr[5]);
for (i = 0; i < P2P_MAX_PERSISTENT_GROUP_NUM; i++, profileinfo++) { for (i = 0; i < P2P_MAX_PERSISTENT_GROUP_NUM; i++, profileinfo++) {
RTW_INFO("[%s] profileinfo_mac = %.2X %.2X %.2X %.2X %.2X %.2X\n", __FUNCTION__, RTW_INFO("[%s] profileinfo_mac = %.2X %.2X %.2X %.2X %.2X %.2X\n", __func__,
profileinfo->peermac[0], profileinfo->peermac[1], profileinfo->peermac[2], profileinfo->peermac[3], profileinfo->peermac[4], profileinfo->peermac[5]); profileinfo->peermac[0], profileinfo->peermac[1], profileinfo->peermac[2], profileinfo->peermac[3], profileinfo->peermac[4], profileinfo->peermac[5]);
if (_rtw_memcmp(peermacaddr, profileinfo->peermac, ETH_ALEN)) { if (_rtw_memcmp(peermacaddr, profileinfo->peermac, ETH_ALEN)) {
match_result = 1; match_result = 1;
RTW_INFO("[%s] Match!\n", __FUNCTION__); RTW_INFO("[%s] Match!\n", __func__);
break; break;
} }
} }
@ -5727,7 +5727,7 @@ void issue_probersp_p2p(_adapter *padapter, unsigned char *da)
u8 zero_array_check[L2SDTA_SERVICE_VE_LEN] = { 0x00 }; u8 zero_array_check[L2SDTA_SERVICE_VE_LEN] = { 0x00 };
#endif /* CONFIG_INTEL_WIDI */ #endif /* CONFIG_INTEL_WIDI */
/* RTW_INFO("%s\n", __FUNCTION__); */ /* RTW_INFO("%s\n", __func__); */
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) if (pmgntframe == NULL)
@ -6463,7 +6463,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame)
switch (frame_body[6]) { /* OUI Subtype */ switch (frame_body[6]) { /* OUI Subtype */
case P2P_GO_NEGO_REQ: { case P2P_GO_NEGO_REQ: {
RTW_INFO("[%s] Got GO Nego Req Frame\n", __FUNCTION__); RTW_INFO("[%s] Got GO Nego Req Frame\n", __func__);
_rtw_memset(&pwdinfo->groupid_info, 0x00, sizeof(struct group_id_info)); _rtw_memset(&pwdinfo->groupid_info, 0x00, sizeof(struct group_id_info));
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_REQ)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_REQ))
@ -6475,7 +6475,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame)
_cancel_timer_ex(&pwdinfo->restore_p2p_state_timer); _cancel_timer_ex(&pwdinfo->restore_p2p_state_timer);
/* Restore the previous p2p state */ /* Restore the previous p2p state */
rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo)); rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo));
RTW_INFO("[%s] Restore the previous p2p state to %d\n", __FUNCTION__, rtw_p2p_state(pwdinfo)); RTW_INFO("[%s] Restore the previous p2p state to %d\n", __func__, rtw_p2p_state(pwdinfo));
} }
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if (rtw_mi_buddy_check_fwstate(padapter, _FW_LINKED)) if (rtw_mi_buddy_check_fwstate(padapter, _FW_LINKED))
@ -6513,7 +6513,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame)
break; break;
} }
case P2P_GO_NEGO_RESP: { case P2P_GO_NEGO_RESP: {
RTW_INFO("[%s] Got GO Nego Resp Frame\n", __FUNCTION__); RTW_INFO("[%s] Got GO Nego Resp Frame\n", __func__);
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING)) { if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING)) {
/* Commented by Albert 20110425 */ /* Commented by Albert 20110425 */
@ -6541,12 +6541,12 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame)
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_FAIL)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_FAIL))
_set_timer(&pwdinfo->restore_p2p_state_timer, 5000); _set_timer(&pwdinfo->restore_p2p_state_timer, 5000);
} else } else
RTW_INFO("[%s] Skipped GO Nego Resp Frame (p2p_state != P2P_STATE_GONEGO_ING)\n", __FUNCTION__); RTW_INFO("[%s] Skipped GO Nego Resp Frame (p2p_state != P2P_STATE_GONEGO_ING)\n", __func__);
break; break;
} }
case P2P_GO_NEGO_CONF: { case P2P_GO_NEGO_CONF: {
RTW_INFO("[%s] Got GO Nego Confirm Frame\n", __FUNCTION__); RTW_INFO("[%s] Got GO Nego Confirm Frame\n", __func__);
result = process_p2p_group_negotation_confirm(pwdinfo, frame_body, len); result = process_p2p_group_negotation_confirm(pwdinfo, frame_body, len);
if (P2P_STATUS_SUCCESS == result) { if (P2P_STATUS_SUCCESS == result) {
if (rtw_p2p_role(pwdinfo) == P2P_ROLE_CLIENT) { if (rtw_p2p_role(pwdinfo) == P2P_ROLE_CLIENT) {
@ -6566,7 +6566,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame)
/* Added by Albert 2010/10/05 */ /* Added by Albert 2010/10/05 */
/* Received the P2P Invite Request frame. */ /* Received the P2P Invite Request frame. */
RTW_INFO("[%s] Got invite request frame!\n", __FUNCTION__); RTW_INFO("[%s] Got invite request frame!\n", __func__);
p2p_ie = rtw_get_p2p_ie(frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, NULL, &p2p_ielen); p2p_ie = rtw_get_p2p_ie(frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, NULL, &p2p_ielen);
if (p2p_ie) { if (p2p_ie) {
/* Parse the necessary information from the P2P Invitation Request frame. */ /* Parse the necessary information from the P2P Invitation Request frame. */
@ -6581,7 +6581,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame)
merged_p2pie = rtw_zmalloc(merged_p2p_ielen + 2); /* 2 is for EID and Length */ merged_p2pie = rtw_zmalloc(merged_p2p_ielen + 2); /* 2 is for EID and Length */
if (merged_p2pie == NULL) { if (merged_p2pie == NULL) {
RTW_INFO("[%s] Malloc p2p ie fail\n", __FUNCTION__); RTW_INFO("[%s] Malloc p2p ie fail\n", __func__);
goto exit; goto exit;
} }
_rtw_memset(merged_p2pie, 0x00, merged_p2p_ielen); _rtw_memset(merged_p2pie, 0x00, merged_p2p_ielen);
@ -6599,7 +6599,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame)
/* After having the peer interface address, the sigma can find the correct conf file for wpa_supplicant. */ /* After having the peer interface address, the sigma can find the correct conf file for wpa_supplicant. */
if (attr_contentlen) { if (attr_contentlen) {
RTW_INFO("[%s] GO's BSSID = %.2X %.2X %.2X %.2X %.2X %.2X\n", __FUNCTION__, RTW_INFO("[%s] GO's BSSID = %.2X %.2X %.2X %.2X %.2X %.2X\n", __func__,
pwdinfo->p2p_peer_interface_addr[0], pwdinfo->p2p_peer_interface_addr[1], pwdinfo->p2p_peer_interface_addr[0], pwdinfo->p2p_peer_interface_addr[1],
pwdinfo->p2p_peer_interface_addr[2], pwdinfo->p2p_peer_interface_addr[3], pwdinfo->p2p_peer_interface_addr[2], pwdinfo->p2p_peer_interface_addr[3],
pwdinfo->p2p_peer_interface_addr[4], pwdinfo->p2p_peer_interface_addr[5]); pwdinfo->p2p_peer_interface_addr[4], pwdinfo->p2p_peer_interface_addr[5]);
@ -6661,7 +6661,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame)
} }
} }
} else { } else {
RTW_INFO("[%s] P2P Group ID Attribute NOT FOUND!\n", __FUNCTION__); RTW_INFO("[%s] P2P Group ID Attribute NOT FOUND!\n", __func__);
status_code = P2P_STATUS_FAIL_INFO_UNAVAILABLE; status_code = P2P_STATUS_FAIL_INFO_UNAVAILABLE;
} }
} else { } else {
@ -6687,16 +6687,16 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame)
status_code = P2P_STATUS_SUCCESS; status_code = P2P_STATUS_SUCCESS;
} }
} else { } else {
RTW_INFO("[%s] P2P Group ID Attribute NOT FOUND!\n", __FUNCTION__); RTW_INFO("[%s] P2P Group ID Attribute NOT FOUND!\n", __func__);
status_code = P2P_STATUS_FAIL_INFO_UNAVAILABLE; status_code = P2P_STATUS_FAIL_INFO_UNAVAILABLE;
} }
} }
} else { } else {
RTW_INFO("[%s] P2P Invitation Flags Attribute NOT FOUND!\n", __FUNCTION__); RTW_INFO("[%s] P2P Invitation Flags Attribute NOT FOUND!\n", __func__);
status_code = P2P_STATUS_FAIL_INFO_UNAVAILABLE; status_code = P2P_STATUS_FAIL_INFO_UNAVAILABLE;
} }
RTW_INFO("[%s] status_code = %d\n", __FUNCTION__, status_code); RTW_INFO("[%s] status_code = %d\n", __func__, status_code);
pwdinfo->inviteresp_info.token = frame_body[7]; pwdinfo->inviteresp_info.token = frame_body[7];
issue_p2p_invitation_response(padapter, get_addr2_ptr(pframe), pwdinfo->inviteresp_info.token, status_code); issue_p2p_invitation_response(padapter, get_addr2_ptr(pframe), pwdinfo->inviteresp_info.token, status_code);
@ -6715,14 +6715,14 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame)
u8 attr_content = 0x00; u8 attr_content = 0x00;
u32 attr_contentlen = 0; u32 attr_contentlen = 0;
RTW_INFO("[%s] Got invite response frame!\n", __FUNCTION__); RTW_INFO("[%s] Got invite response frame!\n", __func__);
_cancel_timer_ex(&pwdinfo->restore_p2p_state_timer); _cancel_timer_ex(&pwdinfo->restore_p2p_state_timer);
p2p_ie = rtw_get_p2p_ie(frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, NULL, &p2p_ielen); p2p_ie = rtw_get_p2p_ie(frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, NULL, &p2p_ielen);
if (p2p_ie) { if (p2p_ie) {
rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen); rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen);
if (attr_contentlen == 1) { if (attr_contentlen == 1) {
RTW_INFO("[%s] Status = %d\n", __FUNCTION__, attr_content); RTW_INFO("[%s] Status = %d\n", __func__, attr_content);
pwdinfo->invitereq_info.benable = _FALSE; pwdinfo->invitereq_info.benable = _FALSE;
if (attr_content == P2P_STATUS_SUCCESS) { if (attr_content == P2P_STATUS_SUCCESS) {
@ -6762,7 +6762,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame)
break; break;
case P2P_PROVISION_DISC_REQ: case P2P_PROVISION_DISC_REQ:
RTW_INFO("[%s] Got Provisioning Discovery Request Frame\n", __FUNCTION__); RTW_INFO("[%s] Got Provisioning Discovery Request Frame\n", __func__);
process_p2p_provdisc_req(pwdinfo, pframe, len); process_p2p_provdisc_req(pwdinfo, pframe, len);
_rtw_memcpy(pwdinfo->rx_prov_disc_info.peerDevAddr, get_addr2_ptr(pframe), ETH_ALEN); _rtw_memcpy(pwdinfo->rx_prov_disc_info.peerDevAddr, get_addr2_ptr(pframe), ETH_ALEN);
@ -6785,7 +6785,7 @@ static unsigned int on_action_public_p2p(union recv_frame *precv_frame)
case P2P_PROVISION_DISC_RESP: case P2P_PROVISION_DISC_RESP:
/* Commented by Albert 20110707 */ /* Commented by Albert 20110707 */
/* Should we check the pwdinfo->tx_prov_disc_info.bsent flag here?? */ /* Should we check the pwdinfo->tx_prov_disc_info.bsent flag here?? */
RTW_INFO("[%s] Got Provisioning Discovery Response Frame\n", __FUNCTION__); RTW_INFO("[%s] Got Provisioning Discovery Response Frame\n", __func__);
/* Commented by Albert 20110426 */ /* Commented by Albert 20110426 */
/* The restore timer is enabled when issuing the provisioing request frame in rtw_p2p_prov_disc function. */ /* The restore timer is enabled when issuing the provisioing request frame in rtw_p2p_prov_disc function. */
_cancel_timer_ex(&pwdinfo->restore_p2p_state_timer); _cancel_timer_ex(&pwdinfo->restore_p2p_state_timer);
@ -7270,7 +7270,7 @@ void update_mgnt_tx_rate(_adapter *padapter, u8 rate)
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
pmlmeext->tx_rate = rate; pmlmeext->tx_rate = rate;
/* RTW_INFO("%s(): rate = %x\n",__FUNCTION__, rate); */ /* RTW_INFO("%s(): rate = %x\n",__func__, rate); */
} }
@ -7508,7 +7508,7 @@ static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode)
ssid_ie = rtw_get_ie(ies, WLAN_EID_SSID, &ssid_len_ori, ies_len); ssid_ie = rtw_get_ie(ies, WLAN_EID_SSID, &ssid_len_ori, ies_len);
/* RTW_INFO("%s hidden_ssid_mode:%u, ssid_ie:%p, ssid_len_ori:%d\n", __FUNCTION__, hidden_ssid_mode, ssid_ie, ssid_len_ori); */ /* RTW_INFO("%s hidden_ssid_mode:%u, ssid_ie:%p, ssid_len_ori:%d\n", __func__, hidden_ssid_mode, ssid_ie, ssid_len_ori); */
if (ssid_ie && ssid_len_ori > 0) { if (ssid_ie && ssid_len_ori > 0) {
switch (hidden_ssid_mode) { switch (hidden_ssid_mode) {
@ -7576,7 +7576,7 @@ void issue_beacon(_adapter *padapter, int timeout_ms)
#endif /* CONFIG_P2P */ #endif /* CONFIG_P2P */
/* RTW_INFO("%s\n", __FUNCTION__); */ /* RTW_INFO("%s\n", __func__); */
#ifdef CONFIG_BCN_ICF #ifdef CONFIG_BCN_ICF
pmgntframe = rtw_alloc_bcnxmitframe(pxmitpriv); pmgntframe = rtw_alloc_bcnxmitframe(pxmitpriv);
@ -7586,7 +7586,7 @@ void issue_beacon(_adapter *padapter, int timeout_ms)
if (pmgntframe == NULL) if (pmgntframe == NULL)
#endif #endif
{ {
RTW_INFO("%s, alloc mgnt frame fail\n", __FUNCTION__); RTW_INFO("%s, alloc mgnt frame fail\n", __func__);
return; return;
} }
#if defined(CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) #if defined(CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME)
@ -7882,7 +7882,7 @@ void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probe
#endif #endif
#endif /* CONFIG_P2P */ #endif /* CONFIG_P2P */
/* RTW_INFO("%s\n", __FUNCTION__); */ /* RTW_INFO("%s\n", __func__); */
if (da == NULL) if (da == NULL)
return; return;
@ -7892,7 +7892,7 @@ void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probe
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) { if (pmgntframe == NULL) {
RTW_INFO("%s, alloc mgnt frame fail\n", __FUNCTION__); RTW_INFO("%s, alloc mgnt frame fail\n", __func__);
return; return;
} }
@ -8094,7 +8094,7 @@ void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probe
struct sta_info *psta; struct sta_info *psta;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
RTW_INFO("(%s)\n", __FUNCTION__); RTW_INFO("(%s)\n", __func__);
/* check rc station */ /* check rc station */
psta = rtw_get_stainfo(pstapriv, da); psta = rtw_get_stainfo(pstapriv, da);
@ -8104,7 +8104,7 @@ void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probe
/* EID[1] + EID_LEN[1] + RC_OUI[4] + MAC[6] + PairingID[2] + ChannelNum[2] */ /* EID[1] + EID_LEN[1] + RC_OUI[4] + MAC[6] + PairingID[2] + ChannelNum[2] */
u16 cu_ch = (u16)cur_network->Configuration.DSConfig; u16 cu_ch = (u16)cur_network->Configuration.DSConfig;
RTW_INFO("%s, reply rc(pid=0x%x) device "MAC_FMT" in ch=%d\n", __FUNCTION__, RTW_INFO("%s, reply rc(pid=0x%x) device "MAC_FMT" in ch=%d\n", __func__,
psta->pid, MAC_ARG(psta->hwaddr), cu_ch); psta->pid, MAC_ARG(psta->hwaddr), cu_ch);
/* append vendor specific ie */ /* append vendor specific ie */
@ -8390,7 +8390,7 @@ void issue_auth(_adapter *padapter, struct sta_info *psta, unsigned short status
} }
} }
/* RTW_INFO("%s auth_algo= %s auth_seq=%d\n",__FUNCTION__,(pmlmeinfo->auth_algo==0)?"OPEN":"SHARED",pmlmeinfo->auth_seq); */ /* RTW_INFO("%s auth_algo= %s auth_seq=%d\n",__func__,(pmlmeinfo->auth_algo==0)?"OPEN":"SHARED",pmlmeinfo->auth_seq); */
/* setting IV for auth seq #3 */ /* setting IV for auth seq #3 */
if ((pmlmeinfo->auth_seq == 3) && (pmlmeinfo->state & WIFI_FW_AUTH_STATE) && (use_shared_key == 1)) { if ((pmlmeinfo->auth_seq == 3) && (pmlmeinfo->state & WIFI_FW_AUTH_STATE) && (use_shared_key == 1)) {
@ -8456,7 +8456,7 @@ void issue_auth(_adapter *padapter, struct sta_info *psta, unsigned short status
pattrib->last_txcmdsz = pattrib->pktlen; pattrib->last_txcmdsz = pattrib->pktlen;
rtw_wep_encrypt(padapter, (u8 *)pmgntframe); rtw_wep_encrypt(padapter, (u8 *)pmgntframe);
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
dump_mgntframe(padapter, pmgntframe); dump_mgntframe(padapter, pmgntframe);
return; return;
@ -8489,7 +8489,7 @@ void issue_asocrsp(_adapter *padapter, unsigned short status, struct sta_info *p
if (rtw_rfctl_is_tx_blocked_by_ch_waiting(adapter_to_rfctl(padapter))) if (rtw_rfctl_is_tx_blocked_by_ch_waiting(adapter_to_rfctl(padapter)))
return; return;
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) if (pmgntframe == NULL)
@ -8849,7 +8849,7 @@ void _issue_assocreq(_adapter *padapter, u8 is_reassoc)
if (j == sta_bssrate_len) { if (j == sta_bssrate_len) {
/* the rate is not supported by STA */ /* the rate is not supported by STA */
RTW_INFO("%s(): the rate[%d]=%02X is not supported by STA!\n", __FUNCTION__, i, pmlmeinfo->network.SupportedRates[i]); RTW_INFO("%s(): the rate[%d]=%02X is not supported by STA!\n", __func__, i, pmlmeinfo->network.SupportedRates[i]);
} else { } else {
/* the rate is supported by STA */ /* the rate is supported by STA */
bssrate[index++] = pmlmeinfo->network.SupportedRates[i]; bssrate[index++] = pmlmeinfo->network.SupportedRates[i];
@ -8888,7 +8888,7 @@ void _issue_assocreq(_adapter *padapter, u8 is_reassoc)
} else if (bssrate_len > 0) } else if (bssrate_len > 0)
pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , bssrate_len , bssrate, &(pattrib->pktlen)); pframe = rtw_set_ie(pframe, _SUPPORTEDRATES_IE_ , bssrate_len , bssrate, &(pattrib->pktlen));
else else
RTW_INFO("%s: Connect to AP without 11b and 11g data rate!\n", __FUNCTION__); RTW_INFO("%s: Connect to AP without 11b and 11g data rate!\n", __func__);
/* vendor specific IE, such as WPA, WMM, WPS */ /* vendor specific IE, such as WPA, WMM, WPS */
for (i = sizeof(NDIS_802_11_FIXED_IEs); i < pmlmeinfo->network.IELength;) { for (i = sizeof(NDIS_802_11_FIXED_IEs); i < pmlmeinfo->network.IELength;) {
@ -9175,7 +9175,7 @@ static int _issue_nulldata(_adapter *padapter, unsigned char *da, unsigned int p
struct mlme_ext_priv *pmlmeext; struct mlme_ext_priv *pmlmeext;
struct mlme_ext_info *pmlmeinfo; struct mlme_ext_info *pmlmeinfo;
/* RTW_INFO("%s:%d\n", __FUNCTION__, power_mode); */ /* RTW_INFO("%s:%d\n", __func__, power_mode); */
if (!padapter) if (!padapter)
goto exit; goto exit;
@ -9366,7 +9366,7 @@ static int _issue_qos_nulldata(_adapter *padapter, unsigned char *da, u16 tid, i
if (rtw_rfctl_is_tx_blocked_by_ch_waiting(adapter_to_rfctl(padapter))) if (rtw_rfctl_is_tx_blocked_by_ch_waiting(adapter_to_rfctl(padapter)))
goto exit; goto exit;
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) if (pmgntframe == NULL)
@ -9709,11 +9709,11 @@ void issue_action_SA_Query(_adapter *padapter, unsigned char *raddr, unsigned ch
if (rtw_rfctl_is_tx_blocked_by_ch_waiting(adapter_to_rfctl(padapter))) if (rtw_rfctl_is_tx_blocked_by_ch_waiting(adapter_to_rfctl(padapter)))
return; return;
RTW_INFO("%s, %04x\n", __FUNCTION__, tid); RTW_INFO("%s, %04x\n", __func__, tid);
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) { if (pmgntframe == NULL) {
RTW_INFO("%s: alloc_mgtxmitframe fail\n", __FUNCTION__); RTW_INFO("%s: alloc_mgtxmitframe fail\n", __func__);
return; return;
} }
@ -10145,7 +10145,7 @@ static void issue_action_BSSCoexistPacket(_adapter *padapter)
if (rtw_rfctl_is_tx_blocked_by_ch_waiting(adapter_to_rfctl(padapter))) if (rtw_rfctl_is_tx_blocked_by_ch_waiting(adapter_to_rfctl(padapter)))
return; return;
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
category = RTW_WLAN_CATEGORY_PUBLIC; category = RTW_WLAN_CATEGORY_PUBLIC;
@ -10299,7 +10299,7 @@ static int _issue_action_SM_PS(_adapter *padapter , unsigned char *raddr , u8 N
if (rtw_rfctl_is_tx_blocked_by_ch_waiting(adapter_to_rfctl(padapter))) if (rtw_rfctl_is_tx_blocked_by_ch_waiting(adapter_to_rfctl(padapter)))
return ret; return ret;
RTW_INFO("%s, sm_power_control=%u, NewMimoPsMode=%u\n", __FUNCTION__ , sm_power_control , NewMimoPsMode); RTW_INFO("%s, sm_power_control=%u, NewMimoPsMode=%u\n", __func__ , sm_power_control , NewMimoPsMode);
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) if (pmgntframe == NULL)
@ -10511,7 +10511,7 @@ unsigned int send_beacon(_adapter *padapter)
#endif #endif
#ifdef CONFIG_PCI_HCI #ifdef CONFIG_PCI_HCI
/* RTW_INFO("%s\n", __FUNCTION__); */ /* RTW_INFO("%s\n", __func__); */
rtw_hal_set_hwreg(padapter, HW_VAR_BCN_VALID, NULL); rtw_hal_set_hwreg(padapter, HW_VAR_BCN_VALID, NULL);
@ -10550,15 +10550,15 @@ unsigned int send_beacon(_adapter *padapter)
if (_FALSE == bxmitok) { if (_FALSE == bxmitok) {
RTW_INFO("%s fail! %u ms\n", __FUNCTION__, rtw_get_passing_time_ms(start)); RTW_INFO("%s fail! %u ms\n", __func__, rtw_get_passing_time_ms(start));
return _FAIL; return _FAIL;
} else { } else {
u32 passing_time = rtw_get_passing_time_ms(start); u32 passing_time = rtw_get_passing_time_ms(start);
if (passing_time > 100 || issue > 3) if (passing_time > 100 || issue > 3)
RTW_INFO("%s success, issue:%d, poll:%d, %u ms\n", __FUNCTION__, issue, poll, rtw_get_passing_time_ms(start)); RTW_INFO("%s success, issue:%d, poll:%d, %u ms\n", __func__, issue, poll, rtw_get_passing_time_ms(start));
else if (0) else if (0)
RTW_INFO("%s success, issue:%d, poll:%d, %u ms\n", __FUNCTION__, issue, poll, rtw_get_passing_time_ms(start)); RTW_INFO("%s success, issue:%d, poll:%d, %u ms\n", __func__, issue, poll, rtw_get_passing_time_ms(start));
rtw_hal_fw_correct_bcn(padapter); rtw_hal_fw_correct_bcn(padapter);
@ -10658,7 +10658,7 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSI
if (*(p + 1)) { if (*(p + 1)) {
if (len > NDIS_802_11_LENGTH_SSID) { if (len > NDIS_802_11_LENGTH_SSID) {
RTW_INFO("%s()-%d: IE too long (%d) for survey event\n", __FUNCTION__, __LINE__, len); RTW_INFO("%s()-%d: IE too long (%d) for survey event\n", __func__, __LINE__, len);
return _FAIL; return _FAIL;
} }
_rtw_memcpy(bssid->Ssid.Ssid, (p + 2), *(p + 1)); _rtw_memcpy(bssid->Ssid.Ssid, (p + 2), *(p + 1));
@ -10673,7 +10673,7 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSI
p = rtw_get_ie(bssid->IEs + ie_offset, _SUPPORTEDRATES_IE_, &len, bssid->IELength - ie_offset); p = rtw_get_ie(bssid->IEs + ie_offset, _SUPPORTEDRATES_IE_, &len, bssid->IELength - ie_offset);
if (p != NULL) { if (p != NULL) {
if (len > NDIS_802_11_LENGTH_RATES_EX) { if (len > NDIS_802_11_LENGTH_RATES_EX) {
RTW_INFO("%s()-%d: IE too long (%d) for survey event\n", __FUNCTION__, __LINE__, len); RTW_INFO("%s()-%d: IE too long (%d) for survey event\n", __func__, __LINE__, len);
return _FAIL; return _FAIL;
} }
_rtw_memcpy(bssid->SupportedRates, (p + 2), len); _rtw_memcpy(bssid->SupportedRates, (p + 2), len);
@ -10683,7 +10683,7 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSI
p = rtw_get_ie(bssid->IEs + ie_offset, _EXT_SUPPORTEDRATES_IE_, &len, bssid->IELength - ie_offset); p = rtw_get_ie(bssid->IEs + ie_offset, _EXT_SUPPORTEDRATES_IE_, &len, bssid->IELength - ie_offset);
if (p != NULL) { if (p != NULL) {
if (len > (NDIS_802_11_LENGTH_RATES_EX - i)) { if (len > (NDIS_802_11_LENGTH_RATES_EX - i)) {
RTW_INFO("%s()-%d: IE too long (%d) for survey event\n", __FUNCTION__, __LINE__, len); RTW_INFO("%s()-%d: IE too long (%d) for survey event\n", __func__, __LINE__, len);
return _FAIL; return _FAIL;
} }
_rtw_memcpy(bssid->SupportedRates + i, (p + 2), len); _rtw_memcpy(bssid->SupportedRates + i, (p + 2), len);
@ -10714,7 +10714,7 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSI
} else { } else {
/* use current channel */ /* use current channel */
bssid->Configuration.DSConfig = padapter->mlmeextpriv.cur_channel; bssid->Configuration.DSConfig = padapter->mlmeextpriv.cur_channel;
RTW_INFO("%s()-%d: Cannot get p2p_ie. set DSconfig to op_ch(%d)\n", __FUNCTION__, __LINE__, bssid->Configuration.DSConfig); RTW_INFO("%s()-%d: Cannot get p2p_ie. set DSconfig to op_ch(%d)\n", __func__, __LINE__, bssid->Configuration.DSConfig);
} }
/* FIXME */ /* FIXME */
@ -11052,7 +11052,7 @@ unsigned int receive_disconnect(_adapter *padapter, unsigned char *MacAddr, unsi
if (!(_rtw_memcmp(MacAddr, get_my_bssid(&pmlmeinfo->network), ETH_ALEN))) if (!(_rtw_memcmp(MacAddr, get_my_bssid(&pmlmeinfo->network), ETH_ALEN)))
return _SUCCESS; return _SUCCESS;
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
if ((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE) { if ((pmlmeinfo->state & 0x03) == WIFI_FW_STATION_STATE) {
if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) { if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) {
@ -11110,7 +11110,7 @@ static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid)
_rtw_memset(country, 0, 4); _rtw_memset(country, 0, 4);
_rtw_memcpy(country, p, 3); _rtw_memcpy(country, p, 3);
p += 3; p += 3;
RTW_INFO("%s: 802.11d country=%s\n", __FUNCTION__, country); RTW_INFO("%s: 802.11d country=%s\n", __func__, country);
i = 0; i = 0;
while ((ie - p) >= 3) { while ((ie - p) >= 3) {
@ -11131,7 +11131,7 @@ static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid)
#ifdef CONFIG_RTW_DEBUG #ifdef CONFIG_RTW_DEBUG
i = 0; i = 0;
RTW_INFO("%s: AP[%s] channel plan {", __FUNCTION__, bssid->Ssid.Ssid); RTW_INFO("%s: AP[%s] channel plan {", __func__, bssid->Ssid.Ssid);
while ((i < chplan_ap.Len) && (chplan_ap.Channel[i] != 0)) { while ((i < chplan_ap.Len) && (chplan_ap.Channel[i] != 0)) {
_RTW_INFO("%02d,", chplan_ap.Channel[i]); _RTW_INFO("%02d,", chplan_ap.Channel[i]);
i++; i++;
@ -11142,7 +11142,7 @@ static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid)
_rtw_memcpy(chplan_sta, pmlmeext->channel_set, sizeof(chplan_sta)); _rtw_memcpy(chplan_sta, pmlmeext->channel_set, sizeof(chplan_sta));
#ifdef CONFIG_RTW_DEBUG #ifdef CONFIG_RTW_DEBUG
i = 0; i = 0;
RTW_INFO("%s: STA channel plan {", __FUNCTION__); RTW_INFO("%s: STA channel plan {", __func__);
while ((i < MAX_CHANNEL_NUM) && (chplan_sta[i].ChannelNum != 0)) { while ((i < MAX_CHANNEL_NUM) && (chplan_sta[i].ChannelNum != 0)) {
_RTW_INFO("%02d(%c),", chplan_sta[i].ChannelNum, chplan_sta[i].ScanType == SCAN_PASSIVE ? 'p' : 'a'); _RTW_INFO("%02d(%c),", chplan_sta[i].ChannelNum, chplan_sta[i].ScanType == SCAN_PASSIVE ? 'p' : 'a');
i++; i++;
@ -11289,7 +11289,7 @@ static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid)
#ifdef CONFIG_RTW_DEBUG #ifdef CONFIG_RTW_DEBUG
k = 0; k = 0;
RTW_INFO("%s: new STA channel plan {", __FUNCTION__); RTW_INFO("%s: new STA channel plan {", __func__);
while ((k < MAX_CHANNEL_NUM) && (chplan_new[k].ChannelNum != 0)) { while ((k < MAX_CHANNEL_NUM) && (chplan_new[k].ChannelNum != 0)) {
_RTW_INFO("%02d(%c),", chplan_new[k].ChannelNum, chplan_new[k].ScanType == SCAN_PASSIVE ? 'p' : 'c'); _RTW_INFO("%02d(%c),", chplan_new[k].ChannelNum, chplan_new[k].ScanType == SCAN_PASSIVE ? 'p' : 'c');
k++; k++;
@ -11304,7 +11304,7 @@ static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid)
while ((k < MAX_CHANNEL_NUM) && (chplan_new[k].ChannelNum != 0)) { while ((k < MAX_CHANNEL_NUM) && (chplan_new[k].ChannelNum != 0)) {
if (chplan_new[k].ChannelNum == channel) { if (chplan_new[k].ChannelNum == channel) {
RTW_INFO("%s: change mlme_ext sitesurvey channel index from %d to %d\n", RTW_INFO("%s: change mlme_ext sitesurvey channel index from %d to %d\n",
__FUNCTION__, pmlmeext->sitesurvey_res.channel_idx, k); __func__, pmlmeext->sitesurvey_res.channel_idx, k);
pmlmeext->sitesurvey_res.channel_idx = k; pmlmeext->sitesurvey_res.channel_idx = k;
break; break;
} }
@ -11326,7 +11326,7 @@ static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid)
chplan_new[i].ScanType = SCAN_ACTIVE; chplan_new[i].ScanType = SCAN_ACTIVE;
RTW_INFO("%s: change channel %d scan type from passive to active\n", RTW_INFO("%s: change channel %d scan type from passive to active\n",
__FUNCTION__, channel); __func__, channel);
} }
break; break;
} }
@ -12028,7 +12028,7 @@ exit_mlmeext_joinbss_event_callback:
rtw_join_done_chk_ch(padapter, join_res); rtw_join_done_chk_ch(padapter, join_res);
RTW_INFO("=>%s - End to Connection without 4-way\n", __FUNCTION__); RTW_INFO("=>%s - End to Connection without 4-way\n", __func__);
} }
/* currently only adhoc mode will go here */ /* currently only adhoc mode will go here */
@ -12038,7 +12038,7 @@ void mlmeext_sta_add_event_callback(_adapter *padapter, struct sta_info *psta)
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
u8 join_type; u8 join_type;
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
if ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) { if ((pmlmeinfo->state & 0x03) == WIFI_FW_ADHOC_STATE) {
if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) { /* adhoc master or sta_count>1 */ if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) { /* adhoc master or sta_count>1 */
@ -12344,7 +12344,7 @@ void linked_status_chk_tdls(_adapter *padapter)
if (num_teardown > 0) { if (num_teardown > 0) {
for (i = 0; i < num_teardown; i++) { for (i = 0; i < num_teardown; i++) {
RTW_INFO("[%s %d] Send teardown to "MAC_FMT"\n", __FUNCTION__, __LINE__, MAC_ARG(teardown[i].addr)); RTW_INFO("[%s %d] Send teardown to "MAC_FMT"\n", __func__, __LINE__, MAC_ARG(teardown[i].addr));
txmgmt.status_code = _RSON_TDLS_TEAR_TOOFAR_; txmgmt.status_code = _RSON_TDLS_TEAR_TOOFAR_;
_rtw_memcpy(txmgmt.peer, teardown[i].addr, ETH_ALEN); _rtw_memcpy(txmgmt.peer, teardown[i].addr, ETH_ALEN);
issue_tdls_teardown(padapter, &txmgmt, _FALSE); issue_tdls_teardown(padapter, &txmgmt, _FALSE);
@ -12524,7 +12524,7 @@ bypass_active_keep_alive:
#endif /* CONFIG_MCC_MODE */ #endif /* CONFIG_MCC_MODE */
) { ) {
#ifdef DBG_EXPIRATION_CHK #ifdef DBG_EXPIRATION_CHK
RTW_INFO("%s issue_nulldata(%d)\n", __FUNCTION__, from_timer ? 1 : 0); RTW_INFO("%s issue_nulldata(%d)\n", __func__, from_timer ? 1 : 0);
#endif #endif
tx_chk = issue_nulldata_in_interrupt(padapter, NULL, from_timer ? 1 : 0); tx_chk = issue_nulldata_in_interrupt(padapter, NULL, from_timer ? 1 : 0);
} }
@ -13008,7 +13008,7 @@ u8 NULL_hdl(_adapter *padapter, u8 *pbuf)
#ifdef CONFIG_AUTO_AP_MODE #ifdef CONFIG_AUTO_AP_MODE
void rtw_start_auto_ap(_adapter *adapter) void rtw_start_auto_ap(_adapter *adapter)
{ {
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
rtw_set_802_11_infrastructure_mode(adapter, Ndis802_11APMode); rtw_set_802_11_infrastructure_mode(adapter, Ndis802_11APMode);
@ -13084,7 +13084,7 @@ static int rtw_auto_ap_start_beacon(_adapter *adapter)
if (rateLen > 8) if (rateLen > 8)
ie = rtw_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8), (supportRate + 8), &sz); ie = rtw_set_ie(ie, _EXT_SUPPORTEDRATES_IE_, (rateLen - 8), (supportRate + 8), &sz);
RTW_INFO("%s, start auto ap beacon sz=%d\n", __FUNCTION__, sz); RTW_INFO("%s, start auto ap beacon sz=%d\n", __func__, sz);
/* lunch ap mode & start to issue beacon */ /* lunch ap mode & start to issue beacon */
if (rtw_check_beacon_data(adapter, pbuf, sz) == _SUCCESS) { if (rtw_check_beacon_data(adapter, pbuf, sz) == _SUCCESS) {
@ -13484,7 +13484,7 @@ static bool scan_abort_hdl(_adapter *adapter)
if (!rtw_p2p_chk_state(&adapter->wdinfo, P2P_STATE_NONE)) { if (!rtw_p2p_chk_state(&adapter->wdinfo, P2P_STATE_NONE)) {
rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_MAX); rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_MAX);
ss->channel_idx = 3; ss->channel_idx = 3;
RTW_INFO("%s idx:%d, cnt:%u\n", __FUNCTION__ RTW_INFO("%s idx:%d, cnt:%u\n", __func__
, ss->channel_idx , ss->channel_idx
, pwdinfo->find_phase_state_exchange_cnt , pwdinfo->find_phase_state_exchange_cnt
); );
@ -13492,7 +13492,7 @@ static bool scan_abort_hdl(_adapter *adapter)
#endif #endif
{ {
ss->channel_idx = ss->ch_num; ss->channel_idx = ss->ch_num;
RTW_INFO("%s idx:%d\n", __FUNCTION__ RTW_INFO("%s idx:%d\n", __func__
, ss->channel_idx , ss->channel_idx
); );
} }
@ -15456,7 +15456,7 @@ u8 tdls_hdl(_adapter *padapter, unsigned char *pbuf)
} }
/* _enter_critical_bh(&(ptdlsinfo->hdl_lock), &irqL); */ /* _enter_critical_bh(&(ptdlsinfo->hdl_lock), &irqL); */
/* RTW_INFO("[%s] option:%d\n", __FUNCTION__, option); */ /* RTW_INFO("[%s] option:%d\n", __func__, option); */
switch (option) { switch (option) {
case TDLS_ESTABLISHED: { case TDLS_ESTABLISHED: {

72
core/rtw_p2p.c
View file

@ -59,7 +59,7 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
pdata_attr = rtw_zmalloc(MAX_P2P_IE_LEN); pdata_attr = rtw_zmalloc(MAX_P2P_IE_LEN);
if (NULL == pdata_attr) { if (NULL == pdata_attr) {
RTW_INFO("%s pdata_attr malloc failed\n", __FUNCTION__); RTW_INFO("%s pdata_attr malloc failed\n", __func__);
goto _exit; goto _exit;
} }
@ -160,7 +160,7 @@ static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da)
u8 oui_subtype = P2P_GO_DISC_REQUEST; u8 oui_subtype = P2P_GO_DISC_REQUEST;
u8 dialogToken = 0; u8 dialogToken = 0;
RTW_INFO("[%s]\n", __FUNCTION__); RTW_INFO("[%s]\n", __func__);
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) if (pmgntframe == NULL)
@ -220,7 +220,7 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s
u8 p2pie[8] = { 0x00 }; u8 p2pie[8] = { 0x00 };
u32 p2pielen = 0; u32 p2pielen = 0;
RTW_INFO("[%s]\n", __FUNCTION__); RTW_INFO("[%s]\n", __func__);
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) if (pmgntframe == NULL)
@ -402,7 +402,7 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8
u8 noa_attr_content[32] = { 0x00 }; u8 noa_attr_content[32] = { 0x00 };
u32 p2pielen = 0; u32 p2pielen = 0;
RTW_INFO("[%s]\n", __FUNCTION__); RTW_INFO("[%s]\n", __func__);
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) if (pmgntframe == NULL)
@ -2344,15 +2344,15 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
p2p_ie = rtw_get_p2p_ie(ies , ies_len , NULL, &p2p_ielen); p2p_ie = rtw_get_p2p_ie(ies , ies_len , NULL, &p2p_ielen);
if (!p2p_ie) { if (!p2p_ie) {
RTW_INFO("[%s] P2P IE not Found!!\n", __FUNCTION__); RTW_INFO("[%s] P2P IE not Found!!\n", __func__);
status_code = P2P_STATUS_FAIL_INVALID_PARAM; status_code = P2P_STATUS_FAIL_INVALID_PARAM;
} else } else
RTW_INFO("[%s] P2P IE Found!!\n", __FUNCTION__); RTW_INFO("[%s] P2P IE Found!!\n", __func__);
while (p2p_ie) { while (p2p_ie) {
/* Check P2P Capability ATTR */ /* Check P2P Capability ATTR */
if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8 *)&le_tmp, (uint *) &attr_contentlen)) { if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8 *)&le_tmp, (uint *) &attr_contentlen)) {
RTW_INFO("[%s] Got P2P Capability Attr!!\n", __FUNCTION__); RTW_INFO("[%s] Got P2P Capability Attr!!\n", __func__);
cap_attr = le16_to_cpu(le_tmp); cap_attr = le16_to_cpu(le_tmp);
psta->dev_cap = cap_attr & 0xff; psta->dev_cap = cap_attr & 0xff;
} }
@ -2362,7 +2362,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
/* Check P2P Device Info ATTR */ /* Check P2P Device Info ATTR */
if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_INFO, NULL, (uint *)&attr_contentlen)) { if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_INFO, NULL, (uint *)&attr_contentlen)) {
RTW_INFO("[%s] Got P2P DEVICE INFO Attr!!\n", __FUNCTION__); RTW_INFO("[%s] Got P2P DEVICE INFO Attr!!\n", __func__);
pattr_content = pbuf = rtw_zmalloc(attr_contentlen); pattr_content = pbuf = rtw_zmalloc(attr_contentlen);
if (pattr_content) { if (pattr_content) {
u8 num_of_secdev_type; u8 num_of_secdev_type;
@ -2542,7 +2542,7 @@ u8 process_p2p_provdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
issue_p2p_provision_resp(pwdinfo, get_addr2_ptr(pframe), frame_body, uconfig_method); issue_p2p_provision_resp(pwdinfo, get_addr2_ptr(pframe), frame_body, uconfig_method);
} }
} }
RTW_INFO("[%s] config method = %s\n", __FUNCTION__, pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req); RTW_INFO("[%s] config method = %s\n", __func__, pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req);
return _TRUE; return _TRUE;
} }
@ -2639,7 +2639,7 @@ u8 process_p2p_group_negotation_req(struct wifidirect_info *pwdinfo, u8 *pframe,
_rtw_memcpy(pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pbc", 3); _rtw_memcpy(pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req, "pbc", 3);
} }
} else { } else {
RTW_INFO("[%s] WPS IE not Found!!\n", __FUNCTION__); RTW_INFO("[%s] WPS IE not Found!!\n", __func__);
result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM; result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
return result ; return result ;
@ -2651,7 +2651,7 @@ u8 process_p2p_group_negotation_req(struct wifidirect_info *pwdinfo, u8 *pframe,
p2p_ie = rtw_get_p2p_ie(ies, ies_len, NULL, &p2p_ielen); p2p_ie = rtw_get_p2p_ie(ies, ies_len, NULL, &p2p_ielen);
if (!p2p_ie) { if (!p2p_ie) {
RTW_INFO("[%s] P2P IE not Found!!\n", __FUNCTION__); RTW_INFO("[%s] P2P IE not Found!!\n", __func__);
result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM; result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
} }
@ -2682,7 +2682,7 @@ u8 process_p2p_group_negotation_req(struct wifidirect_info *pwdinfo, u8 *pframe,
} }
if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen)) { if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen)) {
RTW_INFO("[%s] GO Intent = %d, tie = %d\n", __FUNCTION__, attr_content >> 1, attr_content & 0x01); RTW_INFO("[%s] GO Intent = %d, tie = %d\n", __func__, attr_content >> 1, attr_content & 0x01);
pwdinfo->peer_intent = attr_content; /* include both intent and tie breaker values. */ pwdinfo->peer_intent = attr_content; /* include both intent and tie breaker values. */
if (pwdinfo->intent == (pwdinfo->peer_intent >> 1)) { if (pwdinfo->intent == (pwdinfo->peer_intent >> 1)) {
@ -2724,7 +2724,7 @@ u8 process_p2p_group_negotation_req(struct wifidirect_info *pwdinfo, u8 *pframe,
ch_num_inclusioned = rtw_p2p_ch_inclusion(&padapter->mlmeextpriv, peer_ch_list, peer_ch_num, ch_list_inclusioned); ch_num_inclusioned = rtw_p2p_ch_inclusion(&padapter->mlmeextpriv, peer_ch_list, peer_ch_num, ch_list_inclusioned);
if (ch_num_inclusioned == 0) { if (ch_num_inclusioned == 0) {
RTW_INFO("[%s] No common channel in channel list!\n", __FUNCTION__); RTW_INFO("[%s] No common channel in channel list!\n", __func__);
result = P2P_STATUS_FAIL_NO_COMMON_CH; result = P2P_STATUS_FAIL_NO_COMMON_CH;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
break; break;
@ -2736,7 +2736,7 @@ u8 process_p2p_group_negotation_req(struct wifidirect_info *pwdinfo, u8 *pframe,
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if (rtw_mi_check_status(padapter, MI_LINKED) if (rtw_mi_check_status(padapter, MI_LINKED)
&& padapter->registrypriv.full_ch_in_p2p_handshake == 0) { && padapter->registrypriv.full_ch_in_p2p_handshake == 0) {
RTW_INFO("[%s] desired channel NOT Found!\n", __FUNCTION__); RTW_INFO("[%s] desired channel NOT Found!\n", __func__);
result = P2P_STATUS_FAIL_NO_COMMON_CH; result = P2P_STATUS_FAIL_NO_COMMON_CH;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
break; break;
@ -2755,11 +2755,11 @@ u8 process_p2p_group_negotation_req(struct wifidirect_info *pwdinfo, u8 *pframe,
* Change our operating channel as peer's for compatibility. * Change our operating channel as peer's for compatibility.
*/ */
pwdinfo->operating_channel = peer_operating_ch; pwdinfo->operating_channel = peer_operating_ch;
RTW_INFO("[%s] Change op ch to %02x as peer's\n", __FUNCTION__, pwdinfo->operating_channel); RTW_INFO("[%s] Change op ch to %02x as peer's\n", __func__, pwdinfo->operating_channel);
} else { } else {
/* Take first channel of ch_list_inclusioned as operating channel */ /* Take first channel of ch_list_inclusioned as operating channel */
pwdinfo->operating_channel = ch_list_inclusioned[0]; pwdinfo->operating_channel = ch_list_inclusioned[0];
RTW_INFO("[%s] Change op ch to %02x\n", __FUNCTION__, pwdinfo->operating_channel); RTW_INFO("[%s] Change op ch to %02x\n", __func__, pwdinfo->operating_channel);
} }
} }
@ -2806,7 +2806,7 @@ u8 process_p2p_group_negotation_resp(struct wifidirect_info *pwdinfo, u8 *pframe
if (rtw_get_wps_ie(ies, ies_len, NULL, &wps_ielen)) { if (rtw_get_wps_ie(ies, ies_len, NULL, &wps_ielen)) {
} else { } else {
RTW_INFO("[%s] WPS IE not Found!!\n", __FUNCTION__); RTW_INFO("[%s] WPS IE not Found!!\n", __func__);
result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM; result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
} }
@ -2843,7 +2843,7 @@ u8 process_p2p_group_negotation_resp(struct wifidirect_info *pwdinfo, u8 *pframe
rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen); rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen);
if (attr_contentlen == 1) { if (attr_contentlen == 1) {
RTW_INFO("[%s] Status = %d\n", __FUNCTION__, attr_content); RTW_INFO("[%s] Status = %d\n", __func__, attr_content);
if (attr_content == P2P_STATUS_SUCCESS) { if (attr_content == P2P_STATUS_SUCCESS) {
/* Do nothing. */ /* Do nothing. */
} else { } else {
@ -2868,7 +2868,7 @@ u8 process_p2p_group_negotation_resp(struct wifidirect_info *pwdinfo, u8 *pframe
attr_content = 0x00; attr_content = 0x00;
attr_contentlen = 0; attr_contentlen = 0;
if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen)) { if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen)) {
RTW_INFO("[%s] GO Intent = %d, tie = %d\n", __FUNCTION__, attr_content >> 1, attr_content & 0x01); RTW_INFO("[%s] GO Intent = %d, tie = %d\n", __func__, attr_content >> 1, attr_content & 0x01);
pwdinfo->peer_intent = attr_content; /* include both intent and tie breaker values. */ pwdinfo->peer_intent = attr_content; /* include both intent and tie breaker values. */
if (pwdinfo->intent == (pwdinfo->peer_intent >> 1)) { if (pwdinfo->intent == (pwdinfo->peer_intent >> 1)) {
@ -2907,19 +2907,19 @@ u8 process_p2p_group_negotation_resp(struct wifidirect_info *pwdinfo, u8 *pframe
attr_contentlen = 0; attr_contentlen = 0;
if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen)) { if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen)) {
RTW_INFO("[%s] Peer's operating channel = %d\n", __FUNCTION__, operatingch_info[4]); RTW_INFO("[%s] Peer's operating channel = %d\n", __func__, operatingch_info[4]);
pwdinfo->peer_operating_ch = operatingch_info[4]; pwdinfo->peer_operating_ch = operatingch_info[4];
} }
/* Try to get the channel list information */ /* Try to get the channel list information */
if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, pwdinfo->channel_list_attr, &pwdinfo->channel_list_attr_len)) { if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, pwdinfo->channel_list_attr, &pwdinfo->channel_list_attr_len)) {
RTW_INFO("[%s] channel list attribute found, len = %d\n", __FUNCTION__, pwdinfo->channel_list_attr_len); RTW_INFO("[%s] channel list attribute found, len = %d\n", __func__, pwdinfo->channel_list_attr_len);
peer_ch_num = rtw_p2p_get_peer_ch_list(pwdinfo, pwdinfo->channel_list_attr, pwdinfo->channel_list_attr_len, peer_ch_list); peer_ch_num = rtw_p2p_get_peer_ch_list(pwdinfo, pwdinfo->channel_list_attr, pwdinfo->channel_list_attr_len, peer_ch_list);
ch_num_inclusioned = rtw_p2p_ch_inclusion(&padapter->mlmeextpriv, peer_ch_list, peer_ch_num, ch_list_inclusioned); ch_num_inclusioned = rtw_p2p_ch_inclusion(&padapter->mlmeextpriv, peer_ch_list, peer_ch_num, ch_list_inclusioned);
if (ch_num_inclusioned == 0) { if (ch_num_inclusioned == 0) {
RTW_INFO("[%s] No common channel in channel list!\n", __FUNCTION__); RTW_INFO("[%s] No common channel in channel list!\n", __func__);
result = P2P_STATUS_FAIL_NO_COMMON_CH; result = P2P_STATUS_FAIL_NO_COMMON_CH;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
break; break;
@ -2931,7 +2931,7 @@ u8 process_p2p_group_negotation_resp(struct wifidirect_info *pwdinfo, u8 *pframe
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if (rtw_mi_check_status(padapter, MI_LINKED) if (rtw_mi_check_status(padapter, MI_LINKED)
&& padapter->registrypriv.full_ch_in_p2p_handshake == 0) { && padapter->registrypriv.full_ch_in_p2p_handshake == 0) {
RTW_INFO("[%s] desired channel NOT Found!\n", __FUNCTION__); RTW_INFO("[%s] desired channel NOT Found!\n", __func__);
result = P2P_STATUS_FAIL_NO_COMMON_CH; result = P2P_STATUS_FAIL_NO_COMMON_CH;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
break; break;
@ -2950,11 +2950,11 @@ u8 process_p2p_group_negotation_resp(struct wifidirect_info *pwdinfo, u8 *pframe
* Change our operating channel as peer's for compatibility. * Change our operating channel as peer's for compatibility.
*/ */
pwdinfo->operating_channel = peer_operating_ch; pwdinfo->operating_channel = peer_operating_ch;
RTW_INFO("[%s] Change op ch to %02x as peer's\n", __FUNCTION__, pwdinfo->operating_channel); RTW_INFO("[%s] Change op ch to %02x as peer's\n", __func__, pwdinfo->operating_channel);
} else { } else {
/* Take first channel of ch_list_inclusioned as operating channel */ /* Take first channel of ch_list_inclusioned as operating channel */
pwdinfo->operating_channel = ch_list_inclusioned[0]; pwdinfo->operating_channel = ch_list_inclusioned[0];
RTW_INFO("[%s] Change op ch to %02x\n", __FUNCTION__, pwdinfo->operating_channel); RTW_INFO("[%s] Change op ch to %02x\n", __func__, pwdinfo->operating_channel);
} }
} }
@ -2962,7 +2962,7 @@ u8 process_p2p_group_negotation_resp(struct wifidirect_info *pwdinfo, u8 *pframe
} }
} else } else
RTW_INFO("[%s] channel list attribute not found!\n", __FUNCTION__); RTW_INFO("[%s] channel list attribute not found!\n", __func__);
/* Try to get the group id information if peer is GO */ /* Try to get the group id information if peer is GO */
attr_contentlen = 0; attr_contentlen = 0;
@ -3006,7 +3006,7 @@ u8 process_p2p_group_negotation_confirm(struct wifidirect_info *pwdinfo, u8 *pfr
pwdinfo->negotiation_dialog_token = 1; pwdinfo->negotiation_dialog_token = 1;
rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen); rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen);
if (attr_contentlen == 1) { if (attr_contentlen == 1) {
RTW_INFO("[%s] Status = %d\n", __FUNCTION__, attr_content); RTW_INFO("[%s] Status = %d\n", __func__, attr_content);
result = attr_content; result = attr_content;
if (attr_content == P2P_STATUS_SUCCESS) { if (attr_content == P2P_STATUS_SUCCESS) {
@ -3048,14 +3048,14 @@ u8 process_p2p_group_negotation_confirm(struct wifidirect_info *pwdinfo, u8 *pfr
attr_contentlen = 0; attr_contentlen = 0;
_rtw_memset(groupid, 0x00, 38); _rtw_memset(groupid, 0x00, 38);
if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen)) { 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", __FUNCTION__, &groupid[ETH_ALEN], strlen(&groupid[ETH_ALEN])); 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); _rtw_memcpy(pwdinfo->groupid_info.go_device_addr, &groupid[0], ETH_ALEN);
_rtw_memcpy(pwdinfo->groupid_info.ssid, &groupid[6], attr_contentlen - ETH_ALEN); _rtw_memcpy(pwdinfo->groupid_info.ssid, &groupid[6], attr_contentlen - ETH_ALEN);
} }
attr_contentlen = 0; attr_contentlen = 0;
if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen)) { if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen)) {
RTW_INFO("[%s] Peer's operating channel = %d\n", __FUNCTION__, operatingch_info[4]); RTW_INFO("[%s] Peer's operating channel = %d\n", __func__, operatingch_info[4]);
pwdinfo->peer_operating_ch = operatingch_info[4]; pwdinfo->peer_operating_ch = operatingch_info[4];
} }
@ -3205,7 +3205,7 @@ void p2p_concurrent_handler(_adapter *padapter)
/* Now, the driver stays on the AP's channel. */ /* Now, the driver stays on the AP's channel. */
/* If the pwdinfo->ext_listen_period = 0, that means the P2P listen state is not available on listen channel. */ /* If the pwdinfo->ext_listen_period = 0, that means the P2P listen state is not available on listen channel. */
if (pwdinfo->ext_listen_period > 0) { if (pwdinfo->ext_listen_period > 0) {
RTW_INFO("[%s] P2P_STATE_IDLE, ext_listen_period = %d\n", __FUNCTION__, pwdinfo->ext_listen_period); RTW_INFO("[%s] P2P_STATE_IDLE, ext_listen_period = %d\n", __func__, pwdinfo->ext_listen_period);
if (union_ch != pwdinfo->listen_channel) { if (union_ch != pwdinfo->listen_channel) {
/* Will switch to listen channel so that need to send the NULL data with PW bit to AP. */ /* Will switch to listen channel so that need to send the NULL data with PW bit to AP. */
@ -3227,7 +3227,7 @@ void p2p_concurrent_handler(_adapter *padapter)
(rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING) && pwdinfo->nego_req_info.benable == _FALSE) || (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING) && pwdinfo->nego_req_info.benable == _FALSE) ||
rtw_p2p_chk_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_REQ)) { rtw_p2p_chk_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_REQ)) {
/* Now, the driver is in the listen state of P2P mode. */ /* Now, the driver is in the listen state of P2P mode. */
RTW_INFO("[%s] P2P_STATE_IDLE, ext_listen_interval = %d\n", __FUNCTION__, pwdinfo->ext_listen_interval); RTW_INFO("[%s] P2P_STATE_IDLE, ext_listen_interval = %d\n", __func__, pwdinfo->ext_listen_interval);
/* Commented by Albert 2012/11/01 */ /* Commented by Albert 2012/11/01 */
/* If the AP's channel is the same as the listen channel, we should still be in the listen state */ /* If the AP's channel is the same as the listen channel, we should still be in the listen state */
@ -4476,7 +4476,7 @@ void p2p_ps_wk_hdl(_adapter *padapter, u8 p2p_ps_state)
if (pwdinfo->ctwindow > 0) { if (pwdinfo->ctwindow > 0) {
if (pwrpriv->smart_ps != 0) { if (pwrpriv->smart_ps != 0) {
pwrpriv->smart_ps = 0; pwrpriv->smart_ps = 0;
RTW_INFO("%s(): Enter CTW, change SmartPS\n", __FUNCTION__); RTW_INFO("%s(): Enter CTW, change SmartPS\n", __func__);
rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&(pwrpriv->pwr_mode))); rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&(pwrpriv->pwr_mode)));
} }
} }
@ -4564,7 +4564,7 @@ static void reset_ch_sitesurvey_timer_process(struct timer_list *t)
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
return; return;
RTW_INFO("[%s] In\n", __FUNCTION__); RTW_INFO("[%s] In\n", __func__);
/* Reset the operation channel information */ /* Reset the operation channel information */
pwdinfo->rx_invitereq_info.operation_ch[0] = 0; pwdinfo->rx_invitereq_info.operation_ch[0] = 0;
#ifdef CONFIG_P2P_OP_CHK_SOCIAL_CH #ifdef CONFIG_P2P_OP_CHK_SOCIAL_CH
@ -4591,7 +4591,7 @@ static void reset_ch_sitesurvey_timer_process2(struct timer_list *t)
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
return; return;
RTW_INFO("[%s] In\n", __FUNCTION__); RTW_INFO("[%s] In\n", __func__);
/* Reset the operation channel information */ /* Reset the operation channel information */
pwdinfo->p2p_info.operation_ch[0] = 0; pwdinfo->p2p_info.operation_ch[0] = 0;
#ifdef CONFIG_P2P_OP_CHK_SOCIAL_CH #ifdef CONFIG_P2P_OP_CHK_SOCIAL_CH
@ -4657,7 +4657,7 @@ static void pre_tx_scan_timer_process(struct timer_list *t)
if (_TRUE == pwdinfo->invitereq_info.benable) if (_TRUE == pwdinfo->invitereq_info.benable)
p2p_protocol_wk_cmd(adapter, P2P_PRE_TX_INVITEREQ_PROCESS_WK); p2p_protocol_wk_cmd(adapter, P2P_PRE_TX_INVITEREQ_PROCESS_WK);
} else } else
RTW_INFO("[%s] p2p_state is %d, ignore!!\n", __FUNCTION__, rtw_p2p_state(pwdinfo)); RTW_INFO("[%s] p2p_state is %d, ignore!!\n", __func__, rtw_p2p_state(pwdinfo));
_exit_critical_bh(&pmlmepriv->lock, &irqL); _exit_critical_bh(&pmlmepriv->lock, &irqL);
} }
@ -5055,7 +5055,7 @@ void init_wifidirect_info(_adapter *padapter, enum P2P_ROLE role)
rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_NONE); rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_NONE);
pwdinfo->listen_dwell = (u8)((rtw_get_current_time() % 3) + 1); pwdinfo->listen_dwell = (u8)((rtw_get_current_time() % 3) + 1);
/* RTW_INFO( "[%s] listen_dwell time is %d00ms\n", __FUNCTION__, pwdinfo->listen_dwell ); */ /* 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)); _rtw_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; pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_NONE;

74
core/rtw_pwrctrl.c
View file

@ -60,7 +60,7 @@ int rtw_fw_ps_state(PADAPTER padapter)
ret = _SUCCESS; ret = _SUCCESS;
else { else {
pdbgpriv->dbg_poll_fail_cnt++; pdbgpriv->dbg_poll_fail_cnt++;
RTW_INFO("%s: fw_ps_state=%04x\n", __FUNCTION__, fw_ps_state); RTW_INFO("%s: fw_ps_state=%04x\n", __func__, fw_ps_state);
} }
} }
@ -283,7 +283,7 @@ void rtw_ps_processor(_adapter *padapter)
if (pwrpriv->bInSuspend == _TRUE) { /* system suspend or autosuspend */ if (pwrpriv->bInSuspend == _TRUE) { /* system suspend or autosuspend */
pdbgpriv->dbg_ps_insuspend_cnt++; pdbgpriv->dbg_ps_insuspend_cnt++;
RTW_INFO("%s, pwrpriv->bInSuspend == _TRUE ignore this process\n", __FUNCTION__); RTW_INFO("%s, pwrpriv->bInSuspend == _TRUE ignore this process\n", __func__);
return; return;
} }
@ -302,7 +302,7 @@ void rtw_ps_processor(_adapter *padapter)
pwrpriv->ps_flag = _TRUE; pwrpriv->ps_flag = _TRUE;
rfpwrstate = RfOnOffDetect(padapter); rfpwrstate = RfOnOffDetect(padapter);
RTW_INFO("@@@@- #1 %s==> rfstate:%s\n", __FUNCTION__, (rfpwrstate == rf_on) ? "rf_on" : "rf_off"); RTW_INFO("@@@@- #1 %s==> rfstate:%s\n", __func__, (rfpwrstate == rf_on) ? "rf_on" : "rf_off");
if (rfpwrstate != pwrpriv->rf_pwrstate) { if (rfpwrstate != pwrpriv->rf_pwrstate) {
if (rfpwrstate == rf_off) { if (rfpwrstate == rf_off) {
pwrpriv->change_rfpwrstate = rf_off; pwrpriv->change_rfpwrstate = rf_off;
@ -318,7 +318,7 @@ void rtw_ps_processor(_adapter *padapter)
#endif /* CONFIG_AUTOSUSPEND */ #endif /* CONFIG_AUTOSUSPEND */
{ {
rfpwrstate = RfOnOffDetect(padapter); rfpwrstate = RfOnOffDetect(padapter);
RTW_INFO("@@@@- #2 %s==> rfstate:%s\n", __FUNCTION__, (rfpwrstate == rf_on) ? "rf_on" : "rf_off"); RTW_INFO("@@@@- #2 %s==> rfstate:%s\n", __func__, (rfpwrstate == rf_on) ? "rf_on" : "rf_off");
if (rfpwrstate != pwrpriv->rf_pwrstate) { if (rfpwrstate != pwrpriv->rf_pwrstate) {
if (rfpwrstate == rf_off) { if (rfpwrstate == rf_off) {
@ -343,7 +343,7 @@ void rtw_ps_processor(_adapter *padapter)
goto exit; goto exit;
if ((pwrpriv->rf_pwrstate == rf_on) && ((pwrpriv->pwr_state_check_cnts % 4) == 0)) { if ((pwrpriv->rf_pwrstate == rf_on) && ((pwrpriv->pwr_state_check_cnts % 4) == 0)) {
RTW_INFO("==>%s .fw_state(%x)\n", __FUNCTION__, get_fwstate(pmlmepriv)); RTW_INFO("==>%s .fw_state(%x)\n", __func__, get_fwstate(pmlmepriv));
#if defined(CONFIG_BT_COEXIST) && defined (CONFIG_AUTOSUSPEND) #if defined(CONFIG_BT_COEXIST) && defined (CONFIG_AUTOSUSPEND)
#else #else
pwrpriv->change_rfpwrstate = rf_off; pwrpriv->change_rfpwrstate = rf_off;
@ -358,10 +358,10 @@ void rtw_ps_processor(_adapter *padapter)
#if defined(CONFIG_BT_COEXIST) && defined (CONFIG_AUTOSUSPEND) #if defined(CONFIG_BT_COEXIST) && defined (CONFIG_AUTOSUSPEND)
if (_TRUE == pwrpriv->bInternalAutoSuspend) if (_TRUE == pwrpriv->bInternalAutoSuspend)
RTW_INFO("<==%s .pwrpriv->bInternalAutoSuspend)(%x)\n", __FUNCTION__, pwrpriv->bInternalAutoSuspend); RTW_INFO("<==%s .pwrpriv->bInternalAutoSuspend)(%x)\n", __func__, pwrpriv->bInternalAutoSuspend);
else { else {
pwrpriv->change_rfpwrstate = rf_off; pwrpriv->change_rfpwrstate = rf_off;
RTW_INFO("<==%s .pwrpriv->bInternalAutoSuspend)(%x) call autosuspend_enter\n", __FUNCTION__, pwrpriv->bInternalAutoSuspend); RTW_INFO("<==%s .pwrpriv->bInternalAutoSuspend)(%x) call autosuspend_enter\n", __func__, pwrpriv->bInternalAutoSuspend);
autosuspend_enter(padapter); autosuspend_enter(padapter);
} }
#else #else
@ -483,7 +483,7 @@ void rtw_set_rpwm(PADAPTER padapter, u8 pslv)
#ifdef CONFIG_LPS_RPWM_TIMER #ifdef CONFIG_LPS_RPWM_TIMER
if (pwrpriv->brpwmtimeout == _TRUE) if (pwrpriv->brpwmtimeout == _TRUE)
RTW_INFO("%s: RPWM timeout, force to set RPWM(0x%02X) again!\n", __FUNCTION__, pslv); RTW_INFO("%s: RPWM timeout, force to set RPWM(0x%02X) again!\n", __func__, pslv);
else else
#endif /* CONFIG_LPS_RPWM_TIMER */ #endif /* CONFIG_LPS_RPWM_TIMER */
{ {
@ -555,7 +555,7 @@ void rtw_set_rpwm(PADAPTER padapter, u8 pslv)
pwrpriv->cpwm_tog = cpwm_now & PS_TOGGLE; pwrpriv->cpwm_tog = cpwm_now & PS_TOGGLE;
#ifdef DBG_CHECK_FW_PS_STATE #ifdef DBG_CHECK_FW_PS_STATE
RTW_INFO("%s: polling cpwm OK! poll_cnt=%d, cpwm_orig=%02x, cpwm_now=%02x , 0x100=0x%x\n" RTW_INFO("%s: polling cpwm OK! poll_cnt=%d, cpwm_orig=%02x, cpwm_now=%02x , 0x100=0x%x\n"
, __FUNCTION__, poll_cnt, cpwm_orig, cpwm_now, rtw_read8(padapter, REG_CR)); , __func__, poll_cnt, cpwm_orig, cpwm_now, rtw_read8(padapter, REG_CR));
if (rtw_fw_ps_state(padapter) == _FAIL) { if (rtw_fw_ps_state(padapter) == _FAIL) {
RTW_INFO("leave 32k but fw state in 32k\n"); RTW_INFO("leave 32k but fw state in 32k\n");
pdbgpriv->dbg_rpwm_toogle_cnt++; pdbgpriv->dbg_rpwm_toogle_cnt++;
@ -565,7 +565,7 @@ void rtw_set_rpwm(PADAPTER padapter, u8 pslv)
} }
if (rtw_get_passing_time_ms(start_time) > LPS_RPWM_WAIT_MS) { if (rtw_get_passing_time_ms(start_time) > LPS_RPWM_WAIT_MS) {
RTW_INFO("%s: polling cpwm timeout! poll_cnt=%d, cpwm_orig=%02x, cpwm_now=%02x\n", __FUNCTION__, poll_cnt, cpwm_orig, cpwm_now); RTW_INFO("%s: polling cpwm timeout! poll_cnt=%d, cpwm_orig=%02x, cpwm_now=%02x\n", __func__, poll_cnt, cpwm_orig, cpwm_now);
#ifdef DBG_CHECK_FW_PS_STATE #ifdef DBG_CHECK_FW_PS_STATE
if (rtw_fw_ps_state(padapter) == _FAIL) { if (rtw_fw_ps_state(padapter) == _FAIL) {
RTW_INFO("rpwm timeout and fw ps state in 32k\n"); RTW_INFO("rpwm timeout and fw ps state in 32k\n");
@ -694,11 +694,11 @@ void rtw_set_fw_in_ips_mode(PADAPTER padapter, u8 enable)
if (val8 == 0) { if (val8 == 0) {
/* ser rpwm to enter 32k */ /* ser rpwm to enter 32k */
val8 = rtw_read8(padapter, SDIO_LOCAL_BASE | SDIO_REG_HRPWM1); val8 = rtw_read8(padapter, SDIO_LOCAL_BASE | SDIO_REG_HRPWM1);
RTW_INFO("%s: read rpwm=%02x\n", __FUNCTION__, val8); RTW_INFO("%s: read rpwm=%02x\n", __func__, val8);
val8 += 0x80; val8 += 0x80;
val8 |= BIT(0); val8 |= BIT(0);
rtw_write8(padapter, SDIO_LOCAL_BASE | SDIO_REG_HRPWM1, val8); rtw_write8(padapter, SDIO_LOCAL_BASE | SDIO_REG_HRPWM1, val8);
RTW_INFO("%s: write rpwm=%02x\n", __FUNCTION__, val8); RTW_INFO("%s: write rpwm=%02x\n", __func__, val8);
adapter_to_pwrctl(padapter)->tog = (val8 + 0x80) & 0x80; adapter_to_pwrctl(padapter)->tog = (val8 + 0x80) & 0x80;
cnt = val8 = 0; cnt = val8 = 0;
if (parm[1] == 0 || parm[2] == 0) { if (parm[1] == 0 || parm[2] == 0) {
@ -731,7 +731,7 @@ void rtw_set_fw_in_ips_mode(PADAPTER padapter, u8 enable)
val8 += 0x80; val8 += 0x80;
val8 |= BIT(6); val8 |= BIT(6);
rtw_write8(padapter, SDIO_LOCAL_BASE | SDIO_REG_HRPWM1, val8); rtw_write8(padapter, SDIO_LOCAL_BASE | SDIO_REG_HRPWM1, val8);
RTW_INFO("%s: write rpwm=%02x\n", __FUNCTION__, val8); RTW_INFO("%s: write rpwm=%02x\n", __func__, val8);
adapter_to_pwrctl(padapter)->tog = (val8 + 0x80) & 0x80; adapter_to_pwrctl(padapter)->tog = (val8 + 0x80) & 0x80;
/* do polling cpwm */ /* do polling cpwm */
@ -745,7 +745,7 @@ void rtw_set_fw_in_ips_mode(PADAPTER padapter, u8 enable)
break; break;
if (rtw_get_passing_time_ms(start_time) > 100) { if (rtw_get_passing_time_ms(start_time) > 100) {
RTW_INFO("%s: polling cpwm timeout when leaving IPS in FWLPS state\n", __FUNCTION__); RTW_INFO("%s: polling cpwm timeout when leaving IPS in FWLPS state\n", __func__);
break; break;
} }
} while (1); } while (1);
@ -877,7 +877,7 @@ void rtw_set_ps_mode(PADAPTER padapter, u8 ps_mode, u8 smart_ps, u8 bcn_ant_mode
} }
if (rtw_get_passing_time_ms(start_time) > delay_ms) { if (rtw_get_passing_time_ms(start_time) > delay_ms) {
RTW_INFO("%s: Wait for FW 32K leave more than %u ms!!!\n", RTW_INFO("%s: Wait for FW 32K leave more than %u ms!!!\n",
__FUNCTION__, delay_ms); __func__, delay_ms);
pdbgpriv->dbg_wow_leave_ps_fail_cnt++; pdbgpriv->dbg_wow_leave_ps_fail_cnt++;
break; break;
} }
@ -1011,13 +1011,13 @@ s32 LPS_RF_ON_check(PADAPTER padapter, u32 delay_ms)
if (rtw_is_surprise_removed(padapter)) { if (rtw_is_surprise_removed(padapter)) {
err = -2; err = -2;
RTW_INFO("%s: device surprise removed!!\n", __FUNCTION__); RTW_INFO("%s: device surprise removed!!\n", __func__);
break; break;
} }
if (rtw_get_passing_time_ms(start_time) > delay_ms) { if (rtw_get_passing_time_ms(start_time) > delay_ms) {
err = -1; err = -1;
RTW_INFO("%s: Wait for FW LPS leave more than %u ms!!!\n", __FUNCTION__, delay_ms); RTW_INFO("%s: Wait for FW LPS leave more than %u ms!!!\n", __func__, delay_ms);
break; break;
} }
rtw_usleep_os(100); rtw_usleep_os(100);
@ -1148,7 +1148,7 @@ void LeaveAllPowerSaveModeDirect(PADAPTER Adapter)
#endif /* CONFIG_DETECT_CPWM_BY_POLLING */ #endif /* CONFIG_DETECT_CPWM_BY_POLLING */
RTW_INFO("%s.....\n", __FUNCTION__); RTW_INFO("%s.....\n", __func__);
if (rtw_is_surprise_removed(Adapter)) { if (rtw_is_surprise_removed(Adapter)) {
RTW_INFO(FUNC_ADPT_FMT ": bSurpriseRemoved=_TRUE Skip!\n", FUNC_ADPT_ARG(Adapter)); RTW_INFO(FUNC_ADPT_FMT ": bSurpriseRemoved=_TRUE Skip!\n", FUNC_ADPT_ARG(Adapter));
@ -1158,7 +1158,7 @@ void LeaveAllPowerSaveModeDirect(PADAPTER Adapter)
if (rtw_mi_check_status(Adapter, MI_LINKED)) { /*connect*/ if (rtw_mi_check_status(Adapter, MI_LINKED)) { /*connect*/
if (pwrpriv->pwr_mode == PS_MODE_ACTIVE) { if (pwrpriv->pwr_mode == PS_MODE_ACTIVE) {
RTW_INFO("%s: Driver Already Leave LPS\n", __FUNCTION__); RTW_INFO("%s: Driver Already Leave LPS\n", __func__);
return; return;
} }
@ -1185,9 +1185,9 @@ void LeaveAllPowerSaveModeDirect(PADAPTER Adapter)
pwrpriv->cpwm_tog = cpwm_now & PS_TOGGLE; pwrpriv->cpwm_tog = cpwm_now & PS_TOGGLE;
#ifdef DBG_CHECK_FW_PS_STATE #ifdef DBG_CHECK_FW_PS_STATE
RTW_INFO("%s: polling cpwm OK! cpwm_orig=%02x, cpwm_now=%02x, 0x100=0x%x\n" RTW_INFO("%s: polling cpwm OK! cpwm_orig=%02x, cpwm_now=%02x, 0x100=0x%x\n"
, __FUNCTION__, cpwm_orig, cpwm_now, rtw_read8(Adapter, REG_CR)); , __func__, cpwm_orig, cpwm_now, rtw_read8(Adapter, REG_CR));
if (rtw_fw_ps_state(Adapter) == _FAIL) { if (rtw_fw_ps_state(Adapter) == _FAIL) {
RTW_INFO("%s: leave 32k but fw state in 32k\n", __FUNCTION__); RTW_INFO("%s: leave 32k but fw state in 32k\n", __func__);
pdbgpriv->dbg_rpwm_toogle_cnt++; pdbgpriv->dbg_rpwm_toogle_cnt++;
} }
#endif /* DBG_CHECK_FW_PS_STATE */ #endif /* DBG_CHECK_FW_PS_STATE */
@ -1195,7 +1195,7 @@ void LeaveAllPowerSaveModeDirect(PADAPTER Adapter)
} }
if (rtw_get_passing_time_ms(start_time) > LPS_RPWM_WAIT_MS) { if (rtw_get_passing_time_ms(start_time) > LPS_RPWM_WAIT_MS) {
RTW_INFO("%s: polling cpwm timeout! cpwm_orig=%02x, cpwm_now=%02x\n", __FUNCTION__, cpwm_orig, cpwm_now); RTW_INFO("%s: polling cpwm timeout! cpwm_orig=%02x, cpwm_now=%02x\n", __func__, cpwm_orig, cpwm_now);
#ifdef DBG_CHECK_FW_PS_STATE #ifdef DBG_CHECK_FW_PS_STATE
if (rtw_fw_ps_state(Adapter) == _FAIL) { if (rtw_fw_ps_state(Adapter) == _FAIL) {
RTW_INFO("rpwm timeout and fw ps state in 32k\n"); RTW_INFO("rpwm timeout and fw ps state in 32k\n");
@ -1252,7 +1252,7 @@ void LeaveAllPowerSaveMode(IN PADAPTER Adapter)
int i; int i;
/* RTW_INFO("%s.....\n",__FUNCTION__); */ /* RTW_INFO("%s.....\n",__func__); */
if (_FALSE == Adapter->bup) { if (_FALSE == Adapter->bup) {
RTW_INFO(FUNC_ADPT_FMT ": bup=%d Skip!\n", RTW_INFO(FUNC_ADPT_FMT ": bup=%d Skip!\n",
@ -1413,7 +1413,7 @@ static void cpwm_event_callback(struct work_struct *work)
_adapter *adapter = dvobj_get_primary_adapter(dvobj); _adapter *adapter = dvobj_get_primary_adapter(dvobj);
struct reportpwrstate_parm report; struct reportpwrstate_parm report;
/* RTW_INFO("%s\n",__FUNCTION__); */ /* RTW_INFO("%s\n",__func__); */
report.state = PS_STATE_S2; report.state = PS_STATE_S2;
cpwm_int_hdl(adapter, &report); cpwm_int_hdl(adapter, &report);
@ -2117,7 +2117,7 @@ static void resume_workitem_callback(struct work_struct *work)
struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv); struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv);
_adapter *adapter = dvobj_get_primary_adapter(dvobj); _adapter *adapter = dvobj_get_primary_adapter(dvobj);
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
rtw_resume_process(adapter); rtw_resume_process(adapter);
@ -2161,7 +2161,7 @@ extern int rtw_resume_process(_adapter *padapter);
static void rtw_early_suspend(struct early_suspend *h) static void rtw_early_suspend(struct early_suspend *h)
{ {
struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend);
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
rtw_set_do_late_resume(pwrpriv, _FALSE); rtw_set_do_late_resume(pwrpriv, _FALSE);
} }
@ -2172,7 +2172,7 @@ static void rtw_late_resume(struct early_suspend *h)
struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv); struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv);
_adapter *adapter = dvobj_get_primary_adapter(dvobj); _adapter *adapter = dvobj_get_primary_adapter(dvobj);
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
if (pwrpriv->do_late_resume) { if (pwrpriv->do_late_resume) {
rtw_set_do_late_resume(pwrpriv, _FALSE); rtw_set_do_late_resume(pwrpriv, _FALSE);
@ -2182,7 +2182,7 @@ static void rtw_late_resume(struct early_suspend *h)
void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv) void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv)
{ {
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
/* jeff: set the early suspend level before blank screen, so we wll do late resume after scree is lit */ /* jeff: set the early suspend level before blank screen, so we wll do late resume after scree is lit */
pwrpriv->early_suspend.level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN - 20; pwrpriv->early_suspend.level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN - 20;
@ -2195,7 +2195,7 @@ void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv)
void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv) void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
{ {
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
rtw_set_do_late_resume(pwrpriv, _FALSE); rtw_set_do_late_resume(pwrpriv, _FALSE);
@ -2214,7 +2214,7 @@ void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
static void rtw_early_suspend(android_early_suspend_t *h) static void rtw_early_suspend(android_early_suspend_t *h)
{ {
struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend);
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
rtw_set_do_late_resume(pwrpriv, _FALSE); rtw_set_do_late_resume(pwrpriv, _FALSE);
} }
@ -2225,7 +2225,7 @@ static void rtw_late_resume(android_early_suspend_t *h)
struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv); struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv);
_adapter *adapter = dvobj_get_primary_adapter(dvobj); _adapter *adapter = dvobj_get_primary_adapter(dvobj);
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
if (pwrpriv->do_late_resume) { if (pwrpriv->do_late_resume) {
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) #if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
rtw_set_do_late_resume(pwrpriv, _FALSE); rtw_set_do_late_resume(pwrpriv, _FALSE);
@ -2236,7 +2236,7 @@ static void rtw_late_resume(android_early_suspend_t *h)
void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv) void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv)
{ {
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
/* jeff: set the early suspend level before blank screen, so we wll do late resume after scree is lit */ /* jeff: set the early suspend level before blank screen, so we wll do late resume after scree is lit */
pwrpriv->early_suspend.level = ANDROID_EARLY_SUSPEND_LEVEL_BLANK_SCREEN - 20; pwrpriv->early_suspend.level = ANDROID_EARLY_SUSPEND_LEVEL_BLANK_SCREEN - 20;
@ -2247,7 +2247,7 @@ void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv)
void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv) void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
{ {
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
rtw_set_do_late_resume(pwrpriv, _FALSE); rtw_set_do_late_resume(pwrpriv, _FALSE);
@ -2379,7 +2379,7 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
} else if (padapter->registrypriv.usbss_enable) { } else if (padapter->registrypriv.usbss_enable) {
RTW_INFO("%s call autoresume_enter....\n", __FUNCTION__); RTW_INFO("%s call autoresume_enter....\n", __func__);
if (_FAIL == autoresume_enter(padapter)) { if (_FAIL == autoresume_enter(padapter)) {
RTW_INFO("======> autoresume fail.............\n"); RTW_INFO("======> autoresume fail.............\n");
ret = _FAIL; ret = _FAIL;
@ -2390,7 +2390,7 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
#endif #endif
{ {
#ifdef CONFIG_IPS #ifdef CONFIG_IPS
RTW_INFO("%s call ips_leave....\n", __FUNCTION__); RTW_INFO("%s call ips_leave....\n", __func__);
if (_FAIL == ips_leave(padapter)) { if (_FAIL == ips_leave(padapter)) {
RTW_INFO("======> ips_leave fail.............\n"); RTW_INFO("======> ips_leave fail.............\n");
ret = _FAIL; ret = _FAIL;
@ -2447,11 +2447,11 @@ int rtw_pm_set_ips(_adapter *padapter, u8 mode)
if (mode == IPS_NORMAL || mode == IPS_LEVEL_2) { if (mode == IPS_NORMAL || mode == IPS_LEVEL_2) {
rtw_ips_mode_req(pwrctrlpriv, mode); rtw_ips_mode_req(pwrctrlpriv, mode);
RTW_INFO("%s %s\n", __FUNCTION__, mode == IPS_NORMAL ? "IPS_NORMAL" : "IPS_LEVEL_2"); RTW_INFO("%s %s\n", __func__, mode == IPS_NORMAL ? "IPS_NORMAL" : "IPS_LEVEL_2");
return 0; return 0;
} else if (mode == IPS_NONE) { } else if (mode == IPS_NONE) {
rtw_ips_mode_req(pwrctrlpriv, mode); rtw_ips_mode_req(pwrctrlpriv, mode);
RTW_INFO("%s %s\n", __FUNCTION__, "IPS_NONE"); RTW_INFO("%s %s\n", __func__, "IPS_NONE");
if (!rtw_is_surprise_removed(padapter) && (_FAIL == rtw_pwr_wakeup(padapter))) if (!rtw_is_surprise_removed(padapter) && (_FAIL == rtw_pwr_wakeup(padapter)))
return -EFAULT; return -EFAULT;
} else } else

80
core/rtw_recv.c
View file

@ -620,7 +620,7 @@ union recv_frame *decryptor(_adapter *padapter, union recv_frame *precv_frame)
#ifdef DBG_RX_DECRYPTOR #ifdef DBG_RX_DECRYPTOR
RTW_INFO("[%s] %d:prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n", RTW_INFO("[%s] %d:prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n",
__FUNCTION__, __func__,
__LINE__, __LINE__,
prxattrib->bdecrypted, prxattrib->bdecrypted,
prxattrib->encrypt, prxattrib->encrypt,
@ -659,7 +659,7 @@ union recv_frame *decryptor(_adapter *padapter, union recv_frame *precv_frame)
psecuritypriv->hw_decrypted = _TRUE; psecuritypriv->hw_decrypted = _TRUE;
#ifdef DBG_RX_DECRYPTOR #ifdef DBG_RX_DECRYPTOR
RTW_INFO("[%s] %d:prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n", RTW_INFO("[%s] %d:prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n",
__FUNCTION__, __func__,
__LINE__, __LINE__,
prxattrib->bdecrypted, prxattrib->bdecrypted,
prxattrib->encrypt, prxattrib->encrypt,
@ -670,7 +670,7 @@ union recv_frame *decryptor(_adapter *padapter, union recv_frame *precv_frame)
DBG_COUNTER(padapter->rx_logs.core_rx_post_decrypt_unknown); DBG_COUNTER(padapter->rx_logs.core_rx_post_decrypt_unknown);
#ifdef DBG_RX_DECRYPTOR #ifdef DBG_RX_DECRYPTOR
RTW_INFO("[%s] %d:prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n", RTW_INFO("[%s] %d:prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n",
__FUNCTION__, __func__,
__LINE__, __LINE__,
prxattrib->bdecrypted, prxattrib->bdecrypted,
prxattrib->encrypt, prxattrib->encrypt,
@ -1146,7 +1146,7 @@ sint sta2sta_data_frame(
#endif #endif
/* RTW_INFO("[%s] %d, seqnum:%d\n", __FUNCTION__, __LINE__, pattrib->seq_num); */ /* RTW_INFO("[%s] %d, seqnum:%d\n", __func__, __LINE__, pattrib->seq_num); */
if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) || if ((check_fwstate(pmlmepriv, WIFI_ADHOC_STATE) == _TRUE) ||
(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) { (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) {
@ -1341,7 +1341,7 @@ sint ap2sta_data_frame(
if (_rtw_memcmp(myhwaddr, pattrib->src, ETH_ALEN)) { if (_rtw_memcmp(myhwaddr, pattrib->src, ETH_ALEN)) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s SA="MAC_FMT", myhwaddr="MAC_FMT"\n", RTW_INFO("DBG_RX_DROP_FRAME %s SA="MAC_FMT", myhwaddr="MAC_FMT"\n",
__FUNCTION__, MAC_ARG(pattrib->src), MAC_ARG(myhwaddr)); __func__, MAC_ARG(pattrib->src), MAC_ARG(myhwaddr));
#endif #endif
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
@ -1382,7 +1382,7 @@ sint ap2sta_data_frame(
if (*psta == NULL) { if (*psta == NULL) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s can't get psta under STATION_MODE ; drop pkt\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s can't get psta under STATION_MODE ; drop pkt\n", __func__);
#endif #endif
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
@ -1411,7 +1411,7 @@ sint ap2sta_data_frame(
*psta = rtw_get_stainfo(pstapriv, pattrib->bssid); /* get sta_info */ *psta = rtw_get_stainfo(pstapriv, pattrib->bssid); /* get sta_info */
if (*psta == NULL) { if (*psta == NULL) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s can't get psta under WIFI_MP_STATE ; drop pkt\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s can't get psta under WIFI_MP_STATE ; drop pkt\n", __func__);
#endif #endif
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
@ -1444,7 +1444,7 @@ sint ap2sta_data_frame(
ret = _FAIL; ret = _FAIL;
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s fw_state:0x%x\n", __FUNCTION__, get_fwstate(pmlmepriv)); RTW_INFO("DBG_RX_DROP_FRAME %s fw_state:0x%x\n", __func__, get_fwstate(pmlmepriv));
#endif #endif
} }
@ -1524,7 +1524,7 @@ bypass_deauth7:
*psta = rtw_get_stainfo(pstapriv, pattrib->bssid); /* get sta_info */ *psta = rtw_get_stainfo(pstapriv, pattrib->bssid); /* get sta_info */
if (*psta == NULL) { if (*psta == NULL) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s can't get psta under WIFI_MP_STATE ; drop pkt\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s can't get psta under WIFI_MP_STATE ; drop pkt\n", __func__);
#endif #endif
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
@ -1840,7 +1840,7 @@ sint validate_recv_data_frame(_adapter *adapter, union recv_frame *precv_frame)
if (ret == _FAIL) { if (ret == _FAIL) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s case:%d, res:%d\n", __FUNCTION__, pattrib->to_fr_ds, ret); RTW_INFO("DBG_RX_DROP_FRAME %s case:%d, res:%d\n", __func__, pattrib->to_fr_ds, ret);
#endif #endif
goto exit; goto exit;
} else if (ret == RTW_RX_HANDLED) } else if (ret == RTW_RX_HANDLED)
@ -1968,7 +1968,7 @@ static sint validate_80211w_mgmt(_adapter *adapter, union recv_frame *precv_fram
data_len = pattrib->pkt_len - pattrib->hdrlen - pattrib->iv_len - pattrib->icv_len; data_len = pattrib->pkt_len - pattrib->hdrlen - pattrib->iv_len - pattrib->icv_len;
mgmt_DATA = rtw_zmalloc(data_len); mgmt_DATA = rtw_zmalloc(data_len);
if (mgmt_DATA == NULL) { if (mgmt_DATA == NULL) {
RTW_INFO("%s mgmt allocate fail !!!!!!!!!\n", __FUNCTION__); RTW_INFO("%s mgmt allocate fail !!!!!!!!!\n", __func__);
goto validate_80211w_fail; goto validate_80211w_fail;
} }
precv_frame = decryptor(adapter, precv_frame); precv_frame = decryptor(adapter, precv_frame);
@ -1980,7 +1980,7 @@ static sint validate_80211w_mgmt(_adapter *adapter, union recv_frame *precv_fram
pattrib->pkt_len = pattrib->pkt_len - pattrib->iv_len - pattrib->icv_len; pattrib->pkt_len = pattrib->pkt_len - pattrib->iv_len - pattrib->icv_len;
rtw_mfree(mgmt_DATA, data_len); rtw_mfree(mgmt_DATA, data_len);
if (!precv_frame) { if (!precv_frame) {
RTW_INFO("%s mgmt descrypt fail !!!!!!!!!\n", __FUNCTION__); RTW_INFO("%s mgmt descrypt fail !!!!!!!!!\n", __func__);
goto validate_80211w_fail; goto validate_80211w_fail;
} }
} else if (IS_MCAST(GetAddr1Ptr(ptr)) && } else if (IS_MCAST(GetAddr1Ptr(ptr)) &&
@ -2729,7 +2729,7 @@ static int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
sub_pkt = rtw_os_alloc_msdu_pkt(prframe, nSubframe_Length, pdata); sub_pkt = rtw_os_alloc_msdu_pkt(prframe, nSubframe_Length, pdata);
if (sub_pkt == NULL) { if (sub_pkt == NULL) {
RTW_INFO("%s(): allocate sub packet fail !!!\n", __FUNCTION__); RTW_INFO("%s(): allocate sub packet fail !!!\n", __func__);
break; break;
} }
@ -2786,14 +2786,14 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, __le16 se
if (preorder_ctrl->indicate_seq == 0xFFFF) { if (preorder_ctrl->indicate_seq == 0xFFFF) {
preorder_ctrl->indicate_seq = le16_to_cpu(seq_num); preorder_ctrl->indicate_seq = le16_to_cpu(seq_num);
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
RTW_INFO("DBG_RX_SEQ %s:%d init IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, RTW_INFO("DBG_RX_SEQ %s:%d init IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, seq_num); preorder_ctrl->indicate_seq, seq_num);
#endif #endif
} }
/* Drop out the packet which SeqNum is smaller than WinStart */ /* Drop out the packet which SeqNum is smaller than WinStart */
if (SN_LESS(le16_to_cpu(seq_num), preorder_ctrl->indicate_seq)) { if (SN_LESS(le16_to_cpu(seq_num), preorder_ctrl->indicate_seq)) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("%s IndicateSeq: %d > NewSeq: %d\n", __FUNCTION__, RTW_INFO("%s IndicateSeq: %d > NewSeq: %d\n", __func__,
preorder_ctrl->indicate_seq, seq_num); preorder_ctrl->indicate_seq, seq_num);
#endif #endif
return _FALSE; return _FALSE;
@ -2808,7 +2808,7 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, __le16 se
preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF; preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
RTW_INFO("DBG_RX_SEQ %s:%d SN_EQUAL IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, RTW_INFO("DBG_RX_SEQ %s:%d SN_EQUAL IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, seq_num); preorder_ctrl->indicate_seq, seq_num);
#endif #endif
} else if (SN_LESS(wend, le16_to_cpu(seq_num))) { } else if (SN_LESS(wend, le16_to_cpu(seq_num))) {
@ -2821,7 +2821,7 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, __le16 se
preorder_ctrl->indicate_seq = 0xFFF - (wsize - (le16_to_cpu(seq_num) + 1)) + 1; preorder_ctrl->indicate_seq = 0xFFF - (wsize - (le16_to_cpu(seq_num) + 1)) + 1;
pdbgpriv->dbg_rx_ampdu_window_shift_cnt++; pdbgpriv->dbg_rx_ampdu_window_shift_cnt++;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
RTW_INFO("DBG_RX_SEQ %s:%d SN_LESS(wend, seq_num) IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, RTW_INFO("DBG_RX_SEQ %s:%d SN_LESS(wend, seq_num) IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, le16_to_cpu(seq_num)); preorder_ctrl->indicate_seq, le16_to_cpu(seq_num));
#endif #endif
} }
@ -2930,7 +2930,7 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
pattrib = &prframe->u.hdr.attrib; pattrib = &prframe->u.hdr.attrib;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
RTW_INFO("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, RTW_INFO("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num); preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif #endif
recv_indicatepkts_pkt_loss_cnt(pdbgpriv, preorder_ctrl->indicate_seq, le16_to_cpu(pattrib->seq_num)); recv_indicatepkts_pkt_loss_cnt(pdbgpriv, preorder_ctrl->indicate_seq, le16_to_cpu(pattrib->seq_num));
@ -2952,7 +2952,7 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
if (SN_EQUAL(preorder_ctrl->indicate_seq, le16_to_cpu(pattrib->seq_num))) { if (SN_EQUAL(preorder_ctrl->indicate_seq, le16_to_cpu(pattrib->seq_num))) {
preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF; preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
RTW_INFO("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, RTW_INFO("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num); preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif #endif
} }
@ -3002,7 +3002,7 @@ static int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prfram
retval = wlanhdr_to_ethhdr(prframe); retval = wlanhdr_to_ethhdr(prframe);
if (retval != _SUCCESS) { if (retval != _SUCCESS) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __func__);
#endif #endif
return retval; return retval;
} }
@ -3018,7 +3018,7 @@ static int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prfram
} }
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s pattrib->qos !=1\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s pattrib->qos !=1\n", __func__);
#endif #endif
return _FAIL; return _FAIL;
@ -3029,7 +3029,7 @@ static int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prfram
/* indicate this recv_frame */ /* indicate this recv_frame */
preorder_ctrl->indicate_seq = le16_to_cpu(pattrib->seq_num); preorder_ctrl->indicate_seq = le16_to_cpu(pattrib->seq_num);
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
RTW_INFO("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, RTW_INFO("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num); preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif #endif
@ -3037,7 +3037,7 @@ static int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prfram
preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) % 4096; preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) % 4096;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
RTW_INFO("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, RTW_INFO("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num); preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif #endif
@ -3054,7 +3054,7 @@ static int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prfram
if (preorder_ctrl->enable == _FALSE) { if (preorder_ctrl->enable == _FALSE) {
preorder_ctrl->indicate_seq = le16_to_cpu(pattrib->seq_num); preorder_ctrl->indicate_seq = le16_to_cpu(pattrib->seq_num);
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
RTW_INFO("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, RTW_INFO("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num); preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif #endif
@ -3062,13 +3062,13 @@ static int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prfram
preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) % 4096; preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) % 4096;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
RTW_INFO("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, RTW_INFO("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num); preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif #endif
if (retval != _SUCCESS) { if (retval != _SUCCESS) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __func__);
#endif #endif
} }
@ -3086,7 +3086,7 @@ static int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prfram
pdbgpriv->dbg_rx_ampdu_drop_count++; pdbgpriv->dbg_rx_ampdu_drop_count++;
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s check_indicate_seq fail\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s check_indicate_seq fail\n", __func__);
#endif #endif
goto _err_exit; goto _err_exit;
} }
@ -3095,7 +3095,7 @@ static int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prfram
/* s3. Insert all packet into Reorder Queue to maintain its ordering. */ /* s3. Insert all packet into Reorder Queue to maintain its ordering. */
if (!enqueue_reorder_recvframe(preorder_ctrl, prframe)) { if (!enqueue_reorder_recvframe(preorder_ctrl, prframe)) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s enqueue_reorder_recvframe fail\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s enqueue_reorder_recvframe fail\n", __func__);
#endif #endif
goto _err_exit; goto _err_exit;
} }
@ -3192,7 +3192,7 @@ int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe)
if (recv_indicatepkt_reorder(padapter, prframe) != _SUCCESS) { /* including perform A-MPDU Rx Ordering Buffer Control */ if (recv_indicatepkt_reorder(padapter, prframe) != _SUCCESS) { /* including perform A-MPDU Rx Ordering Buffer Control */
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s recv_indicatepkt_reorder error!\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s recv_indicatepkt_reorder error!\n", __func__);
#endif #endif
if (!RTW_CANNOT_RUN(padapter)) { if (!RTW_CANNOT_RUN(padapter)) {
@ -3206,7 +3206,7 @@ int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe)
retval = wlanhdr_to_ethhdr(prframe); retval = wlanhdr_to_ethhdr(prframe);
if (retval != _SUCCESS) { if (retval != _SUCCESS) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __func__);
#endif #endif
return retval; return retval;
} }
@ -3430,7 +3430,7 @@ static int mp_recv_frame(_adapter *padapter, union recv_frame *rframe)
if (ret != _SUCCESS) { if (ret != _SUCCESS) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr: drop pkt\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr: drop pkt\n", __func__);
#endif #endif
rtw_free_recvframe(rframe, pfree_recv_queue);/* free this recv_frame */ rtw_free_recvframe(rframe, pfree_recv_queue);/* free this recv_frame */
ret = _FAIL; ret = _FAIL;
@ -3441,7 +3441,7 @@ static int mp_recv_frame(_adapter *padapter, union recv_frame *rframe)
ret = rtw_recv_indicatepkt(padapter, rframe); ret = rtw_recv_indicatepkt(padapter, rframe);
if (ret != _SUCCESS) { if (ret != _SUCCESS) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s rtw_recv_indicatepkt fail!\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s rtw_recv_indicatepkt fail!\n", __func__);
#endif #endif
rtw_free_recvframe(rframe, pfree_recv_queue);/* free this recv_frame */ rtw_free_recvframe(rframe, pfree_recv_queue);/* free this recv_frame */
ret = _FAIL; ret = _FAIL;
@ -3834,7 +3834,7 @@ static int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
prframe = decryptor(padapter, prframe); prframe = decryptor(padapter, prframe);
if (prframe == NULL) { if (prframe == NULL) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s decryptor: drop pkt\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s decryptor: drop pkt\n", __func__);
#endif #endif
ret = _FAIL; ret = _FAIL;
DBG_COUNTER(padapter->rx_logs.core_rx_post_decrypt_err); DBG_COUNTER(padapter->rx_logs.core_rx_post_decrypt_err);
@ -3866,7 +3866,7 @@ static int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
prframe = recvframe_chk_defrag(padapter, prframe); prframe = recvframe_chk_defrag(padapter, prframe);
if (prframe == NULL) { if (prframe == NULL) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s recvframe_chk_defrag: drop pkt\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s recvframe_chk_defrag: drop pkt\n", __func__);
#endif #endif
DBG_COUNTER(padapter->rx_logs.core_rx_post_defrag_err); DBG_COUNTER(padapter->rx_logs.core_rx_post_defrag_err);
goto _recv_data_drop; goto _recv_data_drop;
@ -3875,7 +3875,7 @@ static int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
prframe = portctrl(padapter, prframe); prframe = portctrl(padapter, prframe);
if (prframe == NULL) { if (prframe == NULL) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n", __func__);
#endif #endif
ret = _FAIL; ret = _FAIL;
DBG_COUNTER(padapter->rx_logs.core_rx_post_portctrl_err); DBG_COUNTER(padapter->rx_logs.core_rx_post_portctrl_err);
@ -3892,7 +3892,7 @@ static int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
ret = process_recv_indicatepkts(padapter, prframe); ret = process_recv_indicatepkts(padapter, prframe);
if (ret != _SUCCESS) { if (ret != _SUCCESS) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s process_recv_indicatepkts fail!\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s process_recv_indicatepkts fail!\n", __func__);
#endif #endif
rtw_free_recvframe(orig_prframe, pfree_recv_queue);/* free this recv_frame */ rtw_free_recvframe(orig_prframe, pfree_recv_queue);/* free this recv_frame */
DBG_COUNTER(padapter->rx_logs.core_rx_post_indicate_err); DBG_COUNTER(padapter->rx_logs.core_rx_post_indicate_err);
@ -3903,7 +3903,7 @@ static int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
ret = wlanhdr_to_ethhdr(prframe); ret = wlanhdr_to_ethhdr(prframe);
if (ret != _SUCCESS) { if (ret != _SUCCESS) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr: drop pkt\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr: drop pkt\n", __func__);
#endif #endif
rtw_free_recvframe(orig_prframe, pfree_recv_queue);/* free this recv_frame */ rtw_free_recvframe(orig_prframe, pfree_recv_queue);/* free this recv_frame */
goto _recv_data_drop; goto _recv_data_drop;
@ -3914,7 +3914,7 @@ static int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
ret = rtw_recv_indicatepkt(padapter, prframe); ret = rtw_recv_indicatepkt(padapter, prframe);
if (ret != _SUCCESS) { if (ret != _SUCCESS) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s rtw_recv_indicatepkt fail!\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s rtw_recv_indicatepkt fail!\n", __func__);
#endif #endif
goto _recv_data_drop; goto _recv_data_drop;
} }
@ -3934,14 +3934,14 @@ static int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
ret = amsdu_to_msdu(padapter, prframe); ret = amsdu_to_msdu(padapter, prframe);
if (ret != _SUCCESS) { if (ret != _SUCCESS) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __func__);
#endif #endif
rtw_free_recvframe(orig_prframe, pfree_recv_queue); rtw_free_recvframe(orig_prframe, pfree_recv_queue);
goto _recv_data_drop; goto _recv_data_drop;
} }
} else { } else {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s what is this condition??\n", __FUNCTION__); RTW_INFO("DBG_RX_DROP_FRAME %s what is this condition??\n", __func__);
#endif #endif
goto _recv_data_drop; goto _recv_data_drop;
} }

4
core/rtw_sdio.c
View file

@ -51,7 +51,7 @@ static u8 sdio_io(struct dvobj_priv *d, u32 addr, void *buf, size_t len, u8 writ
err = d->intf_ops->read(d, addr, buf, len, 0); err = d->intf_ops->read(d, addr, buf, len, 0);
if (err) { if (err) {
RTW_INFO("%s: [ERROR] %s FAIL! error(%d)\n", RTW_INFO("%s: [ERROR] %s FAIL! error(%d)\n",
__FUNCTION__, write ? "write" : "read", err); __func__, write ? "write" : "read", err);
return _FAIL; return _FAIL;
} }
@ -89,7 +89,7 @@ u8 rtw_sdio_f0_read(struct dvobj_priv *d, u32 addr, void *buf, size_t len)
err = d->intf_ops->read(d, addr, buf, len, 0); err = d->intf_ops->read(d, addr, buf, len, 0);
if (err) { if (err) {
RTW_INFO("%s: [ERROR] Read f0 register FAIL!\n", __FUNCTION__); RTW_INFO("%s: [ERROR] Read f0 register FAIL!\n", __func__);
ret = _FAIL; ret = _FAIL;
} }

4
core/rtw_security.c
View file

@ -1618,7 +1618,7 @@ u32 rtw_aes_encrypt(_adapter *padapter, u8 *pxmitframe)
struct sta_info *ptdls_sta; struct sta_info *ptdls_sta;
ptdls_sta = rtw_get_stainfo(&padapter->stapriv , &pattrib->dst[0]); ptdls_sta = rtw_get_stainfo(&padapter->stapriv , &pattrib->dst[0]);
if ((ptdls_sta != NULL) && (ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE)) { if ((ptdls_sta != NULL) && (ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE)) {
RTW_INFO("[%s] for tdls link\n", __FUNCTION__); RTW_INFO("[%s] for tdls link\n", __func__);
prwskey = &ptdls_sta->tpk.tk[0]; prwskey = &ptdls_sta->tpk.tk[0];
} }
} }
@ -3011,7 +3011,7 @@ int tdls_verify_mic(u8 *kck, u8 trans_seq,
} }
/* Invalid MIC */ /* Invalid MIC */
RTW_INFO("[%s] Invalid MIC\n", __FUNCTION__); RTW_INFO("[%s] Invalid MIC\n", __func__);
return _FAIL; return _FAIL;
} }

8
core/rtw_sreset.c
View file

@ -67,10 +67,10 @@ u8 sreset_get_wifi_status(_adapter *padapter)
} }
if (WIFI_STATUS_SUCCESS != psrtpriv->Wifi_Error_Status) { if (WIFI_STATUS_SUCCESS != psrtpriv->Wifi_Error_Status) {
RTW_INFO("==>%s error_status(0x%x)\n", __FUNCTION__, psrtpriv->Wifi_Error_Status); RTW_INFO("==>%s error_status(0x%x)\n", __func__, psrtpriv->Wifi_Error_Status);
status = (psrtpriv->Wifi_Error_Status & (~(USB_READ_PORT_FAIL | USB_WRITE_PORT_FAIL))); status = (psrtpriv->Wifi_Error_Status & (~(USB_READ_PORT_FAIL | USB_WRITE_PORT_FAIL)));
} }
RTW_INFO("==> %s wifi_status(0x%x)\n", __FUNCTION__, status); RTW_INFO("==> %s wifi_status(0x%x)\n", __func__, status);
/* status restore */ /* status restore */
psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
@ -315,7 +315,7 @@ void sreset_reset(_adapter *padapter)
struct dvobj_priv *psdpriv = padapter->dvobj; struct dvobj_priv *psdpriv = padapter->dvobj;
struct debug_priv *pdbgpriv = &psdpriv->drv_dbg; struct debug_priv *pdbgpriv = &psdpriv->drv_dbg;
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
@ -340,7 +340,7 @@ void sreset_reset(_adapter *padapter)
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
RTW_INFO("%s done in %d ms\n", __FUNCTION__, rtw_get_passing_time_ms(start)); RTW_INFO("%s done in %d ms\n", __func__, rtw_get_passing_time_ms(start));
pdbgpriv->dbg_sreset_cnt++; pdbgpriv->dbg_sreset_cnt++;
#endif #endif
} }

2
core/rtw_sta_mgt.c
View file

@ -521,7 +521,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
preorder_ctrl->indicate_seq = 0xffff; preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ #ifdef DBG_RX_SEQ
RTW_INFO("DBG_RX_SEQ %s:%d IndicateSeq: %d\n", __FUNCTION__, __LINE__, RTW_INFO("DBG_RX_SEQ %s:%d IndicateSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq); preorder_ctrl->indicate_seq);
#endif #endif
preorder_ctrl->wend_b = 0xffff; preorder_ctrl->wend_b = 0xffff;

50
core/rtw_tdls.c
View file

@ -905,17 +905,17 @@ void rtw_tdls_process_wfd_ie(struct tdls_info *ptdlsinfo, u8 *ptr, u8 length)
u32 attr_contentlen = 0; u32 attr_contentlen = 0;
int i; int i;
RTW_INFO("[%s] WFD IE Found!!\n", __FUNCTION__); RTW_INFO("[%s] WFD IE Found!!\n", __func__);
attr_content = rtw_get_wfd_attr_content(wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, NULL, &attr_contentlen); attr_content = rtw_get_wfd_attr_content(wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, NULL, &attr_contentlen);
if (attr_content && attr_contentlen) { if (attr_content && attr_contentlen) {
ptdlsinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16(attr_content + 2); ptdlsinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16(attr_content + 2);
RTW_INFO("[%s] Peer PORT NUM = %d\n", __FUNCTION__, ptdlsinfo->wfd_info->peer_rtsp_ctrlport); RTW_INFO("[%s] Peer PORT NUM = %d\n", __func__, ptdlsinfo->wfd_info->peer_rtsp_ctrlport);
} }
attr_content = rtw_get_wfd_attr_content(wfd_ie, wfd_ielen, WFD_ATTR_LOCAL_IP_ADDR, NULL, &attr_contentlen); attr_content = rtw_get_wfd_attr_content(wfd_ie, wfd_ielen, WFD_ATTR_LOCAL_IP_ADDR, NULL, &attr_contentlen);
if (attr_content && attr_contentlen) { if (attr_content && attr_contentlen) {
_rtw_memcpy(ptdlsinfo->wfd_info->peer_ip_address, (attr_content + 1), 4); _rtw_memcpy(ptdlsinfo->wfd_info->peer_ip_address, (attr_content + 1), 4);
RTW_INFO("[%s] Peer IP = %02u.%02u.%02u.%02u\n", __FUNCTION__, RTW_INFO("[%s] Peer IP = %02u.%02u.%02u.%02u\n", __func__,
ptdlsinfo->wfd_info->peer_ip_address[0], ptdlsinfo->wfd_info->peer_ip_address[1], ptdlsinfo->wfd_info->peer_ip_address[0], ptdlsinfo->wfd_info->peer_ip_address[1],
ptdlsinfo->wfd_info->peer_ip_address[2], ptdlsinfo->wfd_info->peer_ip_address[3]); ptdlsinfo->wfd_info->peer_ip_address[2], ptdlsinfo->wfd_info->peer_ip_address[3]);
} }
@ -934,7 +934,7 @@ int issue_tunneled_probe_req(_adapter *padapter)
struct tdls_txmgmt txmgmt; struct tdls_txmgmt txmgmt;
int ret = _FAIL; int ret = _FAIL;
RTW_INFO("[%s]\n", __FUNCTION__); RTW_INFO("[%s]\n", __func__);
_rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt));
txmgmt.action_code = TUNNELED_PROBE_REQ; txmgmt.action_code = TUNNELED_PROBE_REQ;
@ -976,7 +976,7 @@ int issue_tunneled_probe_rsp(_adapter *padapter, union recv_frame *precv_frame)
struct tdls_txmgmt txmgmt; struct tdls_txmgmt txmgmt;
int ret = _FAIL; int ret = _FAIL;
RTW_INFO("[%s]\n", __FUNCTION__); RTW_INFO("[%s]\n", __func__);
_rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt));
txmgmt.action_code = TUNNELED_PROBE_RSP; txmgmt.action_code = TUNNELED_PROBE_RSP;
@ -1024,7 +1024,7 @@ int issue_tdls_setup_req(_adapter *padapter, struct tdls_txmgmt *ptxmgmt, int wa
/* Retry timer should be set at least 301 sec, using TPK_count counting 301 times. */ /* Retry timer should be set at least 301 sec, using TPK_count counting 301 times. */
u32 timeout_interval = TDLS_TPK_RESEND_COUNT; u32 timeout_interval = TDLS_TPK_RESEND_COUNT;
RTW_INFO("[TDLS] %s\n", __FUNCTION__); RTW_INFO("[TDLS] %s\n", __func__);
ptxmgmt->action_code = TDLS_SETUP_REQUEST; ptxmgmt->action_code = TDLS_SETUP_REQUEST;
if (rtw_tdls_is_setup_allowed(padapter) == _FALSE) if (rtw_tdls_is_setup_allowed(padapter) == _FALSE)
@ -1050,7 +1050,7 @@ int issue_tdls_setup_req(_adapter *padapter, struct tdls_txmgmt *ptxmgmt, int wa
if (ptdls_sta == NULL) { if (ptdls_sta == NULL) {
ptdls_sta = rtw_alloc_stainfo(pstapriv, ptxmgmt->peer); ptdls_sta = rtw_alloc_stainfo(pstapriv, ptxmgmt->peer);
if (ptdls_sta == NULL) { if (ptdls_sta == NULL) {
RTW_INFO("[%s] rtw_alloc_stainfo fail\n", __FUNCTION__); RTW_INFO("[%s] rtw_alloc_stainfo fail\n", __func__);
rtw_free_xmitbuf(pxmitpriv, pmgntframe->pxmitbuf); rtw_free_xmitbuf(pxmitpriv, pmgntframe->pxmitbuf);
rtw_free_xmitframe(pxmitpriv, pmgntframe); rtw_free_xmitframe(pxmitpriv, pmgntframe);
goto exit; goto exit;
@ -1101,7 +1101,7 @@ int _issue_tdls_teardown(_adapter *padapter, struct tdls_txmgmt *ptxmgmt, u8 wai
_irqL irqL; _irqL irqL;
int ret = _FAIL; int ret = _FAIL;
RTW_INFO("[TDLS] %s\n", __FUNCTION__); RTW_INFO("[TDLS] %s\n", __func__);
ptxmgmt->action_code = TDLS_TEARDOWN; ptxmgmt->action_code = TDLS_TEARDOWN;
ptdls_sta = rtw_get_stainfo(pstapriv, ptxmgmt->peer); ptdls_sta = rtw_get_stainfo(pstapriv, ptxmgmt->peer);
@ -1177,7 +1177,7 @@ int issue_tdls_dis_req(_adapter *padapter, struct tdls_txmgmt *ptxmgmt)
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
int ret = _FAIL; int ret = _FAIL;
RTW_INFO("[TDLS] %s\n", __FUNCTION__); RTW_INFO("[TDLS] %s\n", __func__);
ptxmgmt->action_code = TDLS_DISCOVERY_REQUEST; ptxmgmt->action_code = TDLS_DISCOVERY_REQUEST;
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
@ -1216,7 +1216,7 @@ int issue_tdls_setup_rsp(_adapter *padapter, struct tdls_txmgmt *ptxmgmt)
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
int ret = _FAIL; int ret = _FAIL;
RTW_INFO("[TDLS] %s\n", __FUNCTION__); RTW_INFO("[TDLS] %s\n", __func__);
ptxmgmt->action_code = TDLS_SETUP_RESPONSE; ptxmgmt->action_code = TDLS_SETUP_RESPONSE;
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
@ -1257,7 +1257,7 @@ int issue_tdls_setup_cfm(_adapter *padapter, struct tdls_txmgmt *ptxmgmt)
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
int ret = _FAIL; int ret = _FAIL;
RTW_INFO("[TDLS] %s\n", __FUNCTION__); RTW_INFO("[TDLS] %s\n", __func__);
ptxmgmt->action_code = TDLS_SETUP_CONFIRM; ptxmgmt->action_code = TDLS_SETUP_CONFIRM;
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
@ -1302,7 +1302,7 @@ int issue_tdls_dis_rsp(_adapter *padapter, struct tdls_txmgmt *ptxmgmt, u8 priva
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
int ret = _FAIL; int ret = _FAIL;
RTW_INFO("[TDLS] %s\n", __FUNCTION__); RTW_INFO("[TDLS] %s\n", __func__);
pmgntframe = alloc_mgtxmitframe(pxmitpriv); pmgntframe = alloc_mgtxmitframe(pxmitpriv);
if (pmgntframe == NULL) if (pmgntframe == NULL)
@ -1354,7 +1354,7 @@ int issue_tdls_peer_traffic_rsp(_adapter *padapter, struct sta_info *ptdls_sta,
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
int ret = _FAIL; int ret = _FAIL;
RTW_INFO("[TDLS] %s\n", __FUNCTION__); RTW_INFO("[TDLS] %s\n", __func__);
ptxmgmt->action_code = TDLS_PEER_TRAFFIC_RESPONSE; ptxmgmt->action_code = TDLS_PEER_TRAFFIC_RESPONSE;
@ -1398,7 +1398,7 @@ int issue_tdls_peer_traffic_indication(_adapter *padapter, struct sta_info *ptdl
struct tdls_txmgmt txmgmt; struct tdls_txmgmt txmgmt;
int ret = _FAIL; int ret = _FAIL;
RTW_INFO("[TDLS] %s\n", __FUNCTION__); RTW_INFO("[TDLS] %s\n", __func__);
_rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt)); _rtw_memset(&txmgmt, 0x00, sizeof(struct tdls_txmgmt));
txmgmt.action_code = TDLS_PEER_TRAFFIC_INDICATION; txmgmt.action_code = TDLS_PEER_TRAFFIC_INDICATION;
@ -1446,7 +1446,7 @@ int issue_tdls_ch_switch_req(_adapter *padapter, struct sta_info *ptdls_sta)
struct tdls_txmgmt txmgmt; struct tdls_txmgmt txmgmt;
int ret = _FAIL; int ret = _FAIL;
RTW_INFO("[TDLS] %s\n", __FUNCTION__); RTW_INFO("[TDLS] %s\n", __func__);
if (rtw_tdls_is_chsw_allowed(padapter) == _FALSE) { if (rtw_tdls_is_chsw_allowed(padapter) == _FALSE) {
RTW_INFO("[TDLS] Ignore %s since channel switch is not allowed\n", __func__); RTW_INFO("[TDLS] Ignore %s since channel switch is not allowed\n", __func__);
@ -1493,7 +1493,7 @@ int issue_tdls_ch_switch_rsp(_adapter *padapter, struct tdls_txmgmt *ptxmgmt, in
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
int ret = _FAIL; int ret = _FAIL;
RTW_INFO("[TDLS] %s\n", __FUNCTION__); RTW_INFO("[TDLS] %s\n", __func__);
if (rtw_tdls_is_chsw_allowed(padapter) == _FALSE) { if (rtw_tdls_is_chsw_allowed(padapter) == _FALSE) {
RTW_INFO("[TDLS] Ignore %s since channel switch is not allowed\n", __func__); RTW_INFO("[TDLS] Ignore %s since channel switch is not allowed\n", __func__);
@ -1867,7 +1867,7 @@ int On_TDLS_Setup_Rsp(_adapter *padapter, union recv_frame *precv_frame)
_rtw_memcpy(&status_code, ptr + 2, 2); _rtw_memcpy(&status_code, ptr + 2, 2);
if (status_code != 0) { if (status_code != 0) {
RTW_INFO("[TDLS] %s status_code = %d, free_tdls_sta\n", __FUNCTION__, status_code); RTW_INFO("[TDLS] %s status_code = %d, free_tdls_sta\n", __func__, status_code);
free_tdls_sta(padapter, ptdls_sta); free_tdls_sta(padapter, ptdls_sta);
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
@ -1968,7 +1968,7 @@ int On_TDLS_Setup_Rsp(_adapter *padapter, union recv_frame *precv_frame)
if (rtw_tdls_is_driver_setup(padapter) == _TRUE) { if (rtw_tdls_is_driver_setup(padapter) == _TRUE) {
wpa_tdls_generate_tpk(padapter, ptdls_sta); wpa_tdls_generate_tpk(padapter, ptdls_sta);
if (tdls_verify_mic(ptdls_sta->tpk.kck, 2, plinkid_ie, prsnie, ptimeout_ie, pftie) == _FAIL) { if (tdls_verify_mic(ptdls_sta->tpk.kck, 2, plinkid_ie, prsnie, ptimeout_ie, pftie) == _FAIL) {
RTW_INFO("[TDLS] %s tdls_verify_mic fail, free_tdls_sta\n", __FUNCTION__); RTW_INFO("[TDLS] %s tdls_verify_mic fail, free_tdls_sta\n", __func__);
free_tdls_sta(padapter, ptdls_sta); free_tdls_sta(padapter, ptdls_sta);
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
@ -2032,7 +2032,7 @@ int On_TDLS_Setup_Cfm(_adapter *padapter, union recv_frame *precv_frame)
ptdls_sta = rtw_get_stainfo(pstapriv, psa); ptdls_sta = rtw_get_stainfo(pstapriv, psa);
if (ptdls_sta == NULL) { if (ptdls_sta == NULL) {
RTW_INFO("[%s] Direct Link Peer = "MAC_FMT" not found\n", __FUNCTION__, MAC_ARG(psa)); RTW_INFO("[%s] Direct Link Peer = "MAC_FMT" not found\n", __func__, MAC_ARG(psa));
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
} }
@ -2050,7 +2050,7 @@ int On_TDLS_Setup_Cfm(_adapter *padapter, union recv_frame *precv_frame)
_rtw_memcpy(&status_code, ptr + 2, 2); _rtw_memcpy(&status_code, ptr + 2, 2);
if (status_code != 0) { if (status_code != 0) {
RTW_INFO("[%s] status_code = %d\n, free_tdls_sta", __FUNCTION__, status_code); RTW_INFO("[%s] status_code = %d\n, free_tdls_sta", __func__, status_code);
free_tdls_sta(padapter, ptdls_sta); free_tdls_sta(padapter, ptdls_sta);
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
@ -2206,7 +2206,7 @@ int On_TDLS_Teardown(_adapter *padapter, union recv_frame *precv_frame)
u8 reason; u8 reason;
reason = *(ptr + prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len + LLC_HEADER_SIZE + ETH_TYPE_LEN + PAYLOAD_TYPE_LEN + 2); reason = *(ptr + prx_pkt_attrib->hdrlen + prx_pkt_attrib->iv_len + LLC_HEADER_SIZE + ETH_TYPE_LEN + PAYLOAD_TYPE_LEN + 2);
RTW_INFO("[TDLS] %s Reason code(%d)\n", __FUNCTION__, reason); RTW_INFO("[TDLS] %s Reason code(%d)\n", __func__, reason);
psa = get_sa(ptr); psa = get_sa(ptr);
@ -2406,7 +2406,7 @@ sint On_TDLS_Ch_Switch_Req(_adapter *padapter, union recv_frame *precv_frame)
ptdls_sta->ch_switch_timeout = (RTW_GET_LE16(pIE->data + 2) >= TDLS_CH_SWITCH_TIMEOUT * 1000) ? ptdls_sta->ch_switch_timeout = (RTW_GET_LE16(pIE->data + 2) >= TDLS_CH_SWITCH_TIMEOUT * 1000) ?
RTW_GET_LE16(pIE->data + 2) : TDLS_CH_SWITCH_TIMEOUT * 1000; RTW_GET_LE16(pIE->data + 2) : TDLS_CH_SWITCH_TIMEOUT * 1000;
RTW_INFO("[TDLS] %s ch_switch_time:%d, ch_switch_timeout:%d\n" RTW_INFO("[TDLS] %s ch_switch_time:%d, ch_switch_timeout:%d\n"
, __FUNCTION__, RTW_GET_LE16(pIE->data), RTW_GET_LE16(pIE->data + 2)); , __func__, RTW_GET_LE16(pIE->data), RTW_GET_LE16(pIE->data + 2));
default: default:
break; break;
} }
@ -2722,7 +2722,7 @@ void rtw_build_tdls_setup_rsp_ies(_adapter *padapter, struct xmit_frame *pxmitfr
ptdls_sta = rtw_get_stainfo(&(padapter->stapriv) , pattrib->dst); ptdls_sta = rtw_get_stainfo(&(padapter->stapriv) , pattrib->dst);
if (ptdls_sta == NULL) if (ptdls_sta == NULL)
RTW_INFO("[%s] %d ptdls_sta is NULL\n", __FUNCTION__, __LINE__); RTW_INFO("[%s] %d ptdls_sta is NULL\n", __func__, __LINE__);
if (pattrib->encrypt && ptdls_sta != NULL) { if (pattrib->encrypt && ptdls_sta != NULL) {
for (k = 0; k < 8; k++) { for (k = 0; k < 8; k++) {
@ -2739,7 +2739,7 @@ void rtw_build_tdls_setup_rsp_ies(_adapter *padapter, struct xmit_frame *pxmitfr
pframe = rtw_tdls_set_status_code(pframe, pattrib, ptxmgmt); pframe = rtw_tdls_set_status_code(pframe, pattrib, ptxmgmt);
if (ptxmgmt->status_code != 0) { if (ptxmgmt->status_code != 0) {
RTW_INFO("[%s] status_code:%04x\n", __FUNCTION__, ptxmgmt->status_code); RTW_INFO("[%s] status_code:%04x\n", __func__, ptxmgmt->status_code);
return; return;
} }
@ -3142,7 +3142,7 @@ void _tdls_tpk_timer_hdl(void *FunctionContext)
/* TPK_timer expired in a second */ /* TPK_timer expired in a second */
/* Retry timer should set at least 301 sec. */ /* Retry timer should set at least 301 sec. */
if (ptdls_sta->TPK_count >= (ptdls_sta->TDLS_PeerKey_Lifetime - 3)) { if (ptdls_sta->TPK_count >= (ptdls_sta->TDLS_PeerKey_Lifetime - 3)) {
RTW_INFO("[TDLS] %s, Re-Setup TDLS link with "MAC_FMT" since TPK lifetime expires!\n", __FUNCTION__, MAC_ARG(ptdls_sta->hwaddr)); RTW_INFO("[TDLS] %s, Re-Setup TDLS link with "MAC_FMT" since TPK lifetime expires!\n", __func__, MAC_ARG(ptdls_sta->hwaddr));
ptdls_sta->TPK_count = 0; ptdls_sta->TPK_count = 0;
_rtw_memcpy(txmgmt.peer, ptdls_sta->hwaddr, ETH_ALEN); _rtw_memcpy(txmgmt.peer, ptdls_sta->hwaddr, ETH_ALEN);
issue_tdls_setup_req(ptdls_sta->padapter, &txmgmt, _FALSE); issue_tdls_setup_req(ptdls_sta->padapter, &txmgmt, _FALSE);

16
core/rtw_vht.c
View file

@ -98,7 +98,7 @@ u8 rtw_vht_mcsmap_to_nss(u8 *pvht_mcs_map)
} }
} }
/* RTW_INFO("%s : %dSS\n", __FUNCTION__, nss); */ /* RTW_INFO("%s : %dSS\n", __func__, nss); */
return nss; return nss;
} }
@ -122,7 +122,7 @@ void rtw_vht_nss_to_mcsmap(u8 nss, u8 *target_mcs_map, u8 *cur_mcs_map)
} }
} }
/* RTW_INFO("%s : %dSS\n", __FUNCTION__, nss); */ /* RTW_INFO("%s : %dSS\n", __func__, nss); */
} }
u16 rtw_vht_mcs_to_data_rate(u8 bw, u8 short_GI, u8 vht_mcs_rate) u16 rtw_vht_mcs_to_data_rate(u8 bw, u8 short_GI, u8 vht_mcs_rate)
@ -604,19 +604,19 @@ u32 rtw_build_vht_cap_ie(_adapter *padapter, u8 *pbuf)
rtw_hal_get_def_var(padapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offset); rtw_hal_get_def_var(padapter, HAL_DEF_RX_PACKET_OFFSET, &rx_packet_offset);
rtw_hal_get_def_var(padapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz); rtw_hal_get_def_var(padapter, HAL_DEF_MAX_RECVBUF_SZ, &max_recvbuf_sz);
RTW_DBG("%s, line%d, Available RX buf size = %d bytes\n.", __FUNCTION__, __LINE__, max_recvbuf_sz - rx_packet_offset); RTW_DBG("%s, line%d, Available RX buf size = %d bytes\n.", __func__, __LINE__, max_recvbuf_sz - rx_packet_offset);
if ((max_recvbuf_sz - rx_packet_offset) >= 11454) { if ((max_recvbuf_sz - rx_packet_offset) >= 11454) {
SET_VHT_CAPABILITY_ELE_MAX_MPDU_LENGTH(pcap, 2); SET_VHT_CAPABILITY_ELE_MAX_MPDU_LENGTH(pcap, 2);
RTW_INFO("%s, line%d, Set MAX MPDU len = 11454 bytes\n.", __FUNCTION__, __LINE__); RTW_INFO("%s, line%d, Set MAX MPDU len = 11454 bytes\n.", __func__, __LINE__);
} else if ((max_recvbuf_sz - rx_packet_offset) >= 7991) { } else if ((max_recvbuf_sz - rx_packet_offset) >= 7991) {
SET_VHT_CAPABILITY_ELE_MAX_MPDU_LENGTH(pcap, 1); SET_VHT_CAPABILITY_ELE_MAX_MPDU_LENGTH(pcap, 1);
RTW_INFO("%s, line%d, Set MAX MPDU len = 7991 bytes\n.", __FUNCTION__, __LINE__); RTW_INFO("%s, line%d, Set MAX MPDU len = 7991 bytes\n.", __func__, __LINE__);
} else if ((max_recvbuf_sz - rx_packet_offset) >= 3895) { } else if ((max_recvbuf_sz - rx_packet_offset) >= 3895) {
SET_VHT_CAPABILITY_ELE_MAX_MPDU_LENGTH(pcap, 0); SET_VHT_CAPABILITY_ELE_MAX_MPDU_LENGTH(pcap, 0);
RTW_INFO("%s, line%d, Set MAX MPDU len = 3895 bytes\n.", __FUNCTION__, __LINE__); RTW_INFO("%s, line%d, Set MAX MPDU len = 3895 bytes\n.", __func__, __LINE__);
} else } else
RTW_ERR("%s, line%d, Error!! Available RX buf size < 3895 bytes\n.", __FUNCTION__, __LINE__); RTW_ERR("%s, line%d, Error!! Available RX buf size < 3895 bytes\n.", __func__, __LINE__);
/* B2 B3 Supported Channel Width Set */ /* B2 B3 Supported Channel Width Set */
if (hal_chk_bw_cap(padapter, BW_CAP_160M) && REGSTY_IS_BW_5G_SUPPORT(pregistrypriv, CHANNEL_WIDTH_160)) { if (hal_chk_bw_cap(padapter, BW_CAP_160M) && REGSTY_IS_BW_5G_SUPPORT(pregistrypriv, CHANNEL_WIDTH_160)) {
@ -784,7 +784,7 @@ void VHTOnAssocRsp(_adapter *padapter)
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
u8 ht_AMPDU_len; u8 ht_AMPDU_len;
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
if (!pmlmeinfo->HT_enable) if (!pmlmeinfo->HT_enable)
return; return;

148
core/rtw_wapi.c
View file

@ -19,7 +19,7 @@ void WapiFreeAllStaInfo(_adapter *padapter)
PRT_WAPI_STA_INFO pWapiStaInfo; PRT_WAPI_STA_INFO pWapiStaInfo;
PRT_WAPI_BKID pWapiBkid; PRT_WAPI_BKID pWapiBkid;
WAPI_TRACE(WAPI_INIT, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_INIT, "===========> %s\n", __func__);
pWapiInfo = &padapter->wapiInfo; pWapiInfo = &padapter->wapiInfo;
/* Pust to Idle List */ /* Pust to Idle List */
@ -36,7 +36,7 @@ void WapiFreeAllStaInfo(_adapter *padapter)
pWapiBkid = (PRT_WAPI_BKID)list_entry(pWapiInfo->wapiBKIDIdleList.next, RT_WAPI_BKID, list); pWapiBkid = (PRT_WAPI_BKID)list_entry(pWapiInfo->wapiBKIDIdleList.next, RT_WAPI_BKID, list);
list_del_init(&pWapiBkid->list); list_del_init(&pWapiBkid->list);
} }
WAPI_TRACE(WAPI_INIT, "<=========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_INIT, "<=========== %s\n", __func__);
return; return;
} }
@ -128,7 +128,7 @@ WapiGetEntryForCamWrite(_adapter *padapter, u8 *pMacAddr, u8 KID, BOOLEAN IsMsk)
u8 i = 0; u8 i = 0;
u8 ret = 0xff; u8 ret = 0xff;
WAPI_TRACE(WAPI_API, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "===========> %s\n", __func__);
pWapiInfo = &padapter->wapiInfo; pWapiInfo = &padapter->wapiInfo;
@ -156,7 +156,7 @@ WapiGetEntryForCamWrite(_adapter *padapter, u8 *pMacAddr, u8 KID, BOOLEAN IsMsk)
} }
} }
WAPI_TRACE(WAPI_API, "<========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "<========== %s\n", __func__);
return ret; return ret;
/* /*
@ -176,7 +176,7 @@ u8 WapiGetEntryForCamClear(_adapter *padapter, u8 *pPeerMac, u8 keyid, u8 IsMsk)
PRT_WAPI_T pWapiInfo = NULL; PRT_WAPI_T pWapiInfo = NULL;
u8 i = 0; u8 i = 0;
WAPI_TRACE(WAPI_API, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "===========> %s\n", __func__);
pWapiInfo = &padapter->wapiInfo; pWapiInfo = &padapter->wapiInfo;
@ -189,7 +189,7 @@ u8 WapiGetEntryForCamClear(_adapter *padapter, u8 *pPeerMac, u8 keyid, u8 IsMsk)
pWapiInfo->wapiCamEntry[i].keyidx = 2; pWapiInfo->wapiCamEntry[i].keyidx = 2;
_rtw_memset(pWapiInfo->wapiCamEntry[i].PeerMacAddr, 0, ETH_ALEN); _rtw_memset(pWapiInfo->wapiCamEntry[i].PeerMacAddr, 0, ETH_ALEN);
WAPI_TRACE(WAPI_API, "<========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "<========== %s\n", __func__);
return pWapiInfo->wapiCamEntry[i].entry_idx; return pWapiInfo->wapiCamEntry[i].entry_idx;
} }
} }
@ -225,7 +225,7 @@ WapiResetAllCamEntry(_adapter *padapter)
PRT_WAPI_T pWapiInfo; PRT_WAPI_T pWapiInfo;
int i; int i;
WAPI_TRACE(WAPI_API, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "===========> %s\n", __func__);
pWapiInfo = &padapter->wapiInfo; pWapiInfo = &padapter->wapiInfo;
@ -236,7 +236,7 @@ WapiResetAllCamEntry(_adapter *padapter)
pWapiInfo->wapiCamEntry[i].entry_idx = 4 + i * 2; pWapiInfo->wapiCamEntry[i].entry_idx = 4 + i * 2;
} }
WAPI_TRACE(WAPI_API, "<========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "<========== %s\n", __func__);
return; return;
} }
@ -254,7 +254,7 @@ u8 WapiWriteOneCamEntry(
u8 retVal = 0; u8 retVal = 0;
u16 usConfig = 0; u16 usConfig = 0;
WAPI_TRACE(WAPI_API, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "===========> %s\n", __func__);
if (EntryId >= 32) { if (EntryId >= 32) {
WAPI_TRACE(WAPI_ERR, "<=== CamAddOneEntry(): ulKeyId exceed!\n"); WAPI_TRACE(WAPI_ERR, "<=== CamAddOneEntry(): ulKeyId exceed!\n");
@ -272,7 +272,7 @@ u8 WapiWriteOneCamEntry(
write_cam(padapter, EntryId, usConfig, pMacAddr, pKey); write_cam(padapter, EntryId, usConfig, pMacAddr, pKey);
WAPI_TRACE(WAPI_API, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "===========> %s\n", __func__);
return 1; return 1;
} }
@ -281,11 +281,11 @@ void rtw_wapi_init(_adapter *padapter)
PRT_WAPI_T pWapiInfo; PRT_WAPI_T pWapiInfo;
int i; int i;
WAPI_TRACE(WAPI_INIT, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_INIT, "===========> %s\n", __func__);
RT_ASSERT_RET(padapter); RT_ASSERT_RET(padapter);
if (!padapter->WapiSupport) { if (!padapter->WapiSupport) {
WAPI_TRACE(WAPI_INIT, "<========== %s, WAPI not supported!\n", __FUNCTION__); WAPI_TRACE(WAPI_INIT, "<========== %s, WAPI not supported!\n", __func__);
return; return;
} }
@ -310,38 +310,38 @@ void rtw_wapi_init(_adapter *padapter)
pWapiInfo->wapiCamEntry[i].entry_idx = 4 + i * 2; pWapiInfo->wapiCamEntry[i].entry_idx = 4 + i * 2;
} }
WAPI_TRACE(WAPI_INIT, "<========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_INIT, "<========== %s\n", __func__);
} }
void rtw_wapi_free(_adapter *padapter) void rtw_wapi_free(_adapter *padapter)
{ {
WAPI_TRACE(WAPI_INIT, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_INIT, "===========> %s\n", __func__);
RT_ASSERT_RET(padapter); RT_ASSERT_RET(padapter);
if (!padapter->WapiSupport) { if (!padapter->WapiSupport) {
WAPI_TRACE(WAPI_INIT, "<========== %s, WAPI not supported!\n", __FUNCTION__); WAPI_TRACE(WAPI_INIT, "<========== %s, WAPI not supported!\n", __func__);
return; return;
} }
WapiFreeAllStaInfo(padapter); WapiFreeAllStaInfo(padapter);
WAPI_TRACE(WAPI_INIT, "<========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_INIT, "<========== %s\n", __func__);
} }
void rtw_wapi_disable_tx(_adapter *padapter) void rtw_wapi_disable_tx(_adapter *padapter)
{ {
WAPI_TRACE(WAPI_INIT, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_INIT, "===========> %s\n", __func__);
RT_ASSERT_RET(padapter); RT_ASSERT_RET(padapter);
if (!padapter->WapiSupport) { if (!padapter->WapiSupport) {
WAPI_TRACE(WAPI_INIT, "<========== %s, WAPI not supported!\n", __FUNCTION__); WAPI_TRACE(WAPI_INIT, "<========== %s, WAPI not supported!\n", __func__);
return; return;
} }
padapter->wapiInfo.wapiTxMsk.bTxEnable = false; padapter->wapiInfo.wapiTxMsk.bTxEnable = false;
padapter->wapiInfo.wapiTxMsk.bSet = false; padapter->wapiInfo.wapiTxMsk.bSet = false;
WAPI_TRACE(WAPI_INIT, "<========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_INIT, "<========== %s\n", __func__);
} }
u8 rtw_wapi_is_wai_packet(_adapter *padapter, u8 *pkt_data) u8 rtw_wapi_is_wai_packet(_adapter *padapter, u8 *pkt_data)
@ -353,10 +353,10 @@ u8 rtw_wapi_is_wai_packet(_adapter *padapter, u8 *pkt_data)
u8 WaiPkt = 0, *pTaddr, bFind = false; u8 WaiPkt = 0, *pTaddr, bFind = false;
u8 Offset_TypeWAI = 0 ; /* (mac header len + llc length) */ u8 Offset_TypeWAI = 0 ; /* (mac header len + llc length) */
WAPI_TRACE(WAPI_TX | WAPI_RX, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_TX | WAPI_RX, "===========> %s\n", __func__);
if ((!padapter->WapiSupport) || (!pWapiInfo->bWapiEnable)) { if ((!padapter->WapiSupport) || (!pWapiInfo->bWapiEnable)) {
WAPI_TRACE(WAPI_MLME, "<========== %s, WAPI not supported or not enabled!\n", __FUNCTION__); WAPI_TRACE(WAPI_MLME, "<========== %s, WAPI not supported or not enabled!\n", __func__);
return 0; return 0;
} }
@ -380,7 +380,7 @@ u8 rtw_wapi_is_wai_packet(_adapter *padapter, u8 *pkt_data)
} }
} }
WAPI_TRACE(WAPI_TX | WAPI_RX, "%s: bFind=%d pTaddr="MAC_FMT"\n", __FUNCTION__, bFind, MAC_ARG(pTaddr)); WAPI_TRACE(WAPI_TX | WAPI_RX, "%s: bFind=%d pTaddr="MAC_FMT"\n", __func__, bFind, MAC_ARG(pTaddr));
if (pkt_data[0] == WIFI_QOS_DATA_TYPE) if (pkt_data[0] == WIFI_QOS_DATA_TYPE)
Offset_TypeWAI += 2; Offset_TypeWAI += 2;
@ -391,9 +391,9 @@ u8 rtw_wapi_is_wai_packet(_adapter *padapter, u8 *pkt_data)
psecuritypriv->hw_decrypted = _TRUE; psecuritypriv->hw_decrypted = _TRUE;
} else } else
WAPI_TRACE(WAPI_TX | WAPI_RX, "%s(): non wai packet\n", __FUNCTION__); WAPI_TRACE(WAPI_TX | WAPI_RX, "%s(): non wai packet\n", __func__);
WAPI_TRACE(WAPI_TX | WAPI_RX, "%s(): Recvd WAI frame. IsWAIPkt(%d)\n", __FUNCTION__, WaiPkt); WAPI_TRACE(WAPI_TX | WAPI_RX, "%s(): Recvd WAI frame. IsWAIPkt(%d)\n", __func__, WaiPkt);
return WaiPkt; return WaiPkt;
} }
@ -408,10 +408,10 @@ void rtw_wapi_update_info(_adapter *padapter, union recv_frame *precv_frame)
u8 *pRecvPN; u8 *pRecvPN;
WAPI_TRACE(WAPI_RX, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "===========> %s\n", __func__);
if ((!padapter->WapiSupport) || (!pWapiInfo->bWapiEnable)) { if ((!padapter->WapiSupport) || (!pWapiInfo->bWapiEnable)) {
WAPI_TRACE(WAPI_RX, "<========== %s, WAPI not supported or not enabled!\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "<========== %s, WAPI not supported or not enabled!\n", __func__);
return; return;
} }
@ -428,7 +428,7 @@ void rtw_wapi_update_info(_adapter *padapter, union recv_frame *precv_frame)
pRecvPN = ptr + precv_hdr->attrib.hdrlen + 2; pRecvPN = ptr + precv_hdr->attrib.hdrlen + 2;
_rtw_memcpy((u8 *)precv_hdr->WapiTempPN, pRecvPN, 16); _rtw_memcpy((u8 *)precv_hdr->WapiTempPN, pRecvPN, 16);
WAPI_TRACE(WAPI_RX, "<========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "<========== %s\n", __func__);
} }
/**************************************************************************** /****************************************************************************
@ -452,10 +452,10 @@ u8 rtw_wapi_check_for_drop(
u8 *ptr = precv_frame->u.hdr.rx_data; u8 *ptr = precv_frame->u.hdr.rx_data;
int i; int i;
WAPI_TRACE(WAPI_RX, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "===========> %s\n", __func__);
if ((!padapter->WapiSupport) || (!pWapiInfo->bWapiEnable)) { if ((!padapter->WapiSupport) || (!pWapiInfo->bWapiEnable)) {
WAPI_TRACE(WAPI_RX, "<========== %s, WAPI not supported or not enabled!\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "<========== %s, WAPI not supported or not enabled!\n", __func__);
return false; return false;
} }
@ -494,7 +494,7 @@ u8 rtw_wapi_check_for_drop(
} }
} }
} }
WAPI_TRACE(WAPI_RX, "%s: bFind=%d prxb->WapiSrcAddr="MAC_FMT"\n", __FUNCTION__, bFind, MAC_ARG(precv_hdr->WapiSrcAddr)); WAPI_TRACE(WAPI_RX, "%s: bFind=%d prxb->WapiSrcAddr="MAC_FMT"\n", __func__, bFind, MAC_ARG(precv_hdr->WapiSrcAddr));
if (bFind) { if (bFind) {
if (IS_MCAST(precv_hdr->attrib.ra)) { if (IS_MCAST(precv_hdr->attrib.ra)) {
@ -520,13 +520,13 @@ u8 rtw_wapi_check_for_drop(
pLastRecvPN = pWapiSta->lastRxUnicastPNVOQueue; pLastRecvPN = pWapiSta->lastRxUnicastPNVOQueue;
break; break;
default: default:
WAPI_TRACE(WAPI_ERR, "%s: Unknown TID\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s: Unknown TID\n", __func__);
break; break;
} }
} }
if (!WapiComparePN(precv_hdr->WapiTempPN, pLastRecvPN)) { if (!WapiComparePN(precv_hdr->WapiTempPN, pLastRecvPN)) {
WAPI_TRACE(WAPI_RX, "%s: Equal PN!!\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "%s: Equal PN!!\n", __func__);
if (IS_MCAST(precv_hdr->attrib.ra)) if (IS_MCAST(precv_hdr->attrib.ra))
_rtw_memcpy(pLastRecvPN, WapiAEMultiCastPNInitialValueSrc, 16); _rtw_memcpy(pLastRecvPN, WapiAEMultiCastPNInitialValueSrc, 16);
else else
@ -536,7 +536,7 @@ u8 rtw_wapi_check_for_drop(
_rtw_memcpy(pLastRecvPN, precv_hdr->WapiTempPN, 16); _rtw_memcpy(pLastRecvPN, precv_hdr->WapiTempPN, 16);
} }
WAPI_TRACE(WAPI_RX, "<========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "<========== %s\n", __func__);
return bDrop; return bDrop;
} }
@ -545,10 +545,10 @@ void rtw_build_probe_resp_wapi_ie(_adapter *padapter, unsigned char *pframe, str
PRT_WAPI_T pWapiInfo = &(padapter->wapiInfo); PRT_WAPI_T pWapiInfo = &(padapter->wapiInfo);
u8 WapiIELength = 0; u8 WapiIELength = 0;
WAPI_TRACE(WAPI_MLME, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_MLME, "===========> %s\n", __func__);
if ((!padapter->WapiSupport) || (!pWapiInfo->bWapiEnable)) { if ((!padapter->WapiSupport) || (!pWapiInfo->bWapiEnable)) {
WAPI_TRACE(WAPI_MLME, "<========== %s, WAPI not supported!\n", __FUNCTION__); WAPI_TRACE(WAPI_MLME, "<========== %s, WAPI not supported!\n", __func__);
return; return;
} }
@ -560,17 +560,17 @@ void rtw_build_probe_resp_wapi_ie(_adapter *padapter, unsigned char *pframe, str
pframe += WapiIELength + 2; pframe += WapiIELength + 2;
pattrib->pktlen += WapiIELength + 2; pattrib->pktlen += WapiIELength + 2;
WAPI_TRACE(WAPI_MLME, "<========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_MLME, "<========== %s\n", __func__);
} }
void rtw_build_beacon_wapi_ie(_adapter *padapter, unsigned char *pframe, struct pkt_attrib *pattrib) void rtw_build_beacon_wapi_ie(_adapter *padapter, unsigned char *pframe, struct pkt_attrib *pattrib)
{ {
PRT_WAPI_T pWapiInfo = &(padapter->wapiInfo); PRT_WAPI_T pWapiInfo = &(padapter->wapiInfo);
u8 WapiIELength = 0; u8 WapiIELength = 0;
WAPI_TRACE(WAPI_MLME, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_MLME, "===========> %s\n", __func__);
if ((!padapter->WapiSupport) || (!pWapiInfo->bWapiEnable)) { if ((!padapter->WapiSupport) || (!pWapiInfo->bWapiEnable)) {
WAPI_TRACE(WAPI_MLME, "<========== %s, WAPI not supported!\n", __FUNCTION__); WAPI_TRACE(WAPI_MLME, "<========== %s, WAPI not supported!\n", __func__);
return; return;
} }
@ -582,7 +582,7 @@ void rtw_build_beacon_wapi_ie(_adapter *padapter, unsigned char *pframe, struct
pframe += WapiIELength + 2; pframe += WapiIELength + 2;
pattrib->pktlen += WapiIELength + 2; pattrib->pktlen += WapiIELength + 2;
WAPI_TRACE(WAPI_MLME, "<========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_MLME, "<========== %s\n", __func__);
} }
void rtw_build_assoc_req_wapi_ie(_adapter *padapter, unsigned char *pframe, struct pkt_attrib *pattrib) void rtw_build_assoc_req_wapi_ie(_adapter *padapter, unsigned char *pframe, struct pkt_attrib *pattrib)
@ -592,10 +592,10 @@ void rtw_build_assoc_req_wapi_ie(_adapter *padapter, unsigned char *pframe, stru
PRT_WAPI_T pWapiInfo = &(padapter->wapiInfo); PRT_WAPI_T pWapiInfo = &(padapter->wapiInfo);
u8 WapiIELength = 0; u8 WapiIELength = 0;
WAPI_TRACE(WAPI_MLME, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_MLME, "===========> %s\n", __func__);
if ((!padapter->WapiSupport) || (!pWapiInfo->bWapiEnable)) { if ((!padapter->WapiSupport) || (!pWapiInfo->bWapiEnable)) {
WAPI_TRACE(WAPI_MLME, "<========== %s, WAPI not supported!\n", __FUNCTION__); WAPI_TRACE(WAPI_MLME, "<========== %s, WAPI not supported!\n", __func__);
return; return;
} }
@ -617,7 +617,7 @@ void rtw_build_assoc_req_wapi_ie(_adapter *padapter, unsigned char *pframe, stru
_rtw_memcpy(pframe + 2, pWapiInfo->wapiIE, WapiIELength); _rtw_memcpy(pframe + 2, pWapiInfo->wapiIE, WapiIELength);
pframe += WapiIELength + 2; pframe += WapiIELength + 2;
pattrib->pktlen += WapiIELength + 2; pattrib->pktlen += WapiIELength + 2;
WAPI_TRACE(WAPI_MLME, "<========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_MLME, "<========== %s\n", __func__);
} }
void rtw_wapi_on_assoc_ok(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) void rtw_wapi_on_assoc_ok(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
@ -628,10 +628,10 @@ void rtw_wapi_on_assoc_ok(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
/* u8 WapiASUEPNInitialValueSrc[16] = {0x36,0x5C,0x36,0x5C,0x36,0x5C,0x36,0x5C,0x36,0x5C,0x36,0x5C,0x36,0x5C,0x36,0x5C} ; */ /* u8 WapiASUEPNInitialValueSrc[16] = {0x36,0x5C,0x36,0x5C,0x36,0x5C,0x36,0x5C,0x36,0x5C,0x36,0x5C,0x36,0x5C,0x36,0x5C} ; */
u8 WapiAEMultiCastPNInitialValueSrc[16] = {0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C} ; u8 WapiAEMultiCastPNInitialValueSrc[16] = {0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C} ;
WAPI_TRACE(WAPI_MLME, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_MLME, "===========> %s\n", __func__);
if ((!padapter->WapiSupport) || (!pWapiInfo->bWapiEnable)) { if ((!padapter->WapiSupport) || (!pWapiInfo->bWapiEnable)) {
WAPI_TRACE(WAPI_MLME, "<========== %s, WAPI not supported or not enabled!\n", __FUNCTION__); WAPI_TRACE(WAPI_MLME, "<========== %s, WAPI not supported or not enabled!\n", __func__);
return; return;
} }
@ -648,7 +648,7 @@ void rtw_wapi_on_assoc_ok(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE)
_rtw_memcpy(pWapiSta->lastRxUnicastPNVIQueue, WapiAEPNInitialValueSrc, 16); _rtw_memcpy(pWapiSta->lastRxUnicastPNVIQueue, WapiAEPNInitialValueSrc, 16);
_rtw_memcpy(pWapiSta->lastRxUnicastPNVOQueue, WapiAEPNInitialValueSrc, 16); _rtw_memcpy(pWapiSta->lastRxUnicastPNVOQueue, WapiAEPNInitialValueSrc, 16);
WAPI_TRACE(WAPI_MLME, "<========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_MLME, "<========== %s\n", __func__);
} }
@ -661,10 +661,10 @@ void rtw_wapi_return_one_sta_info(_adapter *padapter, u8 *MacAddr)
pWapiInfo = &padapter->wapiInfo; pWapiInfo = &padapter->wapiInfo;
WAPI_TRACE(WAPI_API, "==========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "==========> %s\n", __func__);
if ((!padapter->WapiSupport) || (!pWapiInfo->bWapiEnable)) { if ((!padapter->WapiSupport) || (!pWapiInfo->bWapiEnable)) {
WAPI_TRACE(WAPI_MLME, "<========== %s, WAPI not supported or not enabled!\n", __FUNCTION__); WAPI_TRACE(WAPI_MLME, "<========== %s, WAPI not supported or not enabled!\n", __func__);
return; return;
} }
@ -678,16 +678,16 @@ void rtw_wapi_return_one_sta_info(_adapter *padapter, u8 *MacAddr)
} }
WAPI_TRACE(WAPI_API, " %s: after clear bkid\n", __FUNCTION__); WAPI_TRACE(WAPI_API, " %s: after clear bkid\n", __func__);
/* Remove STA info */ /* Remove STA info */
if (list_empty(&(pWapiInfo->wapiSTAUsedList))) { if (list_empty(&(pWapiInfo->wapiSTAUsedList))) {
WAPI_TRACE(WAPI_API, " %s: wapiSTAUsedList is null\n", __FUNCTION__); WAPI_TRACE(WAPI_API, " %s: wapiSTAUsedList is null\n", __func__);
return; return;
} else { } else {
WAPI_TRACE(WAPI_API, " %s: wapiSTAUsedList is not null\n", __FUNCTION__); WAPI_TRACE(WAPI_API, " %s: wapiSTAUsedList is not null\n", __func__);
#if 0 #if 0
pWapiStaInfo = (PRT_WAPI_STA_INFO)list_entry((pWapiInfo->wapiSTAUsedList.next), RT_WAPI_STA_INFO, list); pWapiStaInfo = (PRT_WAPI_STA_INFO)list_entry((pWapiInfo->wapiSTAUsedList.next), RT_WAPI_STA_INFO, list);
@ -700,17 +700,17 @@ void rtw_wapi_return_one_sta_info(_adapter *padapter, u8 *MacAddr)
pWapiStaInfo->PeerMacAddr[4], pWapiStaInfo->PeerMacAddr[5]); pWapiStaInfo->PeerMacAddr[4], pWapiStaInfo->PeerMacAddr[5]);
if (pWapiStaInfo == NULL) { if (pWapiStaInfo == NULL) {
WAPI_TRACE(WAPI_API, " %s: pWapiStaInfo == NULL Case\n", __FUNCTION__); WAPI_TRACE(WAPI_API, " %s: pWapiStaInfo == NULL Case\n", __func__);
return; return;
} }
if (pWapiStaInfo->PeerMacAddr == NULL) { if (pWapiStaInfo->PeerMacAddr == NULL) {
WAPI_TRACE(WAPI_API, " %s: pWapiStaInfo->PeerMacAddr == NULL Case\n", __FUNCTION__); WAPI_TRACE(WAPI_API, " %s: pWapiStaInfo->PeerMacAddr == NULL Case\n", __func__);
return; return;
} }
if (MacAddr == NULL) { if (MacAddr == NULL) {
WAPI_TRACE(WAPI_API, " %s: MacAddr == NULL Case\n", __FUNCTION__); WAPI_TRACE(WAPI_API, " %s: MacAddr == NULL Case\n", __func__);
return; return;
} }
@ -740,7 +740,7 @@ void rtw_wapi_return_one_sta_info(_adapter *padapter, u8 *MacAddr)
} }
WAPI_TRACE(WAPI_API, "<========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "<========== %s\n", __func__);
return; return;
} }
@ -749,12 +749,12 @@ void rtw_wapi_return_all_sta_info(_adapter *padapter)
PRT_WAPI_T pWapiInfo; PRT_WAPI_T pWapiInfo;
PRT_WAPI_STA_INFO pWapiStaInfo; PRT_WAPI_STA_INFO pWapiStaInfo;
PRT_WAPI_BKID pWapiBkid; PRT_WAPI_BKID pWapiBkid;
WAPI_TRACE(WAPI_API, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "===========> %s\n", __func__);
pWapiInfo = &padapter->wapiInfo; pWapiInfo = &padapter->wapiInfo;
if ((!padapter->WapiSupport) || (!pWapiInfo->bWapiEnable)) { if ((!padapter->WapiSupport) || (!pWapiInfo->bWapiEnable)) {
WAPI_TRACE(WAPI_MLME, "<========== %s, WAPI not supported or not enabled!\n", __FUNCTION__); WAPI_TRACE(WAPI_MLME, "<========== %s, WAPI not supported or not enabled!\n", __func__);
return; return;
} }
@ -774,17 +774,17 @@ void rtw_wapi_return_all_sta_info(_adapter *padapter)
memset(pWapiBkid->bkid, 0, 16); memset(pWapiBkid->bkid, 0, 16);
list_add_tail(&pWapiBkid->list, &pWapiInfo->wapiBKIDIdleList); list_add_tail(&pWapiBkid->list, &pWapiInfo->wapiBKIDIdleList);
} }
WAPI_TRACE(WAPI_API, "<========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "<========== %s\n", __func__);
} }
void rtw_wapi_clear_cam_entry(_adapter *padapter, u8 *pMacAddr) void rtw_wapi_clear_cam_entry(_adapter *padapter, u8 *pMacAddr)
{ {
u8 UcIndex = 0; u8 UcIndex = 0;
WAPI_TRACE(WAPI_API, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "===========> %s\n", __func__);
if ((!padapter->WapiSupport) || (!padapter->wapiInfo.bWapiEnable)) { if ((!padapter->WapiSupport) || (!padapter->wapiInfo.bWapiEnable)) {
WAPI_TRACE(WAPI_MLME, "<========== %s, WAPI not supported or not enabled!\n", __FUNCTION__); WAPI_TRACE(WAPI_MLME, "<========== %s, WAPI not supported or not enabled!\n", __func__);
return; return;
} }
@ -812,22 +812,22 @@ void rtw_wapi_clear_cam_entry(_adapter *padapter, u8 *pMacAddr)
CAM_empty_entry(padapter, UcIndex); CAM_empty_entry(padapter, UcIndex);
} }
WAPI_TRACE(WAPI_API, "<========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "<========== %s\n", __func__);
} }
void rtw_wapi_clear_all_cam_entry(_adapter *padapter) void rtw_wapi_clear_all_cam_entry(_adapter *padapter)
{ {
WAPI_TRACE(WAPI_API, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "===========> %s\n", __func__);
if ((!padapter->WapiSupport) || (!padapter->wapiInfo.bWapiEnable)) { if ((!padapter->WapiSupport) || (!padapter->wapiInfo.bWapiEnable)) {
WAPI_TRACE(WAPI_MLME, "<========== %s, WAPI not supported or not enabled!\n", __FUNCTION__); WAPI_TRACE(WAPI_MLME, "<========== %s, WAPI not supported or not enabled!\n", __func__);
return; return;
} }
invalidate_cam_all(padapter); /* is this ok? */ invalidate_cam_all(padapter); /* is this ok? */
WapiResetAllCamEntry(padapter); WapiResetAllCamEntry(padapter);
WAPI_TRACE(WAPI_API, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "===========> %s\n", __func__);
} }
void rtw_wapi_set_key(_adapter *padapter, RT_WAPI_KEY *pWapiKey, RT_WAPI_STA_INFO *pWapiSta, u8 bGroupKey, u8 bUseDefaultKey) void rtw_wapi_set_key(_adapter *padapter, RT_WAPI_KEY *pWapiKey, RT_WAPI_STA_INFO *pWapiSta, u8 bGroupKey, u8 bUseDefaultKey)
@ -838,10 +838,10 @@ void rtw_wapi_set_key(_adapter *padapter, RT_WAPI_KEY *pWapiKey, RT_WAPI_STA_INF
BOOLEAN IsPairWise = false ; BOOLEAN IsPairWise = false ;
u8 EncAlgo; u8 EncAlgo;
WAPI_TRACE(WAPI_API, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "===========> %s\n", __func__);
if ((!padapter->WapiSupport) || (!padapter->wapiInfo.bWapiEnable)) { if ((!padapter->WapiSupport) || (!padapter->wapiInfo.bWapiEnable)) {
WAPI_TRACE(WAPI_API, "<========== %s, WAPI not supported or not enabled!\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "<========== %s, WAPI not supported or not enabled!\n", __func__);
return; return;
} }
@ -883,7 +883,7 @@ void rtw_wapi_set_key(_adapter *padapter, RT_WAPI_KEY *pWapiKey, RT_WAPI_STA_INF
pWapiKey->micKey); pWapiKey->micKey);
WAPI_TRACE(WAPI_API, "Set Wapi Key :KeyId:%d,EntryId:%d,PairwiseKey:%d.\n", pWapiKey->keyId, EntryId, !bGroupKey); WAPI_TRACE(WAPI_API, "Set Wapi Key :KeyId:%d,EntryId:%d,PairwiseKey:%d.\n", pWapiKey->keyId, EntryId, !bGroupKey);
WAPI_TRACE(WAPI_API, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "===========> %s\n", __func__);
} }
@ -904,7 +904,7 @@ void wapi_test_set_key(struct _adapter *padapter, u8 *buf)
u8 WapiASUEPNInitialValueSrc[16] = {0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C} ; u8 WapiASUEPNInitialValueSrc[16] = {0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C} ;
u8 WapiAEMultiCastPNInitialValueSrc[16] = {0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C} ; u8 WapiAEMultiCastPNInitialValueSrc[16] = {0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C, 0x36, 0x5C} ;
WAPI_TRACE(WAPI_INIT, "===========>%s\n", __FUNCTION__); WAPI_TRACE(WAPI_INIT, "===========>%s\n", __func__);
if (!padapter->WapiSupport) if (!padapter->WapiSupport)
return; return;
@ -1043,7 +1043,7 @@ void wapi_test_set_key(struct _adapter *padapter, u8 *buf)
} }
} }
} }
WAPI_TRACE(WAPI_INIT, "<===========%s\n", __FUNCTION__); WAPI_TRACE(WAPI_INIT, "<===========%s\n", __func__);
} }
@ -1058,10 +1058,10 @@ void wapi_test_init(struct _adapter *padapter)
u8 MskMicKey[16] = {0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f}; u8 MskMicKey[16] = {0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f};
u8 MskId = 0; u8 MskId = 0;
WAPI_TRACE(WAPI_INIT, "===========>%s\n", __FUNCTION__); WAPI_TRACE(WAPI_INIT, "===========>%s\n", __func__);
/* Enable Wapi */ /* Enable Wapi */
WAPI_TRACE(WAPI_INIT, "%s: Enable wapi!!!!\n", __FUNCTION__); WAPI_TRACE(WAPI_INIT, "%s: Enable wapi!!!!\n", __func__);
padapter->wapiInfo.bWapiEnable = true; padapter->wapiInfo.bWapiEnable = true;
padapter->pairwise_key_type = KEY_TYPE_SMS4; padapter->pairwise_key_type = KEY_TYPE_SMS4;
ieee->group_key_type = KEY_TYPE_SMS4; ieee->group_key_type = KEY_TYPE_SMS4;
@ -1069,7 +1069,7 @@ void wapi_test_init(struct _adapter *padapter)
padapter->wapiInfo.extra_postfix_len = SMS4_MIC_LEN; padapter->wapiInfo.extra_postfix_len = SMS4_MIC_LEN;
/* set usk */ /* set usk */
WAPI_TRACE(WAPI_INIT, "%s: Set USK!!!!\n", __FUNCTION__); WAPI_TRACE(WAPI_INIT, "%s: Set USK!!!!\n", __func__);
memset(keybuf, 0, 100); memset(keybuf, 0, 100);
keybuf[0] = 1; /* set usk */ keybuf[0] = 1; /* set usk */
keybuf[1] = 1; /* enable tx */ keybuf[1] = 1; /* enable tx */
@ -1095,7 +1095,7 @@ void wapi_test_init(struct _adapter *padapter)
wapi_test_set_key(padapter, keybuf); wapi_test_set_key(padapter, keybuf);
/* set msk */ /* set msk */
WAPI_TRACE(WAPI_INIT, "%s: Set MSK!!!!\n", __FUNCTION__); WAPI_TRACE(WAPI_INIT, "%s: Set MSK!!!!\n", __func__);
memset(keybuf, 0, 100); memset(keybuf, 0, 100);
keybuf[0] = 2; /* set msk */ keybuf[0] = 2; /* set msk */
keybuf[1] = 1; /* Enable TX */ keybuf[1] = 1; /* Enable TX */
@ -1117,7 +1117,7 @@ void wapi_test_init(struct _adapter *padapter)
memcpy(keybuf + 26, MskMicKey, 16); memcpy(keybuf + 26, MskMicKey, 16);
keybuf[42] = MskId; keybuf[42] = MskId;
wapi_test_set_key(padapter, keybuf); wapi_test_set_key(padapter, keybuf);
WAPI_TRACE(WAPI_INIT, "<===========%s\n", __FUNCTION__); WAPI_TRACE(WAPI_INIT, "<===========%s\n", __func__);
} }
#endif #endif
@ -1135,7 +1135,7 @@ void rtw_wapi_get_iv(_adapter *padapter, u8 *pRA, u8 *IV)
if (IS_MCAST(pRA)) { if (IS_MCAST(pRA)) {
if (!pWapiInfo->wapiTxMsk.bTxEnable) { if (!pWapiInfo->wapiTxMsk.bTxEnable) {
WAPI_TRACE(WAPI_ERR, "%s: bTxEnable = 0!!\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s: bTxEnable = 0!!\n", __func__);
return; return;
} }

110
core/rtw_wapi_sms4.c
View file

@ -281,7 +281,7 @@ void SecCalculateMicSMS4(
u8 TempBuf[34], TempLen = 32, MicLen, QosOffset, *IV; u8 TempBuf[34], TempLen = 32, MicLen, QosOffset, *IV;
u16 *pTemp, fc; u16 *pTemp, fc;
WAPI_TRACE(WAPI_TX | WAPI_RX, "=========>%s\n", __FUNCTION__); WAPI_TRACE(WAPI_TX | WAPI_RX, "=========>%s\n", __func__);
header = (struct ieee80211_hdr_3addr_qos *)pHeader; header = (struct ieee80211_hdr_3addr_qos *)pHeader;
memset(TempBuf, 0, 34); memset(TempBuf, 0, 34);
@ -331,9 +331,9 @@ void SecCalculateMicSMS4(
pData, DataLen, MicBuffer, &MicLen); pData, DataLen, MicBuffer, &MicLen);
if (MicLen != 16) if (MicLen != 16)
WAPI_TRACE(WAPI_ERR, "%s: MIC Length Error!!\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s: MIC Length Error!!\n", __func__);
WAPI_TRACE(WAPI_TX | WAPI_RX, "<=========%s\n", __FUNCTION__); WAPI_TRACE(WAPI_TX | WAPI_RX, "<=========%s\n", __func__);
#endif #endif
} }
@ -350,7 +350,7 @@ u8 WapiIncreasePN(u8 *PN, u8 AddCount)
/* YJ,test,091102 */ /* YJ,test,091102 */
/* /*
if(AddCount == 2){ if(AddCount == 2){
RTW_INFO("############################%s(): PN[0]=0x%x\n", __FUNCTION__, PN[0]); RTW_INFO("############################%s(): PN[0]=0x%x\n", __func__, PN[0]);
if(PN[0] == 0x48){ if(PN[0] == 0x48){
PN[0] += AddCount; PN[0] += AddCount;
return 1; return 1;
@ -381,7 +381,7 @@ void WapiGetLastRxUnicastPNForQoSData(
u8 *PNOut u8 *PNOut
) )
{ {
WAPI_TRACE(WAPI_RX, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "===========> %s\n", __func__);
switch (UserPriority) { switch (UserPriority) {
case 0: case 0:
case 3: case 3:
@ -400,10 +400,10 @@ void WapiGetLastRxUnicastPNForQoSData(
memcpy(PNOut, pWapiStaInfo->lastRxUnicastPNVOQueue, 16); memcpy(PNOut, pWapiStaInfo->lastRxUnicastPNVOQueue, 16);
break; break;
default: default:
WAPI_TRACE(WAPI_ERR, "%s: Unknown TID\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s: Unknown TID\n", __func__);
break; break;
} }
WAPI_TRACE(WAPI_RX, "<=========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "<=========== %s\n", __func__);
} }
@ -413,7 +413,7 @@ void WapiSetLastRxUnicastPNForQoSData(
PRT_WAPI_STA_INFO pWapiStaInfo PRT_WAPI_STA_INFO pWapiStaInfo
) )
{ {
WAPI_TRACE(WAPI_RX, "===========> %s\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "===========> %s\n", __func__);
switch (UserPriority) { switch (UserPriority) {
case 0: case 0:
case 3: case 3:
@ -432,10 +432,10 @@ void WapiSetLastRxUnicastPNForQoSData(
memcpy(pWapiStaInfo->lastRxUnicastPNVOQueue, PNIn, 16); memcpy(pWapiStaInfo->lastRxUnicastPNVOQueue, PNIn, 16);
break; break;
default: default:
WAPI_TRACE(WAPI_ERR, "%s: Unknown TID\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s: Unknown TID\n", __func__);
break; break;
} }
WAPI_TRACE(WAPI_RX, "<=========== %s\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "<=========== %s\n", __func__);
} }
@ -475,7 +475,7 @@ u8 WapiCheckPnInSwDecrypt(
else else
ret = true; ret = true;
#endif #endif
WAPI_TRACE(WAPI_RX, "%s: return %d\n", __FUNCTION__, ret); WAPI_TRACE(WAPI_RX, "%s: return %d\n", __func__, ret);
return ret; return ret;
} }
@ -490,7 +490,7 @@ int SecSMS4HeaderFillIV(_adapter *padapter, u8 *pxmitframe)
PRT_WAPI_STA_INFO pWapiSta = NULL; PRT_WAPI_STA_INFO pWapiSta = NULL;
int ret = 0; int ret = 0;
WAPI_TRACE(WAPI_TX, "=========>%s\n", __FUNCTION__); WAPI_TRACE(WAPI_TX, "=========>%s\n", __func__);
return ret; return ret;
#if 0 #if 0
@ -511,7 +511,7 @@ int SecSMS4HeaderFillIV(_adapter *padapter, u8 *pxmitframe)
/* Address 1 is always receiver's address */ /* Address 1 is always receiver's address */
if (IS_MCAST(pRA)) { if (IS_MCAST(pRA)) {
if (!pWapiInfo->wapiTxMsk.bTxEnable) { if (!pWapiInfo->wapiTxMsk.bTxEnable) {
WAPI_TRACE(WAPI_ERR, "%s: bTxEnable = 0!!\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s: bTxEnable = 0!!\n", __func__);
return -2; return -2;
} }
if (pWapiInfo->wapiTxMsk.keyId <= 1) { if (pWapiInfo->wapiTxMsk.keyId <= 1) {
@ -521,11 +521,11 @@ int SecSMS4HeaderFillIV(_adapter *padapter, u8 *pxmitframe)
memcpy(pWapiExt->PN, pWapiInfo->lastTxMulticastPN, 16); memcpy(pWapiExt->PN, pWapiInfo->lastTxMulticastPN, 16);
if (bPNOverflow) { if (bPNOverflow) {
/* Update MSK Notification. */ /* Update MSK Notification. */
WAPI_TRACE(WAPI_ERR, "===============>%s():multicast PN overflow\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "===============>%s():multicast PN overflow\n", __func__);
rtw_wapi_app_event_handler(padapter, NULL, 0, pRA, false, false, true, 0, false); rtw_wapi_app_event_handler(padapter, NULL, 0, pRA, false, false, true, 0, false);
} }
} else { } else {
WAPI_TRACE(WAPI_ERR, "%s: Invalid Wapi Multicast KeyIdx!!\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s: Invalid Wapi Multicast KeyIdx!!\n", __func__);
ret = -3; ret = -3;
} }
} else { } else {
@ -537,7 +537,7 @@ int SecSMS4HeaderFillIV(_adapter *padapter, u8 *pxmitframe)
} }
if (bFindMatchPeer) { if (bFindMatchPeer) {
if ((!pWapiSta->wapiUskUpdate.bTxEnable) && (!pWapiSta->wapiUsk.bTxEnable)) { if ((!pWapiSta->wapiUskUpdate.bTxEnable) && (!pWapiSta->wapiUsk.bTxEnable)) {
WAPI_TRACE(WAPI_ERR, "%s: bTxEnable = 0!!\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s: bTxEnable = 0!!\n", __func__);
return -4; return -4;
} }
if (pWapiSta->wapiUsk.keyId <= 1) { if (pWapiSta->wapiUsk.keyId <= 1) {
@ -551,21 +551,21 @@ int SecSMS4HeaderFillIV(_adapter *padapter, u8 *pxmitframe)
memcpy(pWapiExt->PN, pWapiSta->lastTxUnicastPN, 16); memcpy(pWapiExt->PN, pWapiSta->lastTxUnicastPN, 16);
if (bPNOverflow) { if (bPNOverflow) {
/* Update USK Notification. */ /* Update USK Notification. */
WAPI_TRACE(WAPI_ERR, "===============>%s():unicast PN overflow\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "===============>%s():unicast PN overflow\n", __func__);
rtw_wapi_app_event_handler(padapter, NULL, 0, pWapiSta->PeerMacAddr, false, true, false, 0, false); rtw_wapi_app_event_handler(padapter, NULL, 0, pWapiSta->PeerMacAddr, false, true, false, 0, false);
} }
} else { } else {
WAPI_TRACE(WAPI_ERR, "%s: Invalid Wapi Unicast KeyIdx!!\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s: Invalid Wapi Unicast KeyIdx!!\n", __func__);
ret = -5; ret = -5;
} }
} else { } else {
WAPI_TRACE(WAPI_ERR, "%s: Can not find Peer Sta "MAC_FMT"!!\n", __FUNCTION__, MAC_ARG(pRA)); WAPI_TRACE(WAPI_ERR, "%s: Can not find Peer Sta "MAC_FMT"!!\n", __func__, MAC_ARG(pRA));
ret = -6; ret = -6;
} }
} }
WAPI_DATA(WAPI_TX, "FillIV - After Fill IV", pskb->data, pskb->len); WAPI_DATA(WAPI_TX, "FillIV - After Fill IV", pskb->data, pskb->len);
WAPI_TRACE(WAPI_TX, "<=========%s\n", __FUNCTION__); WAPI_TRACE(WAPI_TX, "<=========%s\n", __func__);
return ret; return ret;
#endif #endif
} }
@ -585,7 +585,7 @@ void SecSWSMS4Encryption(
u8 IVOffset, DataOffset, bFindMatchPeer = false, KeyIdx = 0, MicBuffer[16]; u8 IVOffset, DataOffset, bFindMatchPeer = false, KeyIdx = 0, MicBuffer[16];
u16 OutputLength; u16 OutputLength;
WAPI_TRACE(WAPI_TX, "=========>%s\n", __FUNCTION__); WAPI_TRACE(WAPI_TX, "=========>%s\n", __func__);
WAPI_TRACE(WAPI_TX, "hdrlen: %d\n", pattrib->hdrlen); WAPI_TRACE(WAPI_TX, "hdrlen: %d\n", pattrib->hdrlen);
@ -613,23 +613,23 @@ void SecSWSMS4Encryption(
if (bFindMatchPeer) { if (bFindMatchPeer) {
if (pWapiSta->wapiUskUpdate.bTxEnable) { if (pWapiSta->wapiUskUpdate.bTxEnable) {
KeyIdx = pWapiSta->wapiUskUpdate.keyId; KeyIdx = pWapiSta->wapiUskUpdate.keyId;
WAPI_TRACE(WAPI_TX, "%s(): Use update USK!! KeyIdx=%d\n", __FUNCTION__, KeyIdx); WAPI_TRACE(WAPI_TX, "%s(): Use update USK!! KeyIdx=%d\n", __func__, KeyIdx);
pIV = pWapiSta->lastTxUnicastPN; pIV = pWapiSta->lastTxUnicastPN;
pMicKey = pWapiSta->wapiUskUpdate.micKey; pMicKey = pWapiSta->wapiUskUpdate.micKey;
pDataKey = pWapiSta->wapiUskUpdate.dataKey; pDataKey = pWapiSta->wapiUskUpdate.dataKey;
} else { } else {
KeyIdx = pWapiSta->wapiUsk.keyId; KeyIdx = pWapiSta->wapiUsk.keyId;
WAPI_TRACE(WAPI_TX, "%s(): Use USK!! KeyIdx=%d\n", __FUNCTION__, KeyIdx); WAPI_TRACE(WAPI_TX, "%s(): Use USK!! KeyIdx=%d\n", __func__, KeyIdx);
pIV = pWapiSta->lastTxUnicastPN; pIV = pWapiSta->lastTxUnicastPN;
pMicKey = pWapiSta->wapiUsk.micKey; pMicKey = pWapiSta->wapiUsk.micKey;
pDataKey = pWapiSta->wapiUsk.dataKey; pDataKey = pWapiSta->wapiUsk.dataKey;
} }
} else { } else {
WAPI_TRACE(WAPI_ERR, "%s: Can not find Peer Sta!!\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s: Can not find Peer Sta!!\n", __func__);
return; return;
} }
} else { } else {
WAPI_TRACE(WAPI_ERR, "%s: wapiSTAUsedList is empty!!\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s: wapiSTAUsedList is empty!!\n", __func__);
return; return;
} }
} }
@ -649,7 +649,7 @@ void SecSWSMS4Encryption(
WAPI_DATA(WAPI_TX, "Encryption - After SMS4 encryption", pframe, pattrib->hdrlen + pattrib->iv_len + pattrib->pktlen); WAPI_DATA(WAPI_TX, "Encryption - After SMS4 encryption", pframe, pattrib->hdrlen + pattrib->iv_len + pattrib->pktlen);
WAPI_TRACE(WAPI_TX, "<=========%s\n", __FUNCTION__); WAPI_TRACE(WAPI_TX, "<=========%s\n", __func__);
} }
u8 SecSWSMS4Decryption( u8 SecSWSMS4Decryption(
@ -669,14 +669,14 @@ u8 SecSWSMS4Decryption(
u8 bQosData; u8 bQosData;
struct sk_buff *pskb; struct sk_buff *pskb;
WAPI_TRACE(WAPI_RX, "=========>%s\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "=========>%s\n", __func__);
return 0; return 0;
precv_hdr = &((union recv_frame *)precv_frame)->u.hdr; precv_hdr = &((union recv_frame *)precv_frame)->u.hdr;
pskb = (struct sk_buff *)(precv_hdr->rx_data); pskb = (struct sk_buff *)(precv_hdr->rx_data);
precv_hdr->bWapiCheckPNInDecrypt = WapiCheckPnInSwDecrypt(padapter, pskb); precv_hdr->bWapiCheckPNInDecrypt = WapiCheckPnInSwDecrypt(padapter, pskb);
WAPI_TRACE(WAPI_RX, "=========>%s: check PN %d\n", __FUNCTION__, precv_hdr->bWapiCheckPNInDecrypt); WAPI_TRACE(WAPI_RX, "=========>%s: check PN %d\n", __func__, precv_hdr->bWapiCheckPNInDecrypt);
WAPI_DATA(WAPI_RX, "Decryption - Before decryption", pskb->data, pskb->len); WAPI_DATA(WAPI_RX, "Decryption - Before decryption", pskb->data, pskb->len);
IVOffset = sMacHdrLng; IVOffset = sMacHdrLng;
@ -710,16 +710,16 @@ u8 SecSWSMS4Decryption(
} }
if (!bFindMatchPeer) { if (!bFindMatchPeer) {
WAPI_TRACE(WAPI_ERR, "%s: Can not find Peer Sta "MAC_FMT" for Key Info!!!\n", __FUNCTION__, MAC_ARG(pTA)); WAPI_TRACE(WAPI_ERR, "%s: Can not find Peer Sta "MAC_FMT" for Key Info!!!\n", __func__, MAC_ARG(pTA));
return false; return false;
} }
if (IS_MCAST(pRA)) { if (IS_MCAST(pRA)) {
WAPI_TRACE(WAPI_RX, "%s: Multicast decryption !!!\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "%s: Multicast decryption !!!\n", __func__);
if (pWapiSta->wapiMsk.keyId == KeyIdx && pWapiSta->wapiMsk.bSet) { if (pWapiSta->wapiMsk.keyId == KeyIdx && pWapiSta->wapiMsk.bSet) {
pLastRxPN = pWapiSta->lastRxMulticastPN; pLastRxPN = pWapiSta->lastRxMulticastPN;
if (!WapiComparePN(pRecvPN, pLastRxPN)) { if (!WapiComparePN(pRecvPN, pLastRxPN)) {
WAPI_TRACE(WAPI_ERR, "%s: MSK PN is not larger than last, Dropped!!!\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s: MSK PN is not larger than last, Dropped!!!\n", __func__);
WAPI_DATA(WAPI_ERR, "pRecvPN:", pRecvPN, 16); WAPI_DATA(WAPI_ERR, "pRecvPN:", pRecvPN, 16);
WAPI_DATA(WAPI_ERR, "pLastRxPN:", pLastRxPN, 16); WAPI_DATA(WAPI_ERR, "pLastRxPN:", pLastRxPN, 16);
return false; return false;
@ -729,19 +729,19 @@ u8 SecSWSMS4Decryption(
pMicKey = pWapiSta->wapiMsk.micKey; pMicKey = pWapiSta->wapiMsk.micKey;
pDataKey = pWapiSta->wapiMsk.dataKey; pDataKey = pWapiSta->wapiMsk.dataKey;
} else if (pWapiSta->wapiMskUpdate.keyId == KeyIdx && pWapiSta->wapiMskUpdate.bSet) { } else if (pWapiSta->wapiMskUpdate.keyId == KeyIdx && pWapiSta->wapiMskUpdate.bSet) {
WAPI_TRACE(WAPI_RX, "%s: Use Updated MSK for Decryption !!!\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "%s: Use Updated MSK for Decryption !!!\n", __func__);
bUseUpdatedKey = true; bUseUpdatedKey = true;
memcpy(pWapiSta->lastRxMulticastPN, pRecvPN, 16); memcpy(pWapiSta->lastRxMulticastPN, pRecvPN, 16);
pMicKey = pWapiSta->wapiMskUpdate.micKey; pMicKey = pWapiSta->wapiMskUpdate.micKey;
pDataKey = pWapiSta->wapiMskUpdate.dataKey; pDataKey = pWapiSta->wapiMskUpdate.dataKey;
} else { } else {
WAPI_TRACE(WAPI_ERR, "%s: Can not find MSK with matched KeyIdx(%d), Dropped !!!\n", __FUNCTION__, KeyIdx); WAPI_TRACE(WAPI_ERR, "%s: Can not find MSK with matched KeyIdx(%d), Dropped !!!\n", __func__, KeyIdx);
return false; return false;
} }
} else { } else {
WAPI_TRACE(WAPI_RX, "%s: Unicast decryption !!!\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "%s: Unicast decryption !!!\n", __func__);
if (pWapiSta->wapiUsk.keyId == KeyIdx && pWapiSta->wapiUsk.bSet) { if (pWapiSta->wapiUsk.keyId == KeyIdx && pWapiSta->wapiUsk.bSet) {
WAPI_TRACE(WAPI_RX, "%s: Use USK for Decryption!!!\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "%s: Use USK for Decryption!!!\n", __func__);
if (precv_hdr->bWapiCheckPNInDecrypt) { if (precv_hdr->bWapiCheckPNInDecrypt) {
if (GetFrameType(pskb->data) == WIFI_QOS_DATA_TYPE) { if (GetFrameType(pskb->data) == WIFI_QOS_DATA_TYPE) {
WapiGetLastRxUnicastPNForQoSData(TID, pWapiSta, lastRxPNforQoS); WapiGetLastRxUnicastPNForQoSData(TID, pWapiSta, lastRxPNforQoS);
@ -759,7 +759,7 @@ u8 SecSWSMS4Decryption(
if (check_fwstate(&padapter->mlmepriv, WIFI_STATION_STATE)) { if (check_fwstate(&padapter->mlmepriv, WIFI_STATION_STATE)) {
if ((pRecvPN[0] & 0x1) == 0) { if ((pRecvPN[0] & 0x1) == 0) {
WAPI_TRACE(WAPI_ERR, "%s: Rx USK PN is not odd when Infra STA mode, Dropped !!!\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s: Rx USK PN is not odd when Infra STA mode, Dropped !!!\n", __func__);
return false; return false;
} }
} }
@ -767,7 +767,7 @@ u8 SecSWSMS4Decryption(
pMicKey = pWapiSta->wapiUsk.micKey; pMicKey = pWapiSta->wapiUsk.micKey;
pDataKey = pWapiSta->wapiUsk.dataKey; pDataKey = pWapiSta->wapiUsk.dataKey;
} else if (pWapiSta->wapiUskUpdate.keyId == KeyIdx && pWapiSta->wapiUskUpdate.bSet) { } else if (pWapiSta->wapiUskUpdate.keyId == KeyIdx && pWapiSta->wapiUskUpdate.bSet) {
WAPI_TRACE(WAPI_RX, "%s: Use Updated USK for Decryption!!!\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "%s: Use Updated USK for Decryption!!!\n", __func__);
if (pWapiSta->bAuthenticatorInUpdata) if (pWapiSta->bAuthenticatorInUpdata)
bUseUpdatedKey = true; bUseUpdatedKey = true;
else else
@ -780,7 +780,7 @@ u8 SecSWSMS4Decryption(
pMicKey = pWapiSta->wapiUskUpdate.micKey; pMicKey = pWapiSta->wapiUskUpdate.micKey;
pDataKey = pWapiSta->wapiUskUpdate.dataKey; pDataKey = pWapiSta->wapiUskUpdate.dataKey;
} else { } else {
WAPI_TRACE(WAPI_ERR, "%s: No valid USK!!!KeyIdx=%d pWapiSta->wapiUsk.keyId=%d pWapiSta->wapiUskUpdate.keyId=%d\n", __FUNCTION__, KeyIdx, pWapiSta->wapiUsk.keyId, WAPI_TRACE(WAPI_ERR, "%s: No valid USK!!!KeyIdx=%d pWapiSta->wapiUsk.keyId=%d pWapiSta->wapiUskUpdate.keyId=%d\n", __func__, KeyIdx, pWapiSta->wapiUsk.keyId,
pWapiSta->wapiUskUpdate.keyId); pWapiSta->wapiUskUpdate.keyId);
/* dump_buf(pskb->data,pskb->len); */ /* dump_buf(pskb->data,pskb->len); */
return false; return false;
@ -792,7 +792,7 @@ u8 SecSWSMS4Decryption(
WapiSMS4Decryption(pDataKey, pRecvPN, pSecData, DataLen, pSecData, &OutputLength); WapiSMS4Decryption(pDataKey, pRecvPN, pSecData, DataLen, pSecData, &OutputLength);
if (OutputLength != DataLen) if (OutputLength != DataLen)
WAPI_TRACE(WAPI_ERR, "%s: Output Length Error!!!!\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s: Output Length Error!!!!\n", __func__);
WAPI_DATA(WAPI_RX, "Decryption - After decryption", pskb->data, pskb->len); WAPI_DATA(WAPI_RX, "Decryption - After decryption", pskb->data, pskb->len);
@ -804,17 +804,17 @@ u8 SecSWSMS4Decryption(
WAPI_DATA(WAPI_RX, "Decryption - MIC calculated", MicBuffer, SMS4_MIC_LEN); WAPI_DATA(WAPI_RX, "Decryption - MIC calculated", MicBuffer, SMS4_MIC_LEN);
if (0 == memcmp(MicBuffer, pRecvMic, padapter->wapiInfo.extra_postfix_len)) { if (0 == memcmp(MicBuffer, pRecvMic, padapter->wapiInfo.extra_postfix_len)) {
WAPI_TRACE(WAPI_RX, "%s: Check MIC OK!!\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "%s: Check MIC OK!!\n", __func__);
if (bUseUpdatedKey) { if (bUseUpdatedKey) {
/* delete the old key */ /* delete the old key */
if (IS_MCAST(pRA)) { if (IS_MCAST(pRA)) {
WAPI_TRACE(WAPI_API, "%s(): AE use new update MSK!!\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "%s(): AE use new update MSK!!\n", __func__);
pWapiSta->wapiMsk.keyId = pWapiSta->wapiMskUpdate.keyId; pWapiSta->wapiMsk.keyId = pWapiSta->wapiMskUpdate.keyId;
memcpy(pWapiSta->wapiMsk.dataKey, pWapiSta->wapiMskUpdate.dataKey, 16); memcpy(pWapiSta->wapiMsk.dataKey, pWapiSta->wapiMskUpdate.dataKey, 16);
memcpy(pWapiSta->wapiMsk.micKey, pWapiSta->wapiMskUpdate.micKey, 16); memcpy(pWapiSta->wapiMsk.micKey, pWapiSta->wapiMskUpdate.micKey, 16);
pWapiSta->wapiMskUpdate.bTxEnable = pWapiSta->wapiMskUpdate.bSet = false; pWapiSta->wapiMskUpdate.bTxEnable = pWapiSta->wapiMskUpdate.bSet = false;
} else { } else {
WAPI_TRACE(WAPI_API, "%s(): AE use new update USK!!\n", __FUNCTION__); WAPI_TRACE(WAPI_API, "%s(): AE use new update USK!!\n", __func__);
pWapiSta->wapiUsk.keyId = pWapiSta->wapiUskUpdate.keyId; pWapiSta->wapiUsk.keyId = pWapiSta->wapiUskUpdate.keyId;
memcpy(pWapiSta->wapiUsk.dataKey, pWapiSta->wapiUskUpdate.dataKey, 16); memcpy(pWapiSta->wapiUsk.dataKey, pWapiSta->wapiUskUpdate.dataKey, 16);
memcpy(pWapiSta->wapiUsk.micKey, pWapiSta->wapiUskUpdate.micKey, 16); memcpy(pWapiSta->wapiUsk.micKey, pWapiSta->wapiUskUpdate.micKey, 16);
@ -822,7 +822,7 @@ u8 SecSWSMS4Decryption(
} }
} }
} else { } else {
WAPI_TRACE(WAPI_ERR, "%s: Check MIC Error, Dropped !!!!\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s: Check MIC Error, Dropped !!!!\n", __func__);
return false; return false;
} }
@ -830,7 +830,7 @@ u8 SecSWSMS4Decryption(
memmove(pos + padapter->wapiInfo.extra_prefix_len, pos, IVOffset); memmove(pos + padapter->wapiInfo.extra_prefix_len, pos, IVOffset);
skb_pull(pskb, padapter->wapiInfo.extra_prefix_len); skb_pull(pskb, padapter->wapiInfo.extra_prefix_len);
WAPI_TRACE(WAPI_RX, "<=========%s\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "<=========%s\n", __func__);
return true; return true;
} }
@ -841,10 +841,10 @@ u32 rtw_sms4_encrypt(_adapter *padapter, u8 *pxmitframe)
u8 *pframe; u8 *pframe;
u32 res = _SUCCESS; u32 res = _SUCCESS;
WAPI_TRACE(WAPI_TX, "=========>%s\n", __FUNCTION__); WAPI_TRACE(WAPI_TX, "=========>%s\n", __func__);
if ((!padapter->WapiSupport) || (!padapter->wapiInfo.bWapiEnable)) { if ((!padapter->WapiSupport) || (!padapter->wapiInfo.bWapiEnable)) {
WAPI_TRACE(WAPI_TX, "<========== %s, WAPI not supported or enabled!\n", __FUNCTION__); WAPI_TRACE(WAPI_TX, "<========== %s, WAPI not supported or enabled!\n", __func__);
return _FAIL; return _FAIL;
} }
@ -855,7 +855,7 @@ u32 rtw_sms4_encrypt(_adapter *padapter, u8 *pxmitframe)
SecSWSMS4Encryption(padapter, pxmitframe); SecSWSMS4Encryption(padapter, pxmitframe);
WAPI_TRACE(WAPI_TX, "<=========%s\n", __FUNCTION__); WAPI_TRACE(WAPI_TX, "<=========%s\n", __func__);
return res; return res;
} }
@ -864,10 +864,10 @@ u32 rtw_sms4_decrypt(_adapter *padapter, u8 *precvframe)
u8 *pframe; u8 *pframe;
u32 res = _SUCCESS; u32 res = _SUCCESS;
WAPI_TRACE(WAPI_RX, "=========>%s\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "=========>%s\n", __func__);
if ((!padapter->WapiSupport) || (!padapter->wapiInfo.bWapiEnable)) { if ((!padapter->WapiSupport) || (!padapter->wapiInfo.bWapiEnable)) {
WAPI_TRACE(WAPI_RX, "<========== %s, WAPI not supported or enabled!\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "<========== %s, WAPI not supported or enabled!\n", __func__);
return _FAIL; return _FAIL;
} }
@ -879,11 +879,11 @@ u32 rtw_sms4_decrypt(_adapter *padapter, u8 *precvframe)
/* pframe=(unsigned char *)((union recv_frame*)precvframe)->u.hdr.rx_data; */ /* pframe=(unsigned char *)((union recv_frame*)precvframe)->u.hdr.rx_data; */
if (false == SecSWSMS4Decryption(padapter, precvframe, &padapter->recvpriv)) { if (false == SecSWSMS4Decryption(padapter, precvframe, &padapter->recvpriv)) {
WAPI_TRACE(WAPI_ERR, "%s():SMS4 decrypt frame error\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s():SMS4 decrypt frame error\n", __func__);
return _FAIL; return _FAIL;
} }
WAPI_TRACE(WAPI_RX, "<=========%s\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "<=========%s\n", __func__);
return res; return res;
} }
@ -891,15 +891,15 @@ u32 rtw_sms4_decrypt(_adapter *padapter, u8 *precvframe)
u32 rtw_sms4_encrypt(_adapter *padapter, u8 *pxmitframe) u32 rtw_sms4_encrypt(_adapter *padapter, u8 *pxmitframe)
{ {
WAPI_TRACE(WAPI_TX, "=========>Dummy %s\n", __FUNCTION__); WAPI_TRACE(WAPI_TX, "=========>Dummy %s\n", __func__);
WAPI_TRACE(WAPI_TX, "<=========Dummy %s\n", __FUNCTION__); WAPI_TRACE(WAPI_TX, "<=========Dummy %s\n", __func__);
return _SUCCESS; return _SUCCESS;
} }
u32 rtw_sms4_decrypt(_adapter *padapter, u8 *precvframe) u32 rtw_sms4_decrypt(_adapter *padapter, u8 *precvframe)
{ {
WAPI_TRACE(WAPI_RX, "=========>Dummy %s\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "=========>Dummy %s\n", __func__);
WAPI_TRACE(WAPI_RX, "<=========Dummy %s\n", __FUNCTION__); WAPI_TRACE(WAPI_RX, "<=========Dummy %s\n", __func__);
return _SUCCESS; return _SUCCESS;
} }

6
core/rtw_wlan_util.c
View file

@ -715,7 +715,7 @@ void set_channel_bwmode(_adapter *padapter, unsigned char channel, unsigned char
#endif #endif
if (padapter->bNotifyChannelChange) if (padapter->bNotifyChannelChange)
RTW_INFO("[%s] ch = %d, offset = %d, bwmode = %d\n", __FUNCTION__, channel, channel_offset, bwmode); RTW_INFO("[%s] ch = %d, offset = %d, bwmode = %d\n", __func__, channel, channel_offset, bwmode);
center_ch = rtw_get_center_ch(channel, bwmode, channel_offset); center_ch = rtw_get_center_ch(channel, bwmode, channel_offset);
@ -2103,7 +2103,7 @@ void HTOnAssocRsp(_adapter *padapter)
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable)) if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable))
pmlmeinfo->HT_enable = 1; pmlmeinfo->HT_enable = 1;
@ -2162,7 +2162,7 @@ void HTOnAssocRsp(_adapter *padapter)
for (i = 0; i < 16; i++) for (i = 0; i < 16; i++)
pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i];
#endif #endif
RTW_INFO("%s(): WLAN_HT_CAP_SM_PS_STATIC\n", __FUNCTION__); RTW_INFO("%s(): WLAN_HT_CAP_SM_PS_STATIC\n", __func__);
} }
/* */ /* */

26
core/rtw_xmit.c
View file

@ -932,7 +932,7 @@ static s32 update_attrib_sec_info(_adapter *padapter, struct pkt_attrib *pattrib
if ((pattrib->ether_type != 0x888e) && (check_fwstate(pmlmepriv, WIFI_MP_STATE) == _FALSE)) { if ((pattrib->ether_type != 0x888e) && (check_fwstate(pmlmepriv, WIFI_MP_STATE) == _FALSE)) {
#ifdef DBG_TX_DROP_FRAME #ifdef DBG_TX_DROP_FRAME
RTW_INFO("DBG_TX_DROP_FRAME %s psta->ieee8021x_blocked == _TRUE, pattrib->ether_type(%04x) != 0x888e\n", __FUNCTION__, pattrib->ether_type); RTW_INFO("DBG_TX_DROP_FRAME %s psta->ieee8021x_blocked == _TRUE, pattrib->ether_type(%04x) != 0x888e\n", __func__, pattrib->ether_type);
#endif #endif
res = _FAIL; res = _FAIL;
goto exit; goto exit;
@ -989,7 +989,7 @@ static s32 update_attrib_sec_info(_adapter *padapter, struct pkt_attrib *pattrib
if (psecuritypriv->busetkipkey == _FAIL) { if (psecuritypriv->busetkipkey == _FAIL) {
#ifdef DBG_TX_DROP_FRAME #ifdef DBG_TX_DROP_FRAME
RTW_INFO("DBG_TX_DROP_FRAME %s psecuritypriv->busetkipkey(%d)==_FAIL drop packet\n", __FUNCTION__, psecuritypriv->busetkipkey); RTW_INFO("DBG_TX_DROP_FRAME %s psecuritypriv->busetkipkey(%d)==_FAIL drop packet\n", __func__, psecuritypriv->busetkipkey);
#endif #endif
res = _FAIL; res = _FAIL;
goto exit; goto exit;
@ -1375,7 +1375,7 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr
update_attrib_phy_info(padapter, pattrib, psta); update_attrib_phy_info(padapter, pattrib, psta);
/* RTW_INFO("%s ==> mac_id(%d)\n",__FUNCTION__,pattrib->mac_id ); */ /* RTW_INFO("%s ==> mac_id(%d)\n",__func__,pattrib->mac_id ); */
pattrib->psta = psta; pattrib->psta = psta;
/* TODO:_unlock */ /* TODO:_unlock */
@ -2173,7 +2173,7 @@ s32 rtw_xmitframe_coalesce_amsdu(_adapter *padapter, struct xmit_frame *pxmitfra
s32 res = _SUCCESS; s32 res = _SUCCESS;
if (pxmitframe->buf_addr == NULL) { if (pxmitframe->buf_addr == NULL) {
RTW_INFO("==> %s buf_addr==NULL\n", __FUNCTION__); RTW_INFO("==> %s buf_addr==NULL\n", __func__);
return _FAIL; return _FAIL;
} }
@ -2376,7 +2376,7 @@ s32 rtw_xmitframe_coalesce(_adapter *padapter, _pkt *pkt, struct xmit_frame *pxm
} }
*/ */
if (pxmitframe->buf_addr == NULL) { if (pxmitframe->buf_addr == NULL) {
RTW_INFO("==> %s buf_addr==NULL\n", __FUNCTION__); RTW_INFO("==> %s buf_addr==NULL\n", __func__);
return _FAIL; return _FAIL;
} }
@ -2830,13 +2830,13 @@ struct xmit_frame *__rtw_alloc_cmdxmitframe(struct xmit_priv *pxmitpriv,
pcmdframe = rtw_alloc_xmitframe(pxmitpriv); pcmdframe = rtw_alloc_xmitframe(pxmitpriv);
if (pcmdframe == NULL) { if (pcmdframe == NULL) {
RTW_INFO("%s, alloc xmitframe fail\n", __FUNCTION__); RTW_INFO("%s, alloc xmitframe fail\n", __func__);
return NULL; return NULL;
} }
pxmitbuf = __rtw_alloc_cmd_xmitbuf(pxmitpriv, buf_type); pxmitbuf = __rtw_alloc_cmd_xmitbuf(pxmitpriv, buf_type);
if (pxmitbuf == NULL) { if (pxmitbuf == NULL) {
RTW_INFO("%s, alloc xmitbuf fail\n", __FUNCTION__); RTW_INFO("%s, alloc xmitbuf fail\n", __func__);
rtw_free_xmitframe(pxmitpriv, pcmdframe); rtw_free_xmitframe(pxmitpriv, pcmdframe);
return NULL; return NULL;
} }
@ -3720,7 +3720,7 @@ static int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb)
} }
if (skb_is_nonlinear(skb)) if (skb_is_nonlinear(skb))
DEBUG_ERR("%s(): skb_is_nonlinear!!\n", __FUNCTION__); DEBUG_ERR("%s(): skb_is_nonlinear!!\n", __func__);
#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)) #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18))
res = skb_linearize(skb, GFP_ATOMIC); res = skb_linearize(skb, GFP_ATOMIC);
@ -3743,7 +3743,7 @@ static int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb)
} }
/* we just print warning message and let it go */ /* we just print warning message and let it go */
/* DEBUG_WARN("%s()-%d: nat25_db_handle INSERT Warning!\n", __FUNCTION__, __LINE__); */ /* DEBUG_WARN("%s()-%d: nat25_db_handle INSERT Warning!\n", __func__, __LINE__); */
/* return -1; */ /* return -1 will cause system crash on 2011/08/30! */ /* return -1; */ /* return -1 will cause system crash on 2011/08/30! */
return 0; return 0;
} }
@ -4023,7 +4023,7 @@ s32 rtw_xmit(_adapter *padapter, _pkt **ppkt)
if (rtw_get_passing_time_ms(start) > 2000) { if (rtw_get_passing_time_ms(start) > 2000) {
if (drop_cnt) if (drop_cnt)
RTW_INFO("DBG_TX_DROP_FRAME %s no more pxmitframe, drop_cnt:%u\n", __FUNCTION__, drop_cnt); RTW_INFO("DBG_TX_DROP_FRAME %s no more pxmitframe, drop_cnt:%u\n", __func__, drop_cnt);
start = rtw_get_current_time(); start = rtw_get_current_time();
drop_cnt = 0; drop_cnt = 0;
} }
@ -4074,7 +4074,7 @@ s32 rtw_xmit(_adapter *padapter, _pkt **ppkt)
if (res == _FAIL) { if (res == _FAIL) {
/*RTW_INFO("%s-"ADPT_FMT" update attrib fail\n", __func__, ADPT_ARG(padapter));*/ /*RTW_INFO("%s-"ADPT_FMT" update attrib fail\n", __func__, ADPT_ARG(padapter));*/
#ifdef DBG_TX_DROP_FRAME #ifdef DBG_TX_DROP_FRAME
RTW_INFO("DBG_TX_DROP_FRAME %s update attrib fail\n", __FUNCTION__); RTW_INFO("DBG_TX_DROP_FRAME %s update attrib fail\n", __func__);
#endif #endif
rtw_free_xmitframe(pxmitpriv, pxmitframe); rtw_free_xmitframe(pxmitpriv, pxmitframe);
return -1; return -1;
@ -4829,7 +4829,7 @@ static struct xmit_buf *dequeue_pending_xmitbuf_under_survey(
if (pxmitframe) if (pxmitframe)
type = get_frame_sub_type(pxmitbuf->pbuf + TXDESC_SIZE + pxmitframe->pkt_offset * PACKET_OFFSET_SZ); type = get_frame_sub_type(pxmitbuf->pbuf + TXDESC_SIZE + pxmitframe->pkt_offset * PACKET_OFFSET_SZ);
else else
RTW_INFO("%s, !!!ERROR!!! For USB, TODO ITEM\n", __FUNCTION__); RTW_INFO("%s, !!!ERROR!!! For USB, TODO ITEM\n", __func__);
#else #else
type = get_frame_sub_type(pxmitbuf->pbuf + TXDESC_OFFSET); type = get_frame_sub_type(pxmitbuf->pbuf + TXDESC_OFFSET);
#endif #endif
@ -5013,7 +5013,7 @@ void rtw_amsdu_be_timeout_handler(void *FunctionContext)
adapter->xmitpriv.amsdu_be_timeout = RTW_AMSDU_TIMER_TIMEOUT; adapter->xmitpriv.amsdu_be_timeout = RTW_AMSDU_TIMER_TIMEOUT;
if (printk_ratelimit()) if (printk_ratelimit())
RTW_INFO("%s Timeout!\n",__FUNCTION__); RTW_INFO("%s Timeout!\n",__func__);
tasklet_hi_schedule(&adapter->xmitpriv.xmit_tasklet); tasklet_hi_schedule(&adapter->xmitpriv.xmit_tasklet);
} }

16
hal/hal_btcoex.c
View file

@ -615,18 +615,18 @@ static u8 _btmpoper_cmd(PBTC_COEXIST pBtCoexist, u8 opcode, u8 opcodever, u8 *cm
/* GLBtcBtMpRptWait should be 0 here*/ /* GLBtcBtMpRptWait should be 0 here*/
if (!GLBtcBtMpRptWiFiOK) { if (!GLBtcBtMpRptWiFiOK) {
RTW_ERR("%s: Didn't get H2C Rsp Event!\n", __FUNCTION__); RTW_ERR("%s: Didn't get H2C Rsp Event!\n", __func__);
ret = BT_STATUS_H2C_TIMTOUT; ret = BT_STATUS_H2C_TIMTOUT;
goto exit; goto exit;
} }
if (!GLBtcBtMpRptBTOK) { if (!GLBtcBtMpRptBTOK) {
RTW_ERR("%s: Didn't get BT response!\n", __FUNCTION__); RTW_ERR("%s: Didn't get BT response!\n", __func__);
ret = BT_STATUS_H2C_BT_NO_RSP; ret = BT_STATUS_H2C_BT_NO_RSP;
goto exit; goto exit;
} }
if (seq != GLBtcBtMpRptSeq) { if (seq != GLBtcBtMpRptSeq) {
RTW_ERR("%s: Sequence number not match!(%d!=%d)!\n", RTW_ERR("%s: Sequence number not match!(%d!=%d)!\n",
__FUNCTION__, seq, GLBtcBtMpRptSeq); __func__, seq, GLBtcBtMpRptSeq);
ret = BT_STATUS_C2H_REQNUM_MISMATCH; ret = BT_STATUS_C2H_REQNUM_MISMATCH;
goto exit; goto exit;
} }
@ -635,23 +635,23 @@ static u8 _btmpoper_cmd(PBTC_COEXIST pBtCoexist, u8 opcode, u8 opcodever, u8 *cm
/* Examine the status reported from C2H */ /* Examine the status reported from C2H */
case BT_STATUS_OK: case BT_STATUS_OK:
ret = BT_STATUS_BT_OP_SUCCESS; ret = BT_STATUS_BT_OP_SUCCESS;
RTW_DBG("%s: C2H status = BT_STATUS_BT_OP_SUCCESS\n", __FUNCTION__); RTW_DBG("%s: C2H status = BT_STATUS_BT_OP_SUCCESS\n", __func__);
break; break;
case BT_STATUS_VERSION_MISMATCH: case BT_STATUS_VERSION_MISMATCH:
ret = BT_STATUS_OPCODE_L_VERSION_MISMATCH; ret = BT_STATUS_OPCODE_L_VERSION_MISMATCH;
RTW_DBG("%s: C2H status = BT_STATUS_OPCODE_L_VERSION_MISMATCH\n", __FUNCTION__); RTW_DBG("%s: C2H status = BT_STATUS_OPCODE_L_VERSION_MISMATCH\n", __func__);
break; break;
case BT_STATUS_UNKNOWN_OPCODE: case BT_STATUS_UNKNOWN_OPCODE:
ret = BT_STATUS_UNKNOWN_OPCODE_L; ret = BT_STATUS_UNKNOWN_OPCODE_L;
RTW_DBG("%s: C2H status = MP_BT_STATUS_UNKNOWN_OPCODE_L\n", __FUNCTION__); RTW_DBG("%s: C2H status = MP_BT_STATUS_UNKNOWN_OPCODE_L\n", __func__);
break; break;
case BT_STATUS_ERROR_PARAMETER: case BT_STATUS_ERROR_PARAMETER:
ret = BT_STATUS_PARAMETER_FORMAT_ERROR_L; ret = BT_STATUS_PARAMETER_FORMAT_ERROR_L;
RTW_DBG("%s: C2H status = MP_BT_STATUS_PARAMETER_FORMAT_ERROR_L\n", __FUNCTION__); RTW_DBG("%s: C2H status = MP_BT_STATUS_PARAMETER_FORMAT_ERROR_L\n", __func__);
break; break;
default: default:
ret = BT_STATUS_UNKNOWN_STATUS_L; ret = BT_STATUS_UNKNOWN_STATUS_L;
RTW_DBG("%s: C2H status = MP_BT_STATUS_UNKNOWN_STATUS_L\n", __FUNCTION__); RTW_DBG("%s: C2H status = MP_BT_STATUS_UNKNOWN_STATUS_L\n", __func__);
break; break;
} }

84
hal/hal_com.c
View file

@ -212,7 +212,7 @@ void rtw_hal_config_rftype(PADAPTER padapter)
pHalData->NumTotalRFPath = 1; pHalData->NumTotalRFPath = 1;
} }
RTW_INFO("%s RF_Type is %d TotalTxPath is %d\n", __FUNCTION__, pHalData->rf_type, pHalData->NumTotalRFPath); RTW_INFO("%s RF_Type is %d TotalTxPath is %d\n", __func__, pHalData->rf_type, pHalData->NumTotalRFPath);
} }
#define EEPROM_CHANNEL_PLAN_BY_HW_MASK 0x80 #define EEPROM_CHANNEL_PLAN_BY_HW_MASK 0x80
@ -3110,7 +3110,7 @@ void rtw_hal_set_output_gpio(_adapter *padapter, u8 index, u8 outputval)
} }
} else { } else {
RTW_INFO("%s: invalid GPIO%d=%d\n", RTW_INFO("%s: invalid GPIO%d=%d\n",
__FUNCTION__, index, outputval); __func__, index, outputval);
} }
} }
#endif #endif
@ -4293,7 +4293,7 @@ static int update_hidden_ssid(u8 *ies, u32 ies_len, u8 hidden_ssid_mode)
ssid_ie = rtw_get_ie(ies, WLAN_EID_SSID, &ssid_len_ori, ies_len); ssid_ie = rtw_get_ie(ies, WLAN_EID_SSID, &ssid_len_ori, ies_len);
/* RTW_INFO("%s hidden_ssid_mode:%u, ssid_ie:%p, ssid_len_ori:%d\n", __FUNCTION__, hidden_ssid_mode, ssid_ie, ssid_len_ori); */ /* RTW_INFO("%s hidden_ssid_mode:%u, ssid_ie:%p, ssid_len_ori:%d\n", __func__, hidden_ssid_mode, ssid_ie, ssid_len_ori); */
if (ssid_ie && ssid_len_ori > 0) { if (ssid_ie && ssid_len_ori > 0) {
switch (hidden_ssid_mode) { switch (hidden_ssid_mode) {
@ -4347,7 +4347,7 @@ static void rtw_hal_construct_P2PBeacon(_adapter *padapter, u8 *pframe, u32 *pLe
u8 *dbgbuf = pframe; u8 *dbgbuf = pframe;
u8 dbgbufLen = 0, index = 0; u8 dbgbufLen = 0, index = 0;
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
/* #if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) */ /* #if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) */
/* _enter_critical_bh(&pmlmepriv->bcn_update_lock, &irqL); /* _enter_critical_bh(&pmlmepriv->bcn_update_lock, &irqL);
* #endif */ /* #if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) */ * #endif */ /* #if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) */
@ -4638,7 +4638,7 @@ static void rtw_hal_construct_P2PProbeRsp(_adapter *padapter, u8 *pframe, u32 *p
u8 *dbgbuf = pframe; u8 *dbgbuf = pframe;
u8 dbgbufLen = 0, index = 0; u8 dbgbufLen = 0, index = 0;
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
mac = adapter_mac_addr(padapter); mac = adapter_mac_addr(padapter);
@ -4964,7 +4964,7 @@ static void rtw_hal_construct_P2PNegoRsp(_adapter *padapter, u8 *pframe, u32 *pL
u8 *dbgbuf = pframe; u8 *dbgbuf = pframe;
u8 dbgbufLen = 0, index = 0; u8 dbgbufLen = 0, index = 0;
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
fctrl = &(pwlanhdr->frame_ctl); fctrl = &(pwlanhdr->frame_ctl);
@ -5378,7 +5378,7 @@ static void rtw_hal_construct_P2PInviteRsp(_adapter *padapter, u8 *pframe, u32 *
u8 dbgbufLen = 0, index = 0; u8 dbgbufLen = 0, index = 0;
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
fctrl = &(pwlanhdr->frame_ctl); fctrl = &(pwlanhdr->frame_ctl);
@ -5634,7 +5634,7 @@ static void rtw_hal_construct_P2PProvisionDisRsp(_adapter *padapter, u8 *pframe,
u8 *dbgbuf = pframe; u8 *dbgbuf = pframe;
u8 dbgbufLen = 0, index = 0; u8 dbgbufLen = 0, index = 0;
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
@ -5799,7 +5799,7 @@ static void rtw_hal_construct_beacon(_adapter *padapter,
u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
/* RTW_INFO("%s\n", __FUNCTION__); */ /* RTW_INFO("%s\n", __func__); */
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
@ -5881,7 +5881,7 @@ _ConstructBeacon:
*pLength = pktlen; *pLength = pktlen;
/* RTW_INFO("%s bcn_sz=%d\n", __FUNCTION__, pktlen); */ /* RTW_INFO("%s bcn_sz=%d\n", __func__, pktlen); */
} }
@ -5894,7 +5894,7 @@ static void rtw_hal_construct_PSPoll(_adapter *padapter,
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
/* RTW_INFO("%s\n", __FUNCTION__); */ /* RTW_INFO("%s\n", __func__); */
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
@ -5935,7 +5935,7 @@ void rtw_hal_construct_NullFunctionData(
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
/* RTW_INFO("%s:%d\n", __FUNCTION__, bForcePowerSave); */ /* RTW_INFO("%s:%d\n", __func__, bForcePowerSave); */
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
@ -5997,7 +5997,7 @@ static void rtw_hal_construct_ProbeRsp(_adapter *padapter, u8 *pframe, u32 *pLen
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network);
/*RTW_INFO("%s\n", __FUNCTION__);*/ /*RTW_INFO("%s\n", __func__);*/
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
@ -6097,7 +6097,7 @@ static void rtw_hal_construct_ARPRsp(
/* for TKIP Cal MIC */ /* for TKIP Cal MIC */
u8 *payload = pframe; u8 *payload = pframe;
u8 EncryptionHeadOverhead = 0, arp_offset = 0; u8 EncryptionHeadOverhead = 0, arp_offset = 0;
/* RTW_INFO("%s:%d\n", __FUNCTION__, bForcePowerSave); */ /* RTW_INFO("%s:%d\n", __func__, bForcePowerSave); */
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
@ -6187,9 +6187,9 @@ static void rtw_hal_construct_ARPRsp(
get_my_bssid(&(pmlmeinfo->network))); get_my_bssid(&(pmlmeinfo->network)));
SET_ARP_PKT_TARGET_IP_ADDR(pARPRspPkt, SET_ARP_PKT_TARGET_IP_ADDR(pARPRspPkt,
pIPAddress); pIPAddress);
RTW_INFO("%s Target Mac Addr:" MAC_FMT "\n", __FUNCTION__, RTW_INFO("%s Target Mac Addr:" MAC_FMT "\n", __func__,
MAC_ARG(get_my_bssid(&(pmlmeinfo->network)))); MAC_ARG(get_my_bssid(&(pmlmeinfo->network))));
RTW_INFO("%s Target IP Addr" IP_FMT "\n", __FUNCTION__, RTW_INFO("%s Target IP Addr" IP_FMT "\n", __func__,
IP_ARG(pIPAddress)); IP_ARG(pIPAddress));
} }
@ -6400,7 +6400,7 @@ static void rtw_hal_construct_GTKRsp(
static u8 GTKbody_a[11] = {0x01, 0x03, 0x00, 0x5F, 0x02, 0x03, 0x12, 0x00, 0x10, 0x42, 0x0B}; static u8 GTKbody_a[11] = {0x01, 0x03, 0x00, 0x5F, 0x02, 0x03, 0x12, 0x00, 0x10, 0x42, 0x0B};
u8 *pGTKRspPkt = pframe; u8 *pGTKRspPkt = pframe;
u8 EncryptionHeadOverhead = 0; u8 EncryptionHeadOverhead = 0;
/* RTW_INFO("%s:%d\n", __FUNCTION__, bForcePowerSave); */ /* RTW_INFO("%s:%d\n", __func__, bForcePowerSave); */
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
@ -6618,7 +6618,7 @@ void rtw_hal_set_wow_fw_rsvd_page(_adapter *adapter, u8 *pframe, u16 index,
} }
RTW_INFO("%s(): HW_VAR_SET_TX_CMD: KEK KCK %p %d\n", RTW_INFO("%s(): HW_VAR_SET_TX_CMD: KEK KCK %p %d\n",
__FUNCTION__, &pframe[index - tx_desc], __func__, &pframe[index - tx_desc],
(tx_desc + RTW_KCK_LEN + RTW_KEK_LEN)); (tx_desc + RTW_KCK_LEN + RTW_KEK_LEN));
#endif #endif
@ -6646,7 +6646,7 @@ void rtw_hal_set_wow_fw_rsvd_page(_adapter *adapter, u8 *pframe, u16 index,
} }
RTW_INFO("%s(): HW_VAR_SET_TX_CMD: GTK RSP %p %d\n", RTW_INFO("%s(): HW_VAR_SET_TX_CMD: GTK RSP %p %d\n",
__FUNCTION__, &pframe[index - tx_desc], __func__, &pframe[index - tx_desc],
(tx_desc + GTKLength)); (tx_desc + GTKLength));
#endif #endif
@ -7819,7 +7819,7 @@ void rtw_hal_set_p2p_wow_fw_rsvd_page(_adapter *adapter, u8 *pframe, u16 index,
#if 0 #if 0
RTW_INFO("%s(): HW_VAR_SET_TX_CMD: PROBE RSP %p %d\n", RTW_INFO("%s(): HW_VAR_SET_TX_CMD: PROBE RSP %p %d\n",
__FUNCTION__, &pframe[index - tx_desc], (P2PBCNLength + tx_desc)); __func__, &pframe[index - tx_desc], (P2PBCNLength + tx_desc));
#endif #endif
CurtPktPageNum = (u8)PageNum(tx_desc + P2PBCNLength, page_size); CurtPktPageNum = (u8)PageNum(tx_desc + P2PBCNLength, page_size);
@ -7836,7 +7836,7 @@ void rtw_hal_set_p2p_wow_fw_rsvd_page(_adapter *adapter, u8 *pframe, u16 index,
P2PProbeRspLength, _FALSE, _FALSE, _FALSE); P2PProbeRspLength, _FALSE, _FALSE, _FALSE);
/* RTW_INFO("%s(): HW_VAR_SET_TX_CMD: PROBE RSP %p %d\n", */ /* RTW_INFO("%s(): HW_VAR_SET_TX_CMD: PROBE RSP %p %d\n", */
/* __FUNCTION__, &pframe[index-tx_desc], (P2PProbeRspLength+tx_desc)); */ /* __func__, &pframe[index-tx_desc], (P2PProbeRspLength+tx_desc)); */
CurtPktPageNum = (u8)PageNum(tx_desc + P2PProbeRspLength, page_size); CurtPktPageNum = (u8)PageNum(tx_desc + P2PProbeRspLength, page_size);
@ -7852,7 +7852,7 @@ void rtw_hal_set_p2p_wow_fw_rsvd_page(_adapter *adapter, u8 *pframe, u16 index,
P2PNegoRspLength, _FALSE, _FALSE, _FALSE); P2PNegoRspLength, _FALSE, _FALSE, _FALSE);
/* RTW_INFO("%s(): HW_VAR_SET_TX_CMD: QOS NULL DATA %p %d\n", */ /* RTW_INFO("%s(): HW_VAR_SET_TX_CMD: QOS NULL DATA %p %d\n", */
/* __FUNCTION__, &pframe[index-tx_desc], (NegoRspLength+tx_desc)); */ /* __func__, &pframe[index-tx_desc], (NegoRspLength+tx_desc)); */
CurtPktPageNum = (u8)PageNum(tx_desc + P2PNegoRspLength, page_size); CurtPktPageNum = (u8)PageNum(tx_desc + P2PNegoRspLength, page_size);
@ -7868,7 +7868,7 @@ void rtw_hal_set_p2p_wow_fw_rsvd_page(_adapter *adapter, u8 *pframe, u16 index,
P2PInviteRspLength, _FALSE, _FALSE, _FALSE); P2PInviteRspLength, _FALSE, _FALSE, _FALSE);
/* RTW_INFO("%s(): HW_VAR_SET_TX_CMD: QOS NULL DATA %p %d\n", */ /* RTW_INFO("%s(): HW_VAR_SET_TX_CMD: QOS NULL DATA %p %d\n", */
/* __FUNCTION__, &pframe[index-tx_desc], (InviteRspLength+tx_desc)); */ /* __func__, &pframe[index-tx_desc], (InviteRspLength+tx_desc)); */
CurtPktPageNum = (u8)PageNum(tx_desc + P2PInviteRspLength, page_size); CurtPktPageNum = (u8)PageNum(tx_desc + P2PInviteRspLength, page_size);
@ -7885,7 +7885,7 @@ void rtw_hal_set_p2p_wow_fw_rsvd_page(_adapter *adapter, u8 *pframe, u16 index,
P2PPDRspLength, _FALSE, _FALSE, _FALSE); P2PPDRspLength, _FALSE, _FALSE, _FALSE);
/* RTW_INFO("%s(): HW_VAR_SET_TX_CMD: QOS NULL DATA %p %d\n", */ /* RTW_INFO("%s(): HW_VAR_SET_TX_CMD: QOS NULL DATA %p %d\n", */
/* __FUNCTION__, &pframe[index-tx_desc], (PDRspLength+tx_desc)); */ /* __func__, &pframe[index-tx_desc], (PDRspLength+tx_desc)); */
CurtPktPageNum = (u8)PageNum(tx_desc + P2PPDRspLength, page_size); CurtPktPageNum = (u8)PageNum(tx_desc + P2PPDRspLength, page_size);
@ -8178,7 +8178,7 @@ void rtw_hal_set_fw_rsvd_page(_adapter *adapter, bool finished)
pcmdframe = rtw_alloc_cmdxmitframe(pxmitpriv); pcmdframe = rtw_alloc_cmdxmitframe(pxmitpriv);
if (pcmdframe == NULL) { if (pcmdframe == NULL) {
RTW_INFO("%s: alloc ReservedPagePacket fail!\n", __FUNCTION__); RTW_INFO("%s: alloc ReservedPagePacket fail!\n", __func__);
return; return;
} }
@ -8352,7 +8352,7 @@ download_page:
if (TotalPacketLen > MaxRsvdPageBufSize) { if (TotalPacketLen > MaxRsvdPageBufSize) {
RTW_ERR("%s(ERROR): rsvd page size is not enough!!TotalPacketLen %d, MaxRsvdPageBufSize %d\n", RTW_ERR("%s(ERROR): rsvd page size is not enough!!TotalPacketLen %d, MaxRsvdPageBufSize %d\n",
__FUNCTION__, TotalPacketLen, MaxRsvdPageBufSize); __func__, TotalPacketLen, MaxRsvdPageBufSize);
rtw_warn_on(1); rtw_warn_on(1);
goto error; goto error;
} else { } else {
@ -8720,7 +8720,7 @@ SetHalDefVar(_adapter *adapter, HAL_DEF_VARIABLE variable, void *value)
hal_data->bDisableTXPowerTraining = *((u8 *)value); hal_data->bDisableTXPowerTraining = *((u8 *)value);
break; break;
default: default:
RTW_PRINT("%s: [WARNING] HAL_DEF_VARIABLE(%d) not defined!\n", __FUNCTION__, variable); RTW_PRINT("%s: [WARNING] HAL_DEF_VARIABLE(%d) not defined!\n", __func__, variable);
bResult = _FAIL; bResult = _FAIL;
break; break;
} }
@ -8827,7 +8827,7 @@ GetHalDefVar(_adapter *adapter, HAL_DEF_VARIABLE variable, void *value)
break; break;
#endif #endif
default: default:
RTW_PRINT("%s: [WARNING] HAL_DEF_VARIABLE(%d) not defined!\n", __FUNCTION__, variable); RTW_PRINT("%s: [WARNING] HAL_DEF_VARIABLE(%d) not defined!\n", __func__, variable);
bResult = _FAIL; bResult = _FAIL;
break; break;
} }
@ -9354,7 +9354,7 @@ void linked_info_dump(_adapter *padapter, u8 benable)
if (padapter->bLinkInfoDump == benable) if (padapter->bLinkInfoDump == benable)
return; return;
RTW_INFO("%s %s\n", __FUNCTION__, (benable) ? "enable" : "disable"); RTW_INFO("%s %s\n", __func__, (benable) ? "enable" : "disable");
if (benable) { if (benable) {
#ifdef CONFIG_LPS #ifdef CONFIG_LPS
@ -9530,7 +9530,7 @@ void rtw_store_phy_info(_adapter *padapter, union recv_frame *prframe)
psample_pkt_rssi->data_rate = pattrib->data_rate; psample_pkt_rssi->data_rate = pattrib->data_rate;
ptr = prframe->u.hdr.rx_data; ptr = prframe->u.hdr.rx_data;
dframe_type = GetFrameType(ptr); dframe_type = GetFrameType(ptr);
/*RTW_INFO("=>%s\n", __FUNCTION__);*/ /*RTW_INFO("=>%s\n", __func__);*/
if (precvpriv->store_law_data_flag) { if (precvpriv->store_law_data_flag) {
@ -9550,10 +9550,10 @@ void rtw_store_phy_info(_adapter *padapter, union recv_frame *prframe)
#ifdef DBG_RX_DFRAME_RAW_DATA #ifdef DBG_RX_DFRAME_RAW_DATA
if ((dframe_type == WIFI_DATA_TYPE) || (dframe_type == WIFI_QOS_DATA_TYPE) || (padapter->registrypriv.mp_mode == 1)) { if ((dframe_type == WIFI_DATA_TYPE) || (dframe_type == WIFI_QOS_DATA_TYPE) || (padapter->registrypriv.mp_mode == 1)) {
/*RTW_INFO("=>%s WIFI_DATA_TYPE or WIFI_QOS_DATA_TYPE\n", __FUNCTION__);*/ /*RTW_INFO("=>%s WIFI_DATA_TYPE or WIFI_QOS_DATA_TYPE\n", __func__);*/
if (psta) { if (psta) {
psta_dframe_info = &psta->sta_dframe_info; psta_dframe_info = &psta->sta_dframe_info;
/*RTW_INFO("=>%s psta->hwaddr="MAC_FMT" !\n", __FUNCTION__, MAC_ARG(psta->hwaddr));*/ /*RTW_INFO("=>%s psta->hwaddr="MAC_FMT" !\n", __func__, MAC_ARG(psta->hwaddr));*/
if ((_rtw_memcmp(psta->hwaddr, bc_addr, ETH_ALEN) != _TRUE) || (padapter->registrypriv.mp_mode == 1)) { if ((_rtw_memcmp(psta->hwaddr, bc_addr, ETH_ALEN) != _TRUE) || (padapter->registrypriv.mp_mode == 1)) {
psta_dframe_info->sta_data_rate = pattrib->data_rate; psta_dframe_info->sta_data_rate = pattrib->data_rate;
psta_dframe_info->sta_sgi = pattrib->sgi; psta_dframe_info->sta_sgi = pattrib->sgi;
@ -10117,7 +10117,7 @@ u8 rtw_hal_get_gpio(_adapter *adapter, u8 gpio_num)
value = (rtw_read8(adapter, gpio_ctrl_reg_to_set) & BIT(gpio_num_to_set)) >> gpio_num; value = (rtw_read8(adapter, gpio_ctrl_reg_to_set) & BIT(gpio_num_to_set)) >> gpio_num;
rtw_ps_deny_cancel(adapter, PS_DENY_IOCTL); rtw_ps_deny_cancel(adapter, PS_DENY_IOCTL);
RTW_INFO("%s direction=%d value=%d\n", __FUNCTION__, direction, value); RTW_INFO("%s direction=%d value=%d\n", __func__, direction, value);
return value; return value;
} }
@ -10151,10 +10151,10 @@ int rtw_hal_set_gpio_output_value(_adapter *adapter, u8 gpio_num, bool isHigh)
else else
rtw_write8(adapter, gpio_ctrl_reg_to_set, rtw_read8(adapter, gpio_ctrl_reg_to_set) & ~BIT(gpio_num_to_set)); rtw_write8(adapter, gpio_ctrl_reg_to_set, rtw_read8(adapter, gpio_ctrl_reg_to_set) & ~BIT(gpio_num_to_set));
RTW_INFO("%s Set gpio %x[%d]=%d\n", __FUNCTION__, REG_GPIO_PIN_CTRL + 1, gpio_num, isHigh); RTW_INFO("%s Set gpio %x[%d]=%d\n", __func__, REG_GPIO_PIN_CTRL + 1, gpio_num, isHigh);
res = 0; res = 0;
} else { } else {
RTW_INFO("%s The gpio is input,not be set!\n", __FUNCTION__); RTW_INFO("%s The gpio is input,not be set!\n", __func__);
res = -1; res = -1;
} }
@ -10170,7 +10170,7 @@ int rtw_hal_config_gpio(_adapter *adapter, u8 gpio_num, bool isOutput)
if (rtw_hal_gpio_func_check(adapter, gpio_num) == _FAIL) if (rtw_hal_gpio_func_check(adapter, gpio_num) == _FAIL)
return -1; return -1;
RTW_INFO("%s gpio_num =%d direction=%d\n", __FUNCTION__, gpio_num, isOutput); RTW_INFO("%s gpio_num =%d direction=%d\n", __func__, gpio_num, isOutput);
rtw_ps_deny(adapter, PS_DENY_IOCTL); rtw_ps_deny(adapter, PS_DENY_IOCTL);
@ -10200,7 +10200,7 @@ int rtw_hal_register_gpio_interrupt(_adapter *adapter, int gpio_num, void(*callb
if (IS_HARDWARE_TYPE_8188E(adapter)) { if (IS_HARDWARE_TYPE_8188E(adapter)) {
if (gpio_num > 7 || gpio_num < 4) { if (gpio_num > 7 || gpio_num < 4) {
RTW_PRINT("%s The gpio number does not included 4~7.\n", __FUNCTION__); RTW_PRINT("%s The gpio number does not included 4~7.\n", __func__);
return -1; return -1;
} }
} }
@ -10212,7 +10212,7 @@ int rtw_hal_register_gpio_interrupt(_adapter *adapter, int gpio_num, void(*callb
/* Read GPIO direction */ /* Read GPIO direction */
direction = (rtw_read8(adapter, REG_GPIO_PIN_CTRL + 2) & BIT(gpio_num)) >> gpio_num; direction = (rtw_read8(adapter, REG_GPIO_PIN_CTRL + 2) & BIT(gpio_num)) >> gpio_num;
if (direction) { if (direction) {
RTW_PRINT("%s Can't register output gpio as interrupt.\n", __FUNCTION__); RTW_PRINT("%s Can't register output gpio as interrupt.\n", __func__);
return -1; return -1;
} }
@ -10245,7 +10245,7 @@ int rtw_hal_disable_gpio_interrupt(_adapter *adapter, int gpio_num)
if (IS_HARDWARE_TYPE_8188E(adapter)) { if (IS_HARDWARE_TYPE_8188E(adapter)) {
if (gpio_num > 7 || gpio_num < 4) { if (gpio_num > 7 || gpio_num < 4) {
RTW_INFO("%s The gpio number does not included 4~7.\n", __FUNCTION__); RTW_INFO("%s The gpio number does not included 4~7.\n", __func__);
return -1; return -1;
} }
} }
@ -10499,7 +10499,7 @@ void rtw_dump_phy_rxcnts_preprocess(_adapter *padapter, u8 rx_cnt_mode)
if ((!(padapter->dump_rx_cnt_mode & DUMP_PHY_RX_COUNTER)) && (rx_cnt_mode & DUMP_PHY_RX_COUNTER)) { if ((!(padapter->dump_rx_cnt_mode & DUMP_PHY_RX_COUNTER)) && (rx_cnt_mode & DUMP_PHY_RX_COUNTER)) {
rtw_hal_get_odm_var(padapter, HAL_ODM_INITIAL_GAIN, &initialgain, NULL); rtw_hal_get_odm_var(padapter, HAL_ODM_INITIAL_GAIN, &initialgain, NULL);
RTW_INFO("%s CurIGValue:0x%02x\n", __FUNCTION__, initialgain); RTW_INFO("%s CurIGValue:0x%02x\n", __func__, initialgain);
rtw_hal_set_odm_var(padapter, HAL_ODM_INITIAL_GAIN, &initialgain, _FALSE); rtw_hal_set_odm_var(padapter, HAL_ODM_INITIAL_GAIN, &initialgain, _FALSE);
/*disable dynamic functions, such as high power, DIG*/ /*disable dynamic functions, such as high power, DIG*/
rtw_phydm_ability_backup(padapter); rtw_phydm_ability_backup(padapter);
@ -10538,8 +10538,8 @@ void rtw_dump_rx_counters(_adapter *padapter)
if (padapter->dump_rx_cnt_mode & DUMP_PHY_RX_COUNTER) { if (padapter->dump_rx_cnt_mode & DUMP_PHY_RX_COUNTER) {
_rtw_memset(&rx_counter, 0, sizeof(struct dbg_rx_counter)); _rtw_memset(&rx_counter, 0, sizeof(struct dbg_rx_counter));
rtw_dump_phy_rx_counters(padapter, &rx_counter); rtw_dump_phy_rx_counters(padapter, &rx_counter);
/* RTW_INFO("%s: OFDM_FA =%d\n", __FUNCTION__, rx_counter.rx_ofdm_fa); */ /* RTW_INFO("%s: OFDM_FA =%d\n", __func__, rx_counter.rx_ofdm_fa); */
/* RTW_INFO("%s: CCK_FA =%d\n", __FUNCTION__, rx_counter.rx_cck_fa); */ /* RTW_INFO("%s: CCK_FA =%d\n", __func__, rx_counter.rx_cck_fa); */
RTW_INFO("Phy Received packet OK:%d CRC error:%d FA Counter: %d\n", rx_counter.rx_pkt_ok, rx_counter.rx_pkt_crc_error, RTW_INFO("Phy Received packet OK:%d CRC error:%d FA Counter: %d\n", rx_counter.rx_pkt_ok, rx_counter.rx_pkt_crc_error,
rx_counter.rx_ofdm_fa + rx_counter.rx_cck_fa); rx_counter.rx_ofdm_fa + rx_counter.rx_cck_fa);
rtw_reset_phy_rx_counters(padapter); rtw_reset_phy_rx_counters(padapter);

58
hal/hal_com_phycfg.c
View file

@ -2419,7 +2419,7 @@ PHY_GetRateIndexOfTxPowerByRate(
index = 83; index = 83;
break; break;
default: default:
RTW_INFO("Invalid rate 0x%x in %s\n", Rate, __FUNCTION__); RTW_INFO("Invalid rate 0x%x in %s\n", Rate, __func__);
break; break;
}; };
@ -2535,19 +2535,19 @@ PHY_SetTxPowerByRate(
u8 rateIndex = PHY_GetRateIndexOfTxPowerByRate(Rate); u8 rateIndex = PHY_GetRateIndexOfTxPowerByRate(Rate);
if (Band != BAND_ON_2_4G && Band != BAND_ON_5G) { if (Band != BAND_ON_2_4G && Band != BAND_ON_5G) {
RTW_INFO("Invalid band %d in %s\n", Band, __FUNCTION__); RTW_INFO("Invalid band %d in %s\n", Band, __func__);
return; return;
} }
if (RFPath > ODM_RF_PATH_D) { if (RFPath > ODM_RF_PATH_D) {
RTW_INFO("Invalid RfPath %d in %s\n", RFPath, __FUNCTION__); RTW_INFO("Invalid RfPath %d in %s\n", RFPath, __func__);
return; return;
} }
if (TxNum >= RF_MAX_TX_NUM) { if (TxNum >= RF_MAX_TX_NUM) {
RTW_INFO("Invalid TxNum %d in %s\n", TxNum, __FUNCTION__); RTW_INFO("Invalid TxNum %d in %s\n", TxNum, __func__);
return; return;
} }
if (rateIndex >= TX_PWR_BY_RATE_NUM_RATE) { if (rateIndex >= TX_PWR_BY_RATE_NUM_RATE) {
RTW_INFO("Invalid RateIndex %d in %s\n", rateIndex, __FUNCTION__); RTW_INFO("Invalid RateIndex %d in %s\n", rateIndex, __func__);
return; return;
} }
@ -4047,7 +4047,7 @@ phy_ConfigMACWithParaFile(
_rtw_memcpy(pHalData->mac_reg, pHalData->para_file_buf, rlen); _rtw_memcpy(pHalData->mac_reg, pHalData->para_file_buf, rlen);
pHalData->mac_reg_len = rlen; pHalData->mac_reg_len = rlen;
} else } else
RTW_INFO("%s mac_reg alloc fail !\n", __FUNCTION__); RTW_INFO("%s mac_reg alloc fail !\n", __func__);
} }
} }
} else { } else {
@ -4055,7 +4055,7 @@ phy_ConfigMACWithParaFile(
_rtw_memcpy(pHalData->para_file_buf, pHalData->mac_reg, pHalData->mac_reg_len); _rtw_memcpy(pHalData->para_file_buf, pHalData->mac_reg, pHalData->mac_reg_len);
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
} else } else
RTW_INFO("%s(): Critical Error !!!\n", __FUNCTION__); RTW_INFO("%s(): Critical Error !!!\n", __func__);
} }
if (rtStatus == _SUCCESS) { if (rtStatus == _SUCCESS) {
@ -4077,7 +4077,7 @@ phy_ConfigMACWithParaFile(
} }
} }
} else } else
RTW_INFO("%s(): No File %s, Load from HWImg Array!\n", __FUNCTION__, pFileName); RTW_INFO("%s(): No File %s, Load from HWImg Array!\n", __func__, pFileName);
return rtStatus; return rtStatus;
} }
@ -4135,7 +4135,7 @@ phy_ConfigBBWithParaFile(
break; break;
} }
} else } else
RTW_INFO("%s(): ConfigType %d alloc fail !\n", __FUNCTION__, ConfigType); RTW_INFO("%s(): ConfigType %d alloc fail !\n", __func__, ConfigType);
} }
} }
} else { } else {
@ -4143,7 +4143,7 @@ phy_ConfigBBWithParaFile(
_rtw_memcpy(pHalData->para_file_buf, pBuf, *pBufLen); _rtw_memcpy(pHalData->para_file_buf, pBuf, *pBufLen);
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
} else } else
RTW_INFO("%s(): Critical Error !!!\n", __FUNCTION__); RTW_INFO("%s(): Critical Error !!!\n", __func__);
} }
if (rtStatus == _SUCCESS) { if (rtStatus == _SUCCESS) {
@ -4188,7 +4188,7 @@ phy_ConfigBBWithParaFile(
} }
} }
} else } else
RTW_INFO("%s(): No File %s, Load from HWImg Array!\n", __FUNCTION__, pFileName); RTW_INFO("%s(): No File %s, Load from HWImg Array!\n", __func__, pFileName);
return rtStatus; return rtStatus;
} }
@ -4504,7 +4504,7 @@ phy_ConfigBBWithPgParaFile(
_rtw_memcpy(pHalData->bb_phy_reg_pg, pHalData->para_file_buf, rlen); _rtw_memcpy(pHalData->bb_phy_reg_pg, pHalData->para_file_buf, rlen);
pHalData->bb_phy_reg_pg_len = rlen; pHalData->bb_phy_reg_pg_len = rlen;
} else } else
RTW_INFO("%s bb_phy_reg_pg alloc fail !\n", __FUNCTION__); RTW_INFO("%s bb_phy_reg_pg alloc fail !\n", __func__);
} }
} }
} else { } else {
@ -4512,14 +4512,14 @@ phy_ConfigBBWithPgParaFile(
_rtw_memcpy(pHalData->para_file_buf, pHalData->bb_phy_reg_pg, pHalData->bb_phy_reg_pg_len); _rtw_memcpy(pHalData->para_file_buf, pHalData->bb_phy_reg_pg, pHalData->bb_phy_reg_pg_len);
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
} else } else
RTW_INFO("%s(): Critical Error !!!\n", __FUNCTION__); RTW_INFO("%s(): Critical Error !!!\n", __func__);
} }
if (rtStatus == _SUCCESS) { if (rtStatus == _SUCCESS) {
/* RTW_INFO("phy_ConfigBBWithPgParaFile(): read %s ok\n", pFileName); */ /* RTW_INFO("phy_ConfigBBWithPgParaFile(): read %s ok\n", pFileName); */
phy_ParseBBPgParaFile(Adapter, pHalData->para_file_buf); phy_ParseBBPgParaFile(Adapter, pHalData->para_file_buf);
} else } else
RTW_INFO("%s(): No File %s, Load from HWImg Array!\n", __FUNCTION__, pFileName); RTW_INFO("%s(): No File %s, Load from HWImg Array!\n", __func__, pFileName);
return rtStatus; return rtStatus;
} }
@ -4553,7 +4553,7 @@ phy_ConfigBBWithMpParaFile(
_rtw_memcpy(pHalData->bb_phy_reg_mp, pHalData->para_file_buf, rlen); _rtw_memcpy(pHalData->bb_phy_reg_mp, pHalData->para_file_buf, rlen);
pHalData->bb_phy_reg_mp_len = rlen; pHalData->bb_phy_reg_mp_len = rlen;
} else } else
RTW_INFO("%s bb_phy_reg_mp alloc fail !\n", __FUNCTION__); RTW_INFO("%s bb_phy_reg_mp alloc fail !\n", __func__);
} }
} }
} else { } else {
@ -4561,7 +4561,7 @@ phy_ConfigBBWithMpParaFile(
_rtw_memcpy(pHalData->para_file_buf, pHalData->bb_phy_reg_mp, pHalData->bb_phy_reg_mp_len); _rtw_memcpy(pHalData->para_file_buf, pHalData->bb_phy_reg_mp, pHalData->bb_phy_reg_mp_len);
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
} else } else
RTW_INFO("%s(): Critical Error !!!\n", __FUNCTION__); RTW_INFO("%s(): Critical Error !!!\n", __func__);
} }
if (rtStatus == _SUCCESS) { if (rtStatus == _SUCCESS) {
@ -4605,7 +4605,7 @@ phy_ConfigBBWithMpParaFile(
} }
} }
} else } else
RTW_INFO("%s(): No File %s, Load from HWImg Array!\n", __FUNCTION__, pFileName); RTW_INFO("%s(): No File %s, Load from HWImg Array!\n", __func__, pFileName);
return rtStatus; return rtStatus;
} }
@ -4666,7 +4666,7 @@ PHY_ConfigRFWithParaFile(
break; break;
} }
} else } else
RTW_INFO("%s(): eRFPath=%d alloc fail !\n", __FUNCTION__, eRFPath); RTW_INFO("%s(): eRFPath=%d alloc fail !\n", __func__, eRFPath);
} }
} }
} else { } else {
@ -4674,11 +4674,11 @@ PHY_ConfigRFWithParaFile(
_rtw_memcpy(pHalData->para_file_buf, pBuf, *pBufLen); _rtw_memcpy(pHalData->para_file_buf, pBuf, *pBufLen);
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
} else } else
RTW_INFO("%s(): Critical Error !!!\n", __FUNCTION__); RTW_INFO("%s(): Critical Error !!!\n", __func__);
} }
if (rtStatus == _SUCCESS) { if (rtStatus == _SUCCESS) {
/* RTW_INFO("%s(): read %s successfully\n", __FUNCTION__, pFileName); */ /* RTW_INFO("%s(): read %s successfully\n", __func__, pFileName); */
ptmp = pHalData->para_file_buf; ptmp = pHalData->para_file_buf;
for (szLine = GetLineFromBuffer(ptmp); szLine != NULL; szLine = GetLineFromBuffer(ptmp)) { for (szLine = GetLineFromBuffer(ptmp); szLine != NULL; szLine = GetLineFromBuffer(ptmp)) {
@ -4728,7 +4728,7 @@ PHY_ConfigRFWithParaFile(
} }
} }
} else } else
RTW_INFO("%s(): No File %s, Load from HWImg Array!\n", __FUNCTION__, pFileName); RTW_INFO("%s(): No File %s, Load from HWImg Array!\n", __func__, pFileName);
return rtStatus; return rtStatus;
} }
@ -4852,7 +4852,7 @@ PHY_ConfigRFWithTxPwrTrackParaFile(
_rtw_memcpy(pHalData->rf_tx_pwr_track, pHalData->para_file_buf, rlen); _rtw_memcpy(pHalData->rf_tx_pwr_track, pHalData->para_file_buf, rlen);
pHalData->rf_tx_pwr_track_len = rlen; pHalData->rf_tx_pwr_track_len = rlen;
} else } else
RTW_INFO("%s rf_tx_pwr_track alloc fail !\n", __FUNCTION__); RTW_INFO("%s rf_tx_pwr_track alloc fail !\n", __func__);
} }
} }
} else { } else {
@ -4860,11 +4860,11 @@ PHY_ConfigRFWithTxPwrTrackParaFile(
_rtw_memcpy(pHalData->para_file_buf, pHalData->rf_tx_pwr_track, pHalData->rf_tx_pwr_track_len); _rtw_memcpy(pHalData->para_file_buf, pHalData->rf_tx_pwr_track, pHalData->rf_tx_pwr_track_len);
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
} else } else
RTW_INFO("%s(): Critical Error !!!\n", __FUNCTION__); RTW_INFO("%s(): Critical Error !!!\n", __func__);
} }
if (rtStatus == _SUCCESS) { if (rtStatus == _SUCCESS) {
/* RTW_INFO("%s(): read %s successfully\n", __FUNCTION__, pFileName); */ /* RTW_INFO("%s(): read %s successfully\n", __func__, pFileName); */
ptmp = pHalData->para_file_buf; ptmp = pHalData->para_file_buf;
for (szLine = GetLineFromBuffer(ptmp); szLine != NULL; szLine = GetLineFromBuffer(ptmp)) { for (szLine = GetLineFromBuffer(ptmp); szLine != NULL; szLine = GetLineFromBuffer(ptmp)) {
@ -4897,7 +4897,7 @@ PHY_ConfigRFWithTxPwrTrackParaFile(
} }
} }
} else } else
RTW_INFO("%s(): No File %s, Load from HWImg Array!\n", __FUNCTION__, pFileName); RTW_INFO("%s(): No File %s, Load from HWImg Array!\n", __func__, pFileName);
#if 0 #if 0
for (i = 0; i < DELTA_SWINGIDX_SIZE; ++i) { for (i = 0; i < DELTA_SWINGIDX_SIZE; ++i) {
RTW_INFO("pRFCalibrateInfo->delta_swing_table_idx_2ga_p[%d] = %d\n", i, pRFCalibrateInfo->delta_swing_table_idx_2ga_p[i]); RTW_INFO("pRFCalibrateInfo->delta_swing_table_idx_2ga_p[%d] = %d\n", i, pRFCalibrateInfo->delta_swing_table_idx_2ga_p[i]);
@ -5188,7 +5188,7 @@ PHY_ConfigRFWithPowerLimitTableParaFile(
_rtw_memcpy(pHalData->rf_tx_pwr_lmt, pHalData->para_file_buf, rlen); _rtw_memcpy(pHalData->rf_tx_pwr_lmt, pHalData->para_file_buf, rlen);
pHalData->rf_tx_pwr_lmt_len = rlen; pHalData->rf_tx_pwr_lmt_len = rlen;
} else } else
RTW_INFO("%s rf_tx_pwr_lmt alloc fail !\n", __FUNCTION__); RTW_INFO("%s rf_tx_pwr_lmt alloc fail !\n", __func__);
} }
} }
} else { } else {
@ -5196,14 +5196,14 @@ PHY_ConfigRFWithPowerLimitTableParaFile(
_rtw_memcpy(pHalData->para_file_buf, pHalData->rf_tx_pwr_lmt, pHalData->rf_tx_pwr_lmt_len); _rtw_memcpy(pHalData->para_file_buf, pHalData->rf_tx_pwr_lmt, pHalData->rf_tx_pwr_lmt_len);
rtStatus = _SUCCESS; rtStatus = _SUCCESS;
} else } else
RTW_INFO("%s(): Critical Error !!!\n", __FUNCTION__); RTW_INFO("%s(): Critical Error !!!\n", __func__);
} }
if (rtStatus == _SUCCESS) { if (rtStatus == _SUCCESS) {
/* RTW_INFO("%s(): read %s ok\n", __FUNCTION__, pFileName); */ /* RTW_INFO("%s(): read %s ok\n", __func__, pFileName); */
rtStatus = phy_ParsePowerLimitTableFile(Adapter, pHalData->para_file_buf); rtStatus = phy_ParsePowerLimitTableFile(Adapter, pHalData->para_file_buf);
} else } else
RTW_INFO("%s(): No File %s, Load from HWImg Array!\n", __FUNCTION__, pFileName); RTW_INFO("%s(): No File %s, Load from HWImg Array!\n", __func__, pFileName);
return rtStatus; return rtStatus;
} }

82
hal/hal_halmac.c
View file

@ -70,7 +70,7 @@ static u8 _halmac_sdio_cmd52_read(void *p, u32 offset)
_halmac_mac_reg_page0_chk(__func__, d, offset); _halmac_mac_reg_page0_chk(__func__, d, offset);
ret = rtw_sdio_read_cmd52(d, offset, &val, 1); ret = rtw_sdio_read_cmd52(d, offset, &val, 1);
if (_FAIL == ret) { if (_FAIL == ret) {
RTW_INFO("%s: [ERROR] I/O FAIL!\n", __FUNCTION__); RTW_INFO("%s: [ERROR] I/O FAIL!\n", __func__);
return SDIO_ERR_VAL8; return SDIO_ERR_VAL8;
} }
@ -87,7 +87,7 @@ static void _halmac_sdio_cmd52_write(void *p, u32 offset, u8 val)
_halmac_mac_reg_page0_chk(__func__, d, offset); _halmac_mac_reg_page0_chk(__func__, d, offset);
ret = rtw_sdio_write_cmd52(d, offset, &val, 1); ret = rtw_sdio_write_cmd52(d, offset, &val, 1);
if (_FAIL == ret) if (_FAIL == ret)
RTW_INFO("%s: [ERROR] I/O FAIL!\n", __FUNCTION__); RTW_INFO("%s: [ERROR] I/O FAIL!\n", __func__);
} }
static u8 _halmac_sdio_reg_read_8(void *p, u32 offset) static u8 _halmac_sdio_reg_read_8(void *p, u32 offset)
@ -107,7 +107,7 @@ static u8 _halmac_sdio_reg_read_8(void *p, u32 offset)
err = d->intf_ops->read(d, offset, pbuf, 1, 0); err = d->intf_ops->read(d, offset, pbuf, 1, 0);
if (err) { if (err) {
RTW_INFO("%s: [ERROR] I/O FAIL!\n", __FUNCTION__); RTW_INFO("%s: [ERROR] I/O FAIL!\n", __func__);
goto exit; goto exit;
} }
@ -136,7 +136,7 @@ static u16 _halmac_sdio_reg_read_16(void *p, u32 offset)
err = d->intf_ops->read(d, offset, pbuf, 2, 0); err = d->intf_ops->read(d, offset, pbuf, 2, 0);
if (err) { if (err) {
RTW_INFO("%s: [ERROR] I/O FAIL!\n", __FUNCTION__); RTW_INFO("%s: [ERROR] I/O FAIL!\n", __func__);
goto exit; goto exit;
} }
@ -165,7 +165,7 @@ static u32 _halmac_sdio_reg_read_32(void *p, u32 offset)
err = d->intf_ops->read(d, offset, pbuf, 4, 0); err = d->intf_ops->read(d, offset, pbuf, 4, 0);
if (err) { if (err) {
RTW_INFO("%s: [ERROR] I/O FAIL!\n", __FUNCTION__); RTW_INFO("%s: [ERROR] I/O FAIL!\n", __func__);
goto exit; goto exit;
} }
@ -225,7 +225,7 @@ static void _halmac_sdio_reg_write_8(void *p, u32 offset, u8 val)
err = d->intf_ops->write(d, offset, pbuf, 1, 0); err = d->intf_ops->write(d, offset, pbuf, 1, 0);
if (err) if (err)
RTW_INFO("%s: [ERROR] I/O FAIL!\n", __FUNCTION__); RTW_INFO("%s: [ERROR] I/O FAIL!\n", __func__);
rtw_mfree(pbuf, 1); rtw_mfree(pbuf, 1);
} }
@ -247,7 +247,7 @@ static void _halmac_sdio_reg_write_16(void *p, u32 offset, u16 val)
err = d->intf_ops->write(d, offset, pbuf, 2, 0); err = d->intf_ops->write(d, offset, pbuf, 2, 0);
if (err) if (err)
RTW_INFO("%s: [ERROR] I/O FAIL!\n", __FUNCTION__); RTW_INFO("%s: [ERROR] I/O FAIL!\n", __func__);
rtw_mfree(pbuf, 2); rtw_mfree(pbuf, 2);
} }
@ -269,7 +269,7 @@ static void _halmac_sdio_reg_write_32(void *p, u32 offset, u32 val)
err = d->intf_ops->write(d, offset, pbuf, 4, 0); err = d->intf_ops->write(d, offset, pbuf, 4, 0);
if (err) if (err)
RTW_INFO("%s: [ERROR] I/O FAIL!\n", __FUNCTION__); RTW_INFO("%s: [ERROR] I/O FAIL!\n", __func__);
rtw_mfree(pbuf, 4); rtw_mfree(pbuf, 4);
} }
@ -324,7 +324,7 @@ static void _halmac_reg_write_8(void *p, u32 offset, u8 val)
err = rtw_write8(adapter, offset, val); err = rtw_write8(adapter, offset, val);
if (err == _FAIL) if (err == _FAIL)
RTW_INFO("%s: [ERROR] I/O FAIL!\n", __FUNCTION__); RTW_INFO("%s: [ERROR] I/O FAIL!\n", __func__);
} }
static void _halmac_reg_write_16(void *p, u32 offset, u16 val) static void _halmac_reg_write_16(void *p, u32 offset, u16 val)
@ -339,7 +339,7 @@ static void _halmac_reg_write_16(void *p, u32 offset, u16 val)
err = rtw_write16(adapter, offset, val); err = rtw_write16(adapter, offset, val);
if (err == _FAIL) if (err == _FAIL)
RTW_INFO("%s: [ERROR] I/O FAIL!\n", __FUNCTION__); RTW_INFO("%s: [ERROR] I/O FAIL!\n", __func__);
} }
static void _halmac_reg_write_32(void *p, u32 offset, u32 val) static void _halmac_reg_write_32(void *p, u32 offset, u32 val)
@ -354,7 +354,7 @@ static void _halmac_reg_write_32(void *p, u32 offset, u32 val)
err = rtw_write32(adapter, offset, val); err = rtw_write32(adapter, offset, val);
if (err == _FAIL) if (err == _FAIL)
RTW_INFO("%s: [ERROR] I/O FAIL!\n", __FUNCTION__); RTW_INFO("%s: [ERROR] I/O FAIL!\n", __func__);
} }
#endif /* !CONFIG_SDIO_HCI */ #endif /* !CONFIG_SDIO_HCI */
@ -469,46 +469,46 @@ static inline u8 is_valid_id_status(HALMAC_FEATURE_ID id, HALMAC_CMD_PROCESS_STA
{ {
switch (id) { switch (id) {
case HALMAC_FEATURE_CFG_PARA: case HALMAC_FEATURE_CFG_PARA:
RTW_INFO("%s: %s\n", __FUNCTION__, RTW_HALMAC_FEATURE_NAME[id]); RTW_INFO("%s: %s\n", __func__, RTW_HALMAC_FEATURE_NAME[id]);
break; break;
case HALMAC_FEATURE_DUMP_PHYSICAL_EFUSE: case HALMAC_FEATURE_DUMP_PHYSICAL_EFUSE:
RTW_INFO("%s: %s\n", __FUNCTION__, RTW_HALMAC_FEATURE_NAME[id]); RTW_INFO("%s: %s\n", __func__, RTW_HALMAC_FEATURE_NAME[id]);
if (HALMAC_CMD_PROCESS_DONE != status) if (HALMAC_CMD_PROCESS_DONE != status)
RTW_INFO("%s: id(%d) unspecified status(%d)!\n", RTW_INFO("%s: id(%d) unspecified status(%d)!\n",
__FUNCTION__, id, status); __func__, id, status);
break; break;
case HALMAC_FEATURE_DUMP_LOGICAL_EFUSE: case HALMAC_FEATURE_DUMP_LOGICAL_EFUSE:
RTW_INFO("%s: %s\n", __FUNCTION__, RTW_HALMAC_FEATURE_NAME[id]); RTW_INFO("%s: %s\n", __func__, RTW_HALMAC_FEATURE_NAME[id]);
if (HALMAC_CMD_PROCESS_DONE != status) if (HALMAC_CMD_PROCESS_DONE != status)
RTW_INFO("%s: id(%d) unspecified status(%d)!\n", RTW_INFO("%s: id(%d) unspecified status(%d)!\n",
__FUNCTION__, id, status); __func__, id, status);
break; break;
case HALMAC_FEATURE_UPDATE_PACKET: case HALMAC_FEATURE_UPDATE_PACKET:
RTW_INFO("%s: %s\n", __FUNCTION__, RTW_HALMAC_FEATURE_NAME[id]); RTW_INFO("%s: %s\n", __func__, RTW_HALMAC_FEATURE_NAME[id]);
break; break;
case HALMAC_FEATURE_UPDATE_DATAPACK: case HALMAC_FEATURE_UPDATE_DATAPACK:
RTW_INFO("%s: %s\n", __FUNCTION__, RTW_HALMAC_FEATURE_NAME[id]); RTW_INFO("%s: %s\n", __func__, RTW_HALMAC_FEATURE_NAME[id]);
break; break;
case HALMAC_FEATURE_RUN_DATAPACK: case HALMAC_FEATURE_RUN_DATAPACK:
RTW_INFO("%s: %s\n", __FUNCTION__, RTW_HALMAC_FEATURE_NAME[id]); RTW_INFO("%s: %s\n", __func__, RTW_HALMAC_FEATURE_NAME[id]);
break; break;
case HALMAC_FEATURE_CHANNEL_SWITCH: case HALMAC_FEATURE_CHANNEL_SWITCH:
RTW_INFO("%s: %s\n", __FUNCTION__, RTW_HALMAC_FEATURE_NAME[id]); RTW_INFO("%s: %s\n", __func__, RTW_HALMAC_FEATURE_NAME[id]);
break; break;
case HALMAC_FEATURE_IQK: case HALMAC_FEATURE_IQK:
RTW_INFO("%s: %s\n", __FUNCTION__, RTW_HALMAC_FEATURE_NAME[id]); RTW_INFO("%s: %s\n", __func__, RTW_HALMAC_FEATURE_NAME[id]);
break; break;
case HALMAC_FEATURE_POWER_TRACKING: case HALMAC_FEATURE_POWER_TRACKING:
RTW_INFO("%s: %s\n", __FUNCTION__, RTW_HALMAC_FEATURE_NAME[id]); RTW_INFO("%s: %s\n", __func__, RTW_HALMAC_FEATURE_NAME[id]);
break; break;
case HALMAC_FEATURE_PSD: case HALMAC_FEATURE_PSD:
RTW_INFO("%s: %s\n", __FUNCTION__, RTW_HALMAC_FEATURE_NAME[id]); RTW_INFO("%s: %s\n", __func__, RTW_HALMAC_FEATURE_NAME[id]);
break; break;
case HALMAC_FEATURE_ALL: case HALMAC_FEATURE_ALL:
RTW_INFO("%s: %s\n", __FUNCTION__, RTW_HALMAC_FEATURE_NAME[id]); RTW_INFO("%s: %s\n", __func__, RTW_HALMAC_FEATURE_NAME[id]);
break; break;
default: default:
RTW_ERR("%s: unknown feature id(%d)\n", __FUNCTION__, id); RTW_ERR("%s: unknown feature id(%d)\n", __func__, id);
return _FALSE; return _FALSE;
} }
@ -525,7 +525,7 @@ static int init_halmac_event_with_waittime(struct dvobj_priv *d, HALMAC_FEATURE_
if (!sctx) if (!sctx)
return -1; return -1;
} else { } else {
RTW_WARN("%s: id(%d) sctx is not NULL!!\n", __FUNCTION__, id); RTW_WARN("%s: id(%d) sctx is not NULL!!\n", __func__, id);
sctx = d->hmpriv.indicator[id].sctx; sctx = d->hmpriv.indicator[id].sctx;
d->hmpriv.indicator[id].sctx = NULL; d->hmpriv.indicator[id].sctx = NULL;
} }
@ -578,7 +578,7 @@ static int wait_halmac_event(struct dvobj_priv *d, HALMAC_FEATURE_ID id)
/* timeout! We have to reset halmac state */ /* timeout! We have to reset halmac state */
RTW_ERR("%s: Wait id(%d, %s) TIMEOUT! Reset HALMAC state!\n", RTW_ERR("%s: Wait id(%d, %s) TIMEOUT! Reset HALMAC state!\n",
__FUNCTION__, id, RTW_HALMAC_FEATURE_NAME[id]); __func__, id, RTW_HALMAC_FEATURE_NAME[id]);
mac = dvobj_to_halmac(d); mac = dvobj_to_halmac(d);
api = HALMAC_GET_API(mac); api = HALMAC_GET_API(mac);
api->halmac_reset_feature(mac, id); api->halmac_reset_feature(mac, id);
@ -615,20 +615,20 @@ static u8 _halmac_event_indication(void *p, HALMAC_FEATURE_ID feature_id, HALMAC
indicator->status = process_status; indicator->status = process_status;
indicator->ret_size = size; indicator->ret_size = size;
if (!indicator->sctx) { if (!indicator->sctx) {
RTW_WARN("%s: No feature id(%d, %s) waiting!!\n", __FUNCTION__, feature_id, RTW_HALMAC_FEATURE_NAME[feature_id]); RTW_WARN("%s: No feature id(%d, %s) waiting!!\n", __func__, feature_id, RTW_HALMAC_FEATURE_NAME[feature_id]);
goto exit; goto exit;
} }
sctx = indicator->sctx; sctx = indicator->sctx;
if (HALMAC_CMD_PROCESS_ERROR == process_status) { if (HALMAC_CMD_PROCESS_ERROR == process_status) {
RTW_ERR("%s: Something wrong id(%d, %s)!!\n", __FUNCTION__, feature_id, RTW_HALMAC_FEATURE_NAME[feature_id]); RTW_ERR("%s: Something wrong id(%d, %s)!!\n", __func__, feature_id, RTW_HALMAC_FEATURE_NAME[feature_id]);
rtw_sctx_done_err(&sctx, RTW_SCTX_DONE_UNKNOWN); rtw_sctx_done_err(&sctx, RTW_SCTX_DONE_UNKNOWN);
goto exit; goto exit;
} }
if (size > indicator->buf_size) { if (size > indicator->buf_size) {
RTW_WARN("%s: id(%d, %s) buffer is not enough(%d<%d), data will be truncated!\n", RTW_WARN("%s: id(%d, %s) buffer is not enough(%d<%d), data will be truncated!\n",
__FUNCTION__, feature_id, RTW_HALMAC_FEATURE_NAME[feature_id], indicator->buf_size, size); __func__, feature_id, RTW_HALMAC_FEATURE_NAME[feature_id], indicator->buf_size, size);
cpsz = indicator->buf_size; cpsz = indicator->buf_size;
} else { } else {
cpsz = size; cpsz = size;
@ -887,7 +887,7 @@ static void deinit_priv(struct halmacpriv *priv)
continue; continue;
RTW_INFO("%s: <WARN> %s id(%d) sctx still exist!!\n", RTW_INFO("%s: <WARN> %s id(%d) sctx still exist!!\n",
__FUNCTION__, RTW_HALMAC_FEATURE_NAME[i], i); __func__, RTW_HALMAC_FEATURE_NAME[i], i);
sctx = indicator[i].sctx; sctx = indicator[i].sctx;
indicator[i].sctx = NULL; indicator[i].sctx = NULL;
rtw_mfree((u8 *)sctx, sizeof(*sctx)); rtw_mfree((u8 *)sctx, sizeof(*sctx));
@ -942,7 +942,7 @@ int rtw_halmac_init_adapter(struct dvobj_priv *d, PHALMAC_PLATFORM_API pf_api)
#endif #endif
status = halmac_init_adapter(d, pf_api, intf, &halmac, &api); status = halmac_init_adapter(d, pf_api, intf, &halmac, &api);
if (HALMAC_RET_SUCCESS != status) { if (HALMAC_RET_SUCCESS != status) {
RTW_INFO("%s: halmac_init_adapter fail!(status=%d)\n", __FUNCTION__, status); RTW_INFO("%s: halmac_init_adapter fail!(status=%d)\n", __func__, status);
err = -1; err = -1;
goto out; goto out;
} }
@ -1026,7 +1026,7 @@ int rtw_halmac_poweron(struct dvobj_priv *d)
api->halmac_mac_power_switch(halmac, HALMAC_MAC_POWER_OFF); api->halmac_mac_power_switch(halmac, HALMAC_MAC_POWER_OFF);
status = api->halmac_mac_power_switch(halmac, HALMAC_MAC_POWER_ON); status = api->halmac_mac_power_switch(halmac, HALMAC_MAC_POWER_ON);
RTW_WARN("%s: Power state abnormal, try to recover...%s\n", RTW_WARN("%s: Power state abnormal, try to recover...%s\n",
__FUNCTION__, (HALMAC_RET_SUCCESS == status)?"OK":"FAIL!"); __func__, (HALMAC_RET_SUCCESS == status)?"OK":"FAIL!");
} }
if (HALMAC_RET_SUCCESS != status) { if (HALMAC_RET_SUCCESS != status) {
if (HALMAC_RET_PWR_UNCHANGE == status) if (HALMAC_RET_PWR_UNCHANGE == status)
@ -1237,7 +1237,7 @@ static int _send_general_info(struct dvobj_priv *d)
break; break;
case HALMAC_RET_NO_DLFW: case HALMAC_RET_NO_DLFW:
RTW_WARN("%s: halmac_send_general_info() fail because fw not dl!\n", RTW_WARN("%s: halmac_send_general_info() fail because fw not dl!\n",
__FUNCTION__); __func__);
/* go through */ /* go through */
default: default:
return -1; return -1;
@ -1730,17 +1730,17 @@ int rtw_halmac_send_h2c(struct dvobj_priv *d, u8 *h2c)
s32 ret = _FAIL; s32 ret = _FAIL;
if (adapter->bFWReady == _FALSE) { if (adapter->bFWReady == _FALSE) {
RTW_INFO("%s: return H2C cmd because fw is not ready\n", __FUNCTION__); RTW_INFO("%s: return H2C cmd because fw is not ready\n", __func__);
return ret; return ret;
} }
if (!h2c) { if (!h2c) {
RTW_INFO("%s: pbuf is NULL\n", __FUNCTION__); RTW_INFO("%s: pbuf is NULL\n", __func__);
return ret; return ret;
} }
if (rtw_is_surprise_removed(adapter)) { if (rtw_is_surprise_removed(adapter)) {
RTW_INFO("%s: surprise removed\n", __FUNCTION__); RTW_INFO("%s: surprise removed\n", __func__);
return ret; return ret;
} }
@ -2033,11 +2033,11 @@ int rtw_halmac_write_bt_physical_efuse(struct dvobj_priv *d, u32 offset, u32 cnt
for (i = 0; i < cnt; i++) { for (i = 0; i < cnt; i++) {
status = api->halmac_write_efuse_bt(mac, offset + i, data[i], bank); status = api->halmac_write_efuse_bt(mac, offset + i, data[i], bank);
if (HALMAC_RET_SUCCESS != status) { if (HALMAC_RET_SUCCESS != status) {
printk("%s: halmac_write_efuse_bt status = %d\n", __FUNCTION__, status); printk("%s: halmac_write_efuse_bt status = %d\n", __func__, status);
return -1; return -1;
} }
} }
printk("%s: halmac_write_efuse_bt status = HALMAC_RET_SUCCESS %d\n", __FUNCTION__, status); printk("%s: halmac_write_efuse_bt status = HALMAC_RET_SUCCESS %d\n", __func__, status);
return 0; return 0;
} }
@ -2056,11 +2056,11 @@ int rtw_halmac_read_bt_physical_efuse_map(struct dvobj_priv *d, u8 *map, u32 siz
status = api->halmac_dump_efuse_map_bt(mac, bank, size, map); status = api->halmac_dump_efuse_map_bt(mac, bank, size, map);
if (HALMAC_RET_SUCCESS != status) { if (HALMAC_RET_SUCCESS != status) {
printk("%s: halmac_dump_efuse_map_bt fail!\n", __FUNCTION__); printk("%s: halmac_dump_efuse_map_bt fail!\n", __func__);
return -1; return -1;
} }
printk("%s: OK!\n", __FUNCTION__); printk("%s: OK!\n", __func__);
return 0; return 0;
} }

4
hal/hal_intf.c
View file

@ -309,7 +309,7 @@ u8 rtw_hal_check_ips_status(_adapter *padapter)
if (padapter->hal_func.check_ips_status) if (padapter->hal_func.check_ips_status)
val = padapter->hal_func.check_ips_status(padapter); val = padapter->hal_func.check_ips_status(padapter);
else else
RTW_INFO("%s: hal_func.check_ips_status is NULL!\n", __FUNCTION__); RTW_INFO("%s: hal_func.check_ips_status is NULL!\n", __func__);
return val; return val;
} }
@ -1096,7 +1096,7 @@ bool rtw_hal_rfkill_poll(_adapter *adapter, u8 *valid)
#endif #endif
#define rtw_hal_error_msg(ops_fun) \ #define rtw_hal_error_msg(ops_fun) \
RTW_PRINT("### %s - Error : Please hook hal_func.%s ###\n", __FUNCTION__, ops_fun) RTW_PRINT("### %s - Error : Please hook hal_func.%s ###\n", __func__, ops_fun)
u8 rtw_hal_ops_check(_adapter *padapter) u8 rtw_hal_ops_check(_adapter *padapter)
{ {

6
hal/hal_usb_led.c
View file

@ -923,7 +923,7 @@ SwLedBlink9(
} else { } else {
SwLedOff(Adapter, pLed); SwLedOff(Adapter, pLed);
} }
/* RTW_INFO("%s, pLed->CurrLedState=%d, pLed->BlinkingLedState=%d\n", __FUNCTION__, pLed->CurrLedState, pLed->BlinkingLedState); */ /* RTW_INFO("%s, pLed->CurrLedState=%d, pLed->BlinkingLedState=%d\n", __func__, pLed->CurrLedState, pLed->BlinkingLedState); */
switch (pLed->CurrLedState) { switch (pLed->CurrLedState) {
@ -1737,7 +1737,7 @@ void BlinkHandler(PLED_USB pLed)
_adapter *padapter = pLed->padapter; _adapter *padapter = pLed->padapter;
struct led_priv *ledpriv = &(padapter->ledpriv); struct led_priv *ledpriv = &(padapter->ledpriv);
/* RTW_INFO("%s (%s:%d)\n",__FUNCTION__, current->comm, current->pid); */ /* RTW_INFO("%s (%s:%d)\n",__func__, current->comm, current->pid); */
if (RTW_CANNOT_RUN(padapter) || (!rtw_is_hw_init_completed(padapter))) { if (RTW_CANNOT_RUN(padapter) || (!rtw_is_hw_init_completed(padapter))) {
/*RTW_INFO("%s bDriverStopped:%s, bSurpriseRemoved:%s\n" /*RTW_INFO("%s bDriverStopped:%s, bSurpriseRemoved:%s\n"
@ -1836,7 +1836,7 @@ void BlinkTimerCallback(struct timer_list *t)
#endif #endif
_adapter *padapter = pLed->padapter; _adapter *padapter = pLed->padapter;
/* RTW_INFO("%s\n", __FUNCTION__); */ /* RTW_INFO("%s\n", __func__); */
if (RTW_CANNOT_RUN(padapter) || (!rtw_is_hw_init_completed(padapter))) { if (RTW_CANNOT_RUN(padapter) || (!rtw_is_hw_init_completed(padapter))) {
/*RTW_INFO("%s bDriverStopped:%s, bSurpriseRemoved:%s\n" /*RTW_INFO("%s bDriverStopped:%s, bSurpriseRemoved:%s\n"

2
hal/phydm/hal8188erateadaptive.c
View file

@ -861,7 +861,7 @@ odm_ra_info_init(
max_rate_idx = 0x03; max_rate_idx = 0x03;
} }
/* printk("%s ==>wireless_mode:0x%08x,max_raid_idx:0x%02x\n ",__FUNCTION__,wireless_mode,max_rate_idx); */ /* printk("%s ==>wireless_mode:0x%08x,max_raid_idx:0x%02x\n ",__func__,wireless_mode,max_rate_idx); */
ODM_RT_TRACE(p_dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ODM_RT_TRACE(p_dm_odm, ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD,
("odm_ra_info_init(): wireless_mode:0x%08x,max_raid_idx:0x%02x\n", ("odm_ra_info_init(): wireless_mode:0x%08x,max_raid_idx:0x%02x\n",
wireless_mode, max_rate_idx)); wireless_mode, max_rate_idx));

10
hal/phydm/halphyrf_ap.c
View file

@ -103,7 +103,7 @@ odm_txpowertracking_callback_thermal_meter_92e(
struct rtl8192cd_priv *priv = p_dm_odm->priv; struct rtl8192cd_priv *priv = p_dm_odm->priv;
rf_mimo_mode = p_dm_odm->rf_type; rf_mimo_mode = p_dm_odm->rf_type;
/* ODM_RT_TRACE(p_dm_odm,ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD,("%s:%d rf_mimo_mode:%d\n", __FUNCTION__, __LINE__, rf_mimo_mode)); */ /* ODM_RT_TRACE(p_dm_odm,ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD,("%s:%d rf_mimo_mode:%d\n", __func__, __LINE__, rf_mimo_mode)); */
#ifdef MP_TEST #ifdef MP_TEST
if ((OPMODE & WIFI_MP_STATE) || priv->pshare->rf_ft_var.mp_specific) { if ((OPMODE & WIFI_MP_STATE) || priv->pshare->rf_ft_var.mp_specific) {
@ -313,7 +313,7 @@ odm_txpowertracking_callback_thermal_meter_92e(
priv->pshare->OFDM_index[i] = OFDM_index[i]; priv->pshare->OFDM_index[i] = OFDM_index[i];
priv->pshare->CCK_index = CCK_index; priv->pshare->CCK_index = CCK_index;
ODM_RT_TRACE(p_dm_odm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD, ("\n******** END:%s() ********\n", __FUNCTION__)); ODM_RT_TRACE(p_dm_odm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD, ("\n******** END:%s() ********\n", __func__));
} }
#endif #endif
@ -691,7 +691,7 @@ odm_txpowertracking_callback_thermal_meter_jaguar_series2(
} }
if (delta_IQK > c.threshold_iqk) { if (delta_IQK > c.threshold_iqk) {
panic_printk("%s(%d)\n", __FUNCTION__, __LINE__); panic_printk("%s(%d)\n", __func__, __LINE__);
ODM_RT_TRACE(p_dm_odm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD, ("delta_IQK(%d) >= threshold_iqk(%d)\n", delta_IQK, c.threshold_iqk)); ODM_RT_TRACE(p_dm_odm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD, ("delta_IQK(%d) >= threshold_iqk(%d)\n", delta_IQK, c.threshold_iqk));
p_dm_odm->rf_calibrate_info.thermal_value_iqk = thermal_value; p_dm_odm->rf_calibrate_info.thermal_value_iqk = thermal_value;
if (c.do_iqk) if (c.do_iqk)
@ -801,7 +801,7 @@ odm_txpowertracking_callback_thermal_meter_jaguar_series2(
} }
#endif #endif
ODM_RT_TRACE(p_dm_odm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD, ("\n******** END:%s() ********\n", __FUNCTION__)); ODM_RT_TRACE(p_dm_odm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD, ("\n******** END:%s() ********\n", __func__));
/* update thermal meter value */ /* update thermal meter value */
p_dm_odm->rf_calibrate_info.thermal_value = thermal_value; p_dm_odm->rf_calibrate_info.thermal_value = thermal_value;
@ -1000,7 +1000,7 @@ odm_txpowertracking_callback_thermal_meter_jaguar_series(
RTL_W8(0x522, 0x0); RTL_W8(0x522, 0x0);
priv->pshare->thermal_value_lck = thermal_value; priv->pshare->thermal_value_lck = thermal_value;
} }
ODM_RT_TRACE(p_dm_odm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD, ("\n******** END:%s() ********\n", __FUNCTION__)); ODM_RT_TRACE(p_dm_odm, ODM_COMP_TX_PWR_TRACK, ODM_DBG_LOUD, ("\n******** END:%s() ********\n", __func__));
/* update thermal meter value */ /* update thermal meter value */
priv->pshare->thermal_value = thermal_value; priv->pshare->thermal_value = thermal_value;

4
hal/phydm/halphyrf_win.c
View file

@ -727,7 +727,7 @@ odm_iq_calibrate(
struct _ADAPTER *adapter = p_dm_odm->adapter; struct _ADAPTER *adapter = p_dm_odm->adapter;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(adapter);
RT_TRACE(COMP_SCAN, ODM_DBG_LOUD, ("=>%s\n" , __FUNCTION__)); RT_TRACE(COMP_SCAN, ODM_DBG_LOUD, ("=>%s\n" , __func__));
#if (DM_ODM_SUPPORT_TYPE == ODM_WIN) #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
if (*p_dm_odm->p_is_fcs_mode_enable) if (*p_dm_odm->p_is_fcs_mode_enable)
@ -751,7 +751,7 @@ odm_iq_calibrate(
} else } else
p_dm_odm->linked_interval = 0; p_dm_odm->linked_interval = 0;
RT_TRACE(COMP_SCAN, ODM_DBG_LOUD, ("<=%s interval=%d ch=%d prech=%d scan=%s\n", __FUNCTION__, p_dm_odm->linked_interval, RT_TRACE(COMP_SCAN, ODM_DBG_LOUD, ("<=%s interval=%d ch=%d prech=%d scan=%s\n", __func__, p_dm_odm->linked_interval,
*p_dm_odm->p_channel, p_dm_odm->pre_channel, *p_dm_odm->p_is_scan_in_process == TRUE?"TRUE":"FALSE")); *p_dm_odm->p_channel, p_dm_odm->pre_channel, *p_dm_odm->p_is_scan_in_process == TRUE?"TRUE":"FALSE"));
} }

2
hal/phydm/phydm_antdect.c
View file

@ -700,7 +700,7 @@ odm_single_dual_antenna_detection_psd(
while (odm_get_bb_reg(p_dm_odm, 0xdf4, BIT(6))) { while (odm_get_bb_reg(p_dm_odm, 0xdf4, BIT(6))) {
i++; i++;
if (i > 1000000) { if (i > 1000000) {
ODM_RT_TRACE(p_dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Wait in %s() more than %d times!\n", __FUNCTION__, i)); ODM_RT_TRACE(p_dm_odm, ODM_COMP_ANT_DIV, ODM_DBG_LOUD, ("Wait in %s() more than %d times!\n", __func__, i));
break; break;
} }
} }

10
hal/phydm/phydm_antdiv.c
View file

@ -4425,15 +4425,15 @@ odm_set_tx_ant_by_tx_info(
return; return;
if (support_ic_type == ODM_RTL8881A) { if (support_ic_type == ODM_RTL8881A) {
/*panic_printk("[%s] [%d] ******ODM_SetTxAntByTxInfo_8881E******\n",__FUNCTION__,__LINE__); */ /*panic_printk("[%s] [%d] ******ODM_SetTxAntByTxInfo_8881E******\n",__func__,__LINE__); */
pdesc->dword6 &= set_desc(~(BIT(18) | BIT(17) | BIT(16))); pdesc->dword6 &= set_desc(~(BIT(18) | BIT(17) | BIT(16)));
pdesc->dword6 |= set_desc(p_dm_fat_table->antsel_a[aid] << 16); pdesc->dword6 |= set_desc(p_dm_fat_table->antsel_a[aid] << 16);
} else if (support_ic_type == ODM_RTL8192E) { } else if (support_ic_type == ODM_RTL8192E) {
/*panic_printk("[%s] [%d] ******ODM_SetTxAntByTxInfo_8192E******\n",__FUNCTION__,__LINE__); */ /*panic_printk("[%s] [%d] ******ODM_SetTxAntByTxInfo_8192E******\n",__func__,__LINE__); */
pdesc->dword6 &= set_desc(~(BIT(18) | BIT(17) | BIT(16))); pdesc->dword6 &= set_desc(~(BIT(18) | BIT(17) | BIT(16)));
pdesc->dword6 |= set_desc(p_dm_fat_table->antsel_a[aid] << 16); pdesc->dword6 |= set_desc(p_dm_fat_table->antsel_a[aid] << 16);
} else if (support_ic_type == ODM_RTL8188E) { } else if (support_ic_type == ODM_RTL8188E) {
/*panic_printk("[%s] [%d] ******ODM_SetTxAntByTxInfo_8188E******\n",__FUNCTION__,__LINE__);*/ /*panic_printk("[%s] [%d] ******ODM_SetTxAntByTxInfo_8188E******\n",__func__,__LINE__);*/
pdesc->dword2 &= set_desc(~BIT(24)); pdesc->dword2 &= set_desc(~BIT(24));
pdesc->dword2 &= set_desc(~BIT(25)); pdesc->dword2 &= set_desc(~BIT(25));
pdesc->dword7 &= set_desc(~BIT(29)); pdesc->dword7 &= set_desc(~BIT(29));
@ -4445,7 +4445,7 @@ odm_set_tx_ant_by_tx_info(
} else if (support_ic_type == ODM_RTL8812) { } else if (support_ic_type == ODM_RTL8812) {
/*[path-A]*/ /*[path-A]*/
/*panic_printk("[%s] [%d] ******ODM_SetTxAntByTxInfo_8881E******\n",__FUNCTION__,__LINE__);*/ /*panic_printk("[%s] [%d] ******ODM_SetTxAntByTxInfo_8881E******\n",__func__,__LINE__);*/
pdesc->dword6 &= set_desc(~BIT(16)); pdesc->dword6 &= set_desc(~BIT(16));
pdesc->dword6 &= set_desc(~BIT(17)); pdesc->dword6 &= set_desc(~BIT(17));
@ -4479,7 +4479,7 @@ odm_set_tx_ant_by_tx_info_hal(
return; return;
if (support_ic_type == ODM_RTL8881A || support_ic_type == ODM_RTL8192E || support_ic_type == ODM_RTL8814A) { if (support_ic_type == ODM_RTL8881A || support_ic_type == ODM_RTL8192E || support_ic_type == ODM_RTL8814A) {
/*panic_printk("[%s] [%d] ******odm_set_tx_ant_by_tx_info_hal******\n",__FUNCTION__,__LINE__);*/ /*panic_printk("[%s] [%d] ******odm_set_tx_ant_by_tx_info_hal******\n",__func__,__LINE__);*/
pdescdata->ant_sel = 1; pdescdata->ant_sel = 1;
pdescdata->ant_sel_a = p_dm_fat_table->antsel_a[aid]; pdescdata->ant_sel_a = p_dm_fat_table->antsel_a[aid];
} }

10
hal/phydm/phydm_debug.h
View file

@ -131,7 +131,7 @@
#define config_phydm_read_txagc_check(data) (data != INVALID_TXAGC_DATA) #define config_phydm_read_txagc_check(data) (data != INVALID_TXAGC_DATA)
#define dbg_print printk #define dbg_print printk
#define RT_PRINTK(fmt, args...) dbg_print("%s(): " fmt, __FUNCTION__, ## args); #define RT_PRINTK(fmt, args...) dbg_print("%s(): " fmt, __func__, ## args);
#define RT_DISP(dbgtype, dbgflag, printstr) #define RT_DISP(dbgtype, dbgflag, printstr)
#ifndef ASSERT #ifndef ASSERT
@ -174,15 +174,15 @@
#define ODM_RT_ASSERT(p_dm_odm, expr, fmt) do {\ #define ODM_RT_ASSERT(p_dm_odm, expr, fmt) do {\
if (!(expr)) { \ if (!(expr)) { \
dbg_print("Assertion failed! %s at ......\n", #expr); \ dbg_print("Assertion failed! %s at ......\n", #expr); \
dbg_print(" ......%s,%s, line=%d\n", __FILE__, __FUNCTION__, __LINE__); \ dbg_print(" ......%s,%s, line=%d\n", __FILE__, __func__, __LINE__); \
RT_PRINTK fmt; \ RT_PRINTK fmt; \
ASSERT(false); \ ASSERT(false); \
} \ } \
} while (0) } while (0)
#define ODM_dbg_enter() { dbg_print(" == > %s\n", __FUNCTION__); } #define ODM_dbg_enter() { dbg_print(" == > %s\n", __func__); }
#define ODM_dbg_exit() { dbg_print("< == %s\n", __FUNCTION__); } #define ODM_dbg_exit() { dbg_print("< == %s\n", __func__); }
#define ODM_dbg_trace(str) { dbg_print("%s:%s\n", __FUNCTION__, str); } #define ODM_dbg_trace(str) { dbg_print("%s:%s\n", __func__, str); }
#define ODM_PRINT_ADDR(p_dm_odm, comp, level, title_str, ptr) do {\ #define ODM_PRINT_ADDR(p_dm_odm, comp, level, title_str, ptr) do {\
if (((comp) & p_dm_odm->debug_components) && (level <= p_dm_odm->debug_level)) { \ if (((comp) & p_dm_odm->debug_components) && (level <= p_dm_odm->debug_level)) { \

2
hal/phydm/phydm_noisemonitor.c
View file

@ -127,7 +127,7 @@ static s16 odm_inband_noise_monitor_n_series(struct PHY_DM_STRUCT *p_dm_odm, u8
/* printk("####### valid_done:%d #############\n",valid_done); */ /* printk("####### valid_done:%d #############\n",valid_done); */
if ((valid_done == max_rf_path) || (odm_get_progressing_time(p_dm_odm, start) > max_time)) { if ((valid_done == max_rf_path) || (odm_get_progressing_time(p_dm_odm, start) > max_time)) {
for (rf_path = ODM_RF_PATH_A; rf_path < max_rf_path; rf_path++) { for (rf_path = ODM_RF_PATH_A; rf_path < max_rf_path; rf_path++) {
/* printk("%s PATH_%d - sum = %d, VALID_CNT = %d\n",__FUNCTION__,rf_path,noise_data.sum[rf_path], noise_data.valid_cnt[rf_path]); */ /* printk("%s PATH_%d - sum = %d, VALID_CNT = %d\n",__func__,rf_path,noise_data.sum[rf_path], noise_data.valid_cnt[rf_path]); */
if (noise_data.valid_cnt[rf_path]) if (noise_data.valid_cnt[rf_path])
noise_data.sum[rf_path] /= noise_data.valid_cnt[rf_path]; noise_data.sum[rf_path] /= noise_data.valid_cnt[rf_path];
else else

2
hal/phydm/phydm_rainfo.c
View file

@ -1922,7 +1922,7 @@ find_minimum_rssi(
} else } else
p_hal_data->min_undecorated_pwdb_for_dm = p_hal_data->entry_min_undecorated_smoothed_pwdb; p_hal_data->min_undecorated_pwdb_for_dm = p_hal_data->entry_min_undecorated_smoothed_pwdb;
/*DBG_8192C("%s=>min_undecorated_pwdb_for_dm(%d)\n",__FUNCTION__,pdmpriv->min_undecorated_pwdb_for_dm);*/ /*DBG_8192C("%s=>min_undecorated_pwdb_for_dm(%d)\n",__func__,pdmpriv->min_undecorated_pwdb_for_dm);*/
/*ODM_RT_TRACE(p_dm_odm,COMP_DIG, DBG_LOUD, ("min_undecorated_pwdb_for_dm =%d\n",p_hal_data->min_undecorated_pwdb_for_dm));*/ /*ODM_RT_TRACE(p_dm_odm,COMP_DIG, DBG_LOUD, ("min_undecorated_pwdb_for_dm =%d\n",p_hal_data->min_undecorated_pwdb_for_dm));*/
} }

2
hal/phydm/phydm_types.h
View file

@ -117,7 +117,7 @@ enum rt_spinlock_type {
#if (DM_ODM_SUPPORT_TYPE == ODM_WIN) #if (DM_ODM_SUPPORT_TYPE == ODM_WIN)
#define sta_info _RT_WLAN_STA #define sta_info _RT_WLAN_STA
#define __func__ __FUNCTION__ #define __func__ __func__
#define PHYDM_TESTCHIP_SUPPORT TESTCHIP_SUPPORT #define PHYDM_TESTCHIP_SUPPORT TESTCHIP_SUPPORT
#define MASKH3BYTES 0xffffff00 #define MASKH3BYTES 0xffffff00
#define SUCCESS 0 #define SUCCESS 0

30
hal/rtl8188e_cmd.c
View file

@ -172,7 +172,7 @@ u8 rtl8192c_set_FwSelectSuspend_cmd(_adapter *padapter , u8 bfwpoll, u16 period)
{ {
u8 res = _SUCCESS; u8 res = _SUCCESS;
struct H2C_SS_RFOFF_PARAM param; struct H2C_SS_RFOFF_PARAM param;
RTW_INFO("==>%s bfwpoll(%x)\n", __FUNCTION__, bfwpoll); RTW_INFO("==>%s bfwpoll(%x)\n", __func__, bfwpoll);
param.gpio_period = period;/* Polling GPIO_11 period time */ param.gpio_period = period;/* Polling GPIO_11 period time */
param.ROFOn = (_TRUE == bfwpoll) ? 1 : 0; param.ROFOn = (_TRUE == bfwpoll) ? 1 : 0;
FillH2CCmd_88E(padapter, SELECTIVE_SUSPEND_ROF_CMD, sizeof(param), (u8 *)(&param)); FillH2CCmd_88E(padapter, SELECTIVE_SUSPEND_ROF_CMD, sizeof(param), (u8 *)(&param));
@ -186,7 +186,7 @@ u8 rtl8188e_set_rssi_cmd(_adapter *padapter, u8 *param)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
if (pHalData->fw_ractrl == _FALSE) { if (pHalData->fw_ractrl == _FALSE) {
RTW_INFO("==>%s fw dont support RA\n", __FUNCTION__); RTW_INFO("==>%s fw dont support RA\n", __func__);
return _FAIL; return _FAIL;
} }
@ -207,7 +207,7 @@ u8 rtl8188e_set_raid_cmd(_adapter *padapter, u32 bitmap, u8 *arg, u8 bw)
u8 ignore_bw = _FALSE; u8 ignore_bw = _FALSE;
if (pHalData->fw_ractrl == _FALSE) { if (pHalData->fw_ractrl == _FALSE) {
RTW_INFO("==>%s fw dont support RA\n", __FUNCTION__); RTW_INFO("==>%s fw dont support RA\n", __func__);
return _FAIL; return _FAIL;
} }
@ -239,13 +239,13 @@ u8 rtl8188e_set_raid_cmd(_adapter *padapter, u32 bitmap, u8 *arg, u8 bw)
/* DisableTXPowerTraining */ /* DisableTXPowerTraining */
if (pHalData->bDisableTXPowerTraining) { if (pHalData->bDisableTXPowerTraining) {
H2CCommand[2] |= BIT6; H2CCommand[2] |= BIT6;
RTW_INFO("%s,Disable PWT by driver\n", __FUNCTION__); RTW_INFO("%s,Disable PWT by driver\n", __func__);
} else { } else {
struct PHY_DM_STRUCT *pDM_OutSrc = &pHalData->odmpriv; struct PHY_DM_STRUCT *pDM_OutSrc = &pHalData->odmpriv;
if (pDM_OutSrc->is_disable_power_training) { if (pDM_OutSrc->is_disable_power_training) {
H2CCommand[2] |= BIT6; H2CCommand[2] |= BIT6;
RTW_INFO("%s,Disable PWT by DM\n", __FUNCTION__); RTW_INFO("%s,Disable PWT by DM\n", __func__);
} }
} }
@ -271,7 +271,7 @@ void rtl8188e_set_FwPwrMode_cmd(PADAPTER padapter, u8 Mode)
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
u8 RLBM = 0; /* 0:Min, 1:Max , 2:User define */ u8 RLBM = 0; /* 0:Min, 1:Max , 2:User define */
RTW_INFO("%s: Mode=%d SmartPS=%d UAPSD=%d\n", __FUNCTION__, RTW_INFO("%s: Mode=%d SmartPS=%d UAPSD=%d\n", __func__,
Mode, pwrpriv->smart_ps, padapter->registrypriv.uapsd_enable); Mode, pwrpriv->smart_ps, padapter->registrypriv.uapsd_enable);
H2CSetPwrMode.AwakeInterval = 2; /* DTIM = 1 */ H2CSetPwrMode.AwakeInterval = 2; /* DTIM = 1 */
@ -330,7 +330,7 @@ static void ConstructBeacon(_adapter *padapter, u8 *pframe, u32 *pLength)
u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
/* RTW_INFO("%s\n", __FUNCTION__); */ /* RTW_INFO("%s\n", __func__); */
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
@ -412,7 +412,7 @@ _ConstructBeacon:
*pLength = pktlen; *pLength = pktlen;
/* RTW_INFO("%s bcn_sz=%d\n", __FUNCTION__, pktlen); */ /* RTW_INFO("%s bcn_sz=%d\n", __func__, pktlen); */
} }
@ -424,7 +424,7 @@ static void ConstructPSPoll(_adapter *padapter, u8 *pframe, u32 *pLength)
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
/* RTW_INFO("%s\n", __FUNCTION__); */ /* RTW_INFO("%s\n", __func__); */
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
@ -465,7 +465,7 @@ static void ConstructNullFunctionData(
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
/* RTW_INFO("%s:%d\n", __FUNCTION__, bForcePowerSave); */ /* RTW_INFO("%s:%d\n", __func__, bForcePowerSave); */
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
@ -594,7 +594,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus)
u32 poll = 0; u32 poll = 0;
RTW_INFO("%s mstatus(%x)\n", __FUNCTION__, mstatus); RTW_INFO("%s mstatus(%x)\n", __func__, mstatus);
if (mstatus == 1) { if (mstatus == 1) {
/* We should set AID, correct TSF, HW seq enable before set JoinBssReport to Fw in 88/92C. */ /* We should set AID, correct TSF, HW seq enable before set JoinBssReport to Fw in 88/92C. */
@ -727,16 +727,16 @@ void rtl8188e_set_p2p_ps_offload_cmd(_adapter *padapter, u8 p2p_ps_state)
p2p_ps_offload->NoA1_En = 1; p2p_ps_offload->NoA1_En = 1;
/* config P2P NoA Descriptor Register */ /* config P2P NoA Descriptor Register */
/* RTW_INFO("%s(): noa_duration = %x\n",__FUNCTION__,pwdinfo->noa_duration[i]); */ /* RTW_INFO("%s(): noa_duration = %x\n",__func__,pwdinfo->noa_duration[i]); */
rtw_write32(padapter, REG_NOA_DESC_DURATION, pwdinfo->noa_duration[i]); rtw_write32(padapter, REG_NOA_DESC_DURATION, pwdinfo->noa_duration[i]);
/* RTW_INFO("%s(): noa_interval = %x\n",__FUNCTION__,pwdinfo->noa_interval[i]); */ /* RTW_INFO("%s(): noa_interval = %x\n",__func__,pwdinfo->noa_interval[i]); */
rtw_write32(padapter, REG_NOA_DESC_INTERVAL, pwdinfo->noa_interval[i]); rtw_write32(padapter, REG_NOA_DESC_INTERVAL, pwdinfo->noa_interval[i]);
/* RTW_INFO("%s(): start_time = %x\n",__FUNCTION__,pwdinfo->noa_start_time[i]); */ /* RTW_INFO("%s(): start_time = %x\n",__func__,pwdinfo->noa_start_time[i]); */
rtw_write32(padapter, REG_NOA_DESC_START, pwdinfo->noa_start_time[i]); rtw_write32(padapter, REG_NOA_DESC_START, pwdinfo->noa_start_time[i]);
/* RTW_INFO("%s(): noa_count = %x\n",__FUNCTION__,pwdinfo->noa_count[i]); */ /* RTW_INFO("%s(): noa_count = %x\n",__func__,pwdinfo->noa_count[i]); */
rtw_write8(padapter, REG_NOA_DESC_COUNT, pwdinfo->noa_count[i]); rtw_write8(padapter, REG_NOA_DESC_COUNT, pwdinfo->noa_count[i]);
} }

4
hal/rtl8188e_dm.c
View file

@ -171,7 +171,7 @@ dm_InterruptMigration(
/* Update current settings. */ /* Update current settings. */
if (bCurrentIntMt != IntMtToSet) { if (bCurrentIntMt != IntMtToSet) {
RTW_INFO("%s(): Update interrrupt migration(%d)\n", __FUNCTION__, IntMtToSet); RTW_INFO("%s(): Update interrrupt migration(%d)\n", __func__, IntMtToSet);
if (IntMtToSet) { if (IntMtToSet) {
/* */ /* */
/* <Roger_Notes> Set interrrupt migration timer and corresponging Tx/Rx counter. */ /* <Roger_Notes> Set interrrupt migration timer and corresponging Tx/Rx counter. */
@ -189,7 +189,7 @@ dm_InterruptMigration(
#if 0 #if 0
if (bCurrentACIntDisable != ACIntToSet) { if (bCurrentACIntDisable != ACIntToSet) {
RTW_INFO("%s(): Update AC interrrupt(%d)\n", __FUNCTION__, ACIntToSet); RTW_INFO("%s(): Update AC interrrupt(%d)\n", __func__, ACIntToSet);
if (ACIntToSet) { /* Disable four ACs interrupts. */ if (ACIntToSet) { /* Disable four ACs interrupts. */
/* */ /* */
/* <Roger_Notes> Disable VO, VI, BE and BK four AC interrupts to gain more efficient CPU utilization. */ /* <Roger_Notes> Disable VO, VI, BE and BK four AC interrupts to gain more efficient CPU utilization. */

86
hal/rtl8188e_hal_init.c
View file

@ -35,7 +35,7 @@ static void iol_mode_enable(PADAPTER padapter, u8 enable)
if (enable) { if (enable) {
/* Enable initial offload */ /* Enable initial offload */
reg_0xf0 = rtw_read8(padapter, REG_SYS_CFG); reg_0xf0 = rtw_read8(padapter, REG_SYS_CFG);
/* RTW_INFO("%s reg_0xf0:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0xf0, reg_0xf0|SW_OFFLOAD_EN); */ /* RTW_INFO("%s reg_0xf0:0x%02x, write 0x%02x\n", __func__, reg_0xf0, reg_0xf0|SW_OFFLOAD_EN); */
rtw_write8(padapter, REG_SYS_CFG, reg_0xf0 | SW_OFFLOAD_EN); rtw_write8(padapter, REG_SYS_CFG, reg_0xf0 | SW_OFFLOAD_EN);
if (padapter->bFWReady == _FALSE) { if (padapter->bFWReady == _FALSE) {
@ -46,7 +46,7 @@ static void iol_mode_enable(PADAPTER padapter, u8 enable)
} else { } else {
/* disable initial offload */ /* disable initial offload */
reg_0xf0 = rtw_read8(padapter, REG_SYS_CFG); reg_0xf0 = rtw_read8(padapter, REG_SYS_CFG);
/* RTW_INFO("%s reg_0xf0:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0xf0, reg_0xf0& ~SW_OFFLOAD_EN); */ /* RTW_INFO("%s reg_0xf0:0x%02x, write 0x%02x\n", __func__, reg_0xf0, reg_0xf0& ~SW_OFFLOAD_EN); */
rtw_write8(padapter, REG_SYS_CFG, reg_0xf0 & ~SW_OFFLOAD_EN); rtw_write8(padapter, REG_SYS_CFG, reg_0xf0 & ~SW_OFFLOAD_EN);
} }
} }
@ -60,7 +60,7 @@ static s32 iol_execute(PADAPTER padapter, u8 control)
u32 t1, t2; u32 t1, t2;
control = control & 0x0f; control = control & 0x0f;
reg_0x88 = rtw_read8(padapter, REG_HMEBOX_E0); reg_0x88 = rtw_read8(padapter, REG_HMEBOX_E0);
/* RTW_INFO("%s reg_0x88:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0x88, reg_0x88|control); */ /* RTW_INFO("%s reg_0x88:0x%02x, write 0x%02x\n", __func__, reg_0x88, reg_0x88|control); */
rtw_write8(padapter, REG_HMEBOX_E0, reg_0x88 | control); rtw_write8(padapter, REG_HMEBOX_E0, reg_0x88 | control);
t1 = start = rtw_get_current_time(); t1 = start = rtw_get_current_time();
@ -69,7 +69,7 @@ static s32 iol_execute(PADAPTER padapter, u8 control)
(reg_0x88 = rtw_read8(padapter, REG_HMEBOX_E0)) & control (reg_0x88 = rtw_read8(padapter, REG_HMEBOX_E0)) & control
&& (passing_time = rtw_get_passing_time_ms(start)) < 1000 && (passing_time = rtw_get_passing_time_ms(start)) < 1000
) { ) {
/* RTW_INFO("%s polling reg_0x88:0x%02x,reg_0x1c7:0x%02x\n", __FUNCTION__, reg_0x88,rtw_read8(padapter, 0x1c7) ); */ /* RTW_INFO("%s polling reg_0x88:0x%02x,reg_0x1c7:0x%02x\n", __func__, reg_0x88,rtw_read8(padapter, 0x1c7) ); */
/* rtw_udelay_os(100); */ /* rtw_udelay_os(100); */
} }
@ -89,7 +89,7 @@ static s32 iol_InitLLTTable(
{ {
s32 rst = _SUCCESS; s32 rst = _SUCCESS;
iol_mode_enable(padapter, 1); iol_mode_enable(padapter, 1);
/* RTW_INFO("%s txpktbuf_bndy:%u\n", __FUNCTION__, txpktbuf_bndy); */ /* RTW_INFO("%s txpktbuf_bndy:%u\n", __func__, txpktbuf_bndy); */
rtw_write8(padapter, REG_TDECTRL + 1, txpktbuf_bndy); rtw_write8(padapter, REG_TDECTRL + 1, txpktbuf_bndy);
rst = iol_execute(padapter, CMD_INIT_LLT); rst = iol_execute(padapter, CMD_INIT_LLT);
iol_mode_enable(padapter, 0); iol_mode_enable(padapter, 0);
@ -112,13 +112,13 @@ efuse_phymap_to_logical(u8 *phymap, u16 _offset, u16 _size_byte, u8 *pbuf)
efuseTbl = (u8 *)rtw_zmalloc(EFUSE_MAP_LEN_88E); efuseTbl = (u8 *)rtw_zmalloc(EFUSE_MAP_LEN_88E);
if (efuseTbl == NULL) { if (efuseTbl == NULL) {
RTW_INFO("%s: alloc efuseTbl fail!\n", __FUNCTION__); RTW_INFO("%s: alloc efuseTbl fail!\n", __func__);
goto exit; goto exit;
} }
eFuseWord = (u16 **)rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, 2); eFuseWord = (u16 **)rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, 2);
if (eFuseWord == NULL) { if (eFuseWord == NULL) {
RTW_INFO("%s: alloc eFuseWord fail!\n", __FUNCTION__); RTW_INFO("%s: alloc eFuseWord fail!\n", __func__);
goto exit; goto exit;
} }
@ -272,27 +272,27 @@ static void efuse_read_phymap_from_txpktbuf(
if (bcnhead < 0) /* if not valid */ if (bcnhead < 0) /* if not valid */
bcnhead = rtw_read8(adapter, REG_TDECTRL + 1); bcnhead = rtw_read8(adapter, REG_TDECTRL + 1);
RTW_INFO("%s bcnhead:%d\n", __FUNCTION__, bcnhead); RTW_INFO("%s bcnhead:%d\n", __func__, bcnhead);
/* reg_0x106 = rtw_read8(adapter, REG_PKT_BUFF_ACCESS_CTRL); */ /* reg_0x106 = rtw_read8(adapter, REG_PKT_BUFF_ACCESS_CTRL); */
/* RTW_INFO("%s reg_0x106:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0x106, 0x69); */ /* RTW_INFO("%s reg_0x106:0x%02x, write 0x%02x\n", __func__, reg_0x106, 0x69); */
rtw_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT); rtw_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT);
/* RTW_INFO("%s reg_0x106:0x%02x\n", __FUNCTION__, rtw_read8(adapter, 0x106)); */ /* RTW_INFO("%s reg_0x106:0x%02x\n", __func__, rtw_read8(adapter, 0x106)); */
dbg_addr = bcnhead * 128 / 8; /* 8-bytes addressing */ dbg_addr = bcnhead * 128 / 8; /* 8-bytes addressing */
while (1) { while (1) {
/* RTW_INFO("%s dbg_addr:0x%x\n", __FUNCTION__, dbg_addr+i); */ /* RTW_INFO("%s dbg_addr:0x%x\n", __func__, dbg_addr+i); */
rtw_write16(adapter, REG_PKTBUF_DBG_ADDR, dbg_addr + i); rtw_write16(adapter, REG_PKTBUF_DBG_ADDR, dbg_addr + i);
/* RTW_INFO("%s write reg_0x143:0x00\n", __FUNCTION__); */ /* RTW_INFO("%s write reg_0x143:0x00\n", __func__); */
rtw_write8(adapter, REG_TXPKTBUF_DBG, 0); rtw_write8(adapter, REG_TXPKTBUF_DBG, 0);
start = rtw_get_current_time(); start = rtw_get_current_time();
while (!(reg_0x143 = rtw_read8(adapter, REG_TXPKTBUF_DBG)) /* dbg */ while (!(reg_0x143 = rtw_read8(adapter, REG_TXPKTBUF_DBG)) /* dbg */
/* while(rtw_read8(adapter, REG_TXPKTBUF_DBG) & BIT0 */ /* while(rtw_read8(adapter, REG_TXPKTBUF_DBG) & BIT0 */
&& (passing_time = rtw_get_passing_time_ms(start)) < 1000 && (passing_time = rtw_get_passing_time_ms(start)) < 1000
) { ) {
RTW_INFO("%s polling reg_0x143:0x%02x, reg_0x106:0x%02x\n", __FUNCTION__, reg_0x143, rtw_read8(adapter, 0x106)); RTW_INFO("%s polling reg_0x143:0x%02x, reg_0x106:0x%02x\n", __func__, reg_0x143, rtw_read8(adapter, 0x106));
rtw_usleep_os(100); rtw_usleep_os(100);
} }
@ -301,13 +301,13 @@ static void efuse_read_phymap_from_txpktbuf(
hi32 = rtw_read32(adapter, REG_PKTBUF_DBG_DATA_H); hi32 = rtw_read32(adapter, REG_PKTBUF_DBG_DATA_H);
#if 0 #if 0
RTW_INFO("%s lo32:0x%08x, %02x %02x %02x %02x\n", __FUNCTION__, lo32 RTW_INFO("%s lo32:0x%08x, %02x %02x %02x %02x\n", __func__, lo32
, rtw_read8(adapter, REG_PKTBUF_DBG_DATA_L) , rtw_read8(adapter, REG_PKTBUF_DBG_DATA_L)
, rtw_read8(adapter, REG_PKTBUF_DBG_DATA_L + 1) , rtw_read8(adapter, REG_PKTBUF_DBG_DATA_L + 1)
, rtw_read8(adapter, REG_PKTBUF_DBG_DATA_L + 2) , rtw_read8(adapter, REG_PKTBUF_DBG_DATA_L + 2)
, rtw_read8(adapter, REG_PKTBUF_DBG_DATA_L + 3) , rtw_read8(adapter, REG_PKTBUF_DBG_DATA_L + 3)
); );
RTW_INFO("%s hi32:0x%08x, %02x %02x %02x %02x\n", __FUNCTION__, hi32 RTW_INFO("%s hi32:0x%08x, %02x %02x %02x %02x\n", __func__, hi32
, rtw_read8(adapter, REG_PKTBUF_DBG_DATA_H) , rtw_read8(adapter, REG_PKTBUF_DBG_DATA_H)
, rtw_read8(adapter, REG_PKTBUF_DBG_DATA_H + 1) , rtw_read8(adapter, REG_PKTBUF_DBG_DATA_H + 1)
, rtw_read8(adapter, REG_PKTBUF_DBG_DATA_H + 2) , rtw_read8(adapter, REG_PKTBUF_DBG_DATA_H + 2)
@ -331,7 +331,7 @@ static void efuse_read_phymap_from_txpktbuf(
limit = (len - 2 < limit) ? len - 2 : limit; limit = (len - 2 < limit) ? len - 2 : limit;
RTW_INFO("%s len:%u, lenbak:%u, aaa:%u, aaabak:%u\n", __FUNCTION__, len, lenbak, aaa, aaabak); RTW_INFO("%s len:%u, lenbak:%u, aaa:%u, aaabak:%u\n", __func__, len, lenbak, aaa, aaabak);
_rtw_memcpy(pos, ((u8 *)&lo32) + 2, (limit >= count + 2) ? 2 : limit - count); _rtw_memcpy(pos, ((u8 *)&lo32) + 2, (limit >= count + 2) ? 2 : limit - count);
count += (limit >= count + 2) ? 2 : limit - count; count += (limit >= count + 2) ? 2 : limit - count;
@ -359,7 +359,7 @@ static void efuse_read_phymap_from_txpktbuf(
rtw_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, DISABLE_TRXPKT_BUF_ACCESS); rtw_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, DISABLE_TRXPKT_BUF_ACCESS);
RTW_INFO("%s read count:%u\n", __FUNCTION__, count); RTW_INFO("%s read count:%u\n", __func__, count);
*size = count; *size = count;
} }
@ -384,9 +384,9 @@ static s32 iol_read_efuse(
_rtw_memset(physical_map, 0xFF, 512); _rtw_memset(physical_map, 0xFF, 512);
/* /reg_0x106 = rtw_read8(padapter, REG_PKT_BUFF_ACCESS_CTRL); */ /* /reg_0x106 = rtw_read8(padapter, REG_PKT_BUFF_ACCESS_CTRL); */
/* RTW_INFO("%s reg_0x106:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0x106, 0x69); */ /* RTW_INFO("%s reg_0x106:0x%02x, write 0x%02x\n", __func__, reg_0x106, 0x69); */
rtw_write8(padapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT); rtw_write8(padapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT);
/* RTW_INFO("%s reg_0x106:0x%02x\n", __FUNCTION__, rtw_read8(padapter, 0x106)); */ /* RTW_INFO("%s reg_0x106:0x%02x\n", __func__, rtw_read8(padapter, 0x106)); */
status = iol_execute(padapter, CMD_READ_EFUSE_MAP); status = iol_execute(padapter, CMD_READ_EFUSE_MAP);
@ -394,7 +394,7 @@ static s32 iol_read_efuse(
efuse_read_phymap_from_txpktbuf(padapter, txpktbuf_bndy, physical_map, &size); efuse_read_phymap_from_txpktbuf(padapter, txpktbuf_bndy, physical_map, &size);
#if 0 #if 0
RTW_PRINT("%s physical map\n", __FUNCTION__); RTW_PRINT("%s physical map\n", __func__);
for (i = 0; i < size; i++) { for (i = 0; i < size; i++) {
if (i % 16 == 0) if (i % 16 == 0)
RTW_PRINT("%02x", physical_map[i]); RTW_PRINT("%02x", physical_map[i]);
@ -438,7 +438,7 @@ static s32 iol_ioconfig(
{ {
s32 rst = _SUCCESS; s32 rst = _SUCCESS;
/* RTW_INFO("%s iocfg_bndy:%u\n", __FUNCTION__, iocfg_bndy); */ /* RTW_INFO("%s iocfg_bndy:%u\n", __func__, iocfg_bndy); */
rtw_write8(padapter, REG_TDECTRL + 1, iocfg_bndy); rtw_write8(padapter, REG_TDECTRL + 1, iocfg_bndy);
rst = iol_execute(padapter, CMD_IOCONFIG); rst = iol_execute(padapter, CMD_IOCONFIG);
@ -496,7 +496,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(ADAPTER *Adapter, int data_len)
u16 data_cnts = (data_len / 8) + 1; u16 data_cnts = (data_len / 8) + 1;
u8 *pbuf = rtw_zvmalloc(data_len + 10); u8 *pbuf = rtw_zvmalloc(data_len + 10);
RTW_INFO("###### %s ######\n", __FUNCTION__); RTW_INFO("###### %s ######\n", __func__);
rtw_write8(Adapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT); rtw_write8(Adapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT);
if (pbuf) { if (pbuf) {
@ -521,7 +521,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(ADAPTER *Adapter, int data_len)
rtw_vmfree(pbuf, data_len + 10); rtw_vmfree(pbuf, data_len + 10);
} }
RTW_INFO("###### %s ######\n", __FUNCTION__); RTW_INFO("###### %s ######\n", __func__);
} }
#endif /* defined(CONFIG_IOL) */ #endif /* defined(CONFIG_IOL) */
@ -791,7 +791,7 @@ static s32 polling_fwdl_chksum(_adapter *adapter, u32 min_cnt, u32 timeout_ms)
ret = _SUCCESS; ret = _SUCCESS;
exit: exit:
RTW_INFO("%s: Checksum report %s! (%u, %dms), REG_MCUFWDL:0x%08x\n", __FUNCTION__ RTW_INFO("%s: Checksum report %s! (%u, %dms), REG_MCUFWDL:0x%08x\n", __func__
, (ret == _SUCCESS) ? "OK" : "Fail", cnt, rtw_get_passing_time_ms(start), value32); , (ret == _SUCCESS) ? "OK" : "Fail", cnt, rtw_get_passing_time_ms(start), value32);
return ret; return ret;
@ -829,7 +829,7 @@ static s32 _FWFreeToGo(_adapter *adapter, u32 min_cnt, u32 timeout_ms)
ret = _SUCCESS; ret = _SUCCESS;
exit: exit:
RTW_INFO("%s: Polling FW ready %s! (%u, %dms), REG_MCUFWDL:0x%08x\n", __FUNCTION__ RTW_INFO("%s: Polling FW ready %s! (%u, %dms), REG_MCUFWDL:0x%08x\n", __func__
, (ret == _SUCCESS) ? "OK" : "Fail", cnt, rtw_get_passing_time_ms(start), value32); , (ret == _SUCCESS) ? "OK" : "Fail", cnt, rtw_get_passing_time_ms(start), value32);
return ret; return ret;
} }
@ -889,7 +889,7 @@ s32 rtl8188e_FirmwareDownload(PADAPTER padapter, BOOLEAN bUsedWoWLANFw)
#ifdef CONFIG_FILE_FWIMG #ifdef CONFIG_FILE_FWIMG
if (rtw_is_file_readable(fwfilepath) == _TRUE) { if (rtw_is_file_readable(fwfilepath) == _TRUE) {
RTW_INFO("%s accquire FW from file:%s\n", __FUNCTION__, fwfilepath); RTW_INFO("%s accquire FW from file:%s\n", __func__, fwfilepath);
pFirmware->eFWSource = FW_SOURCE_IMG_FILE; pFirmware->eFWSource = FW_SOURCE_IMG_FILE;
} else } else
#endif /* CONFIG_FILE_FWIMG */ #endif /* CONFIG_FILE_FWIMG */
@ -944,7 +944,7 @@ s32 rtl8188e_FirmwareDownload(PADAPTER padapter, BOOLEAN bUsedWoWLANFw)
pFirmware->szFwBuffer = array_mp_8188e_t_fw_nic; pFirmware->szFwBuffer = array_mp_8188e_t_fw_nic;
pFirmware->ulFwLength = array_length_mp_8188e_t_fw_nic; pFirmware->ulFwLength = array_length_mp_8188e_t_fw_nic;
} }
RTW_INFO("%s fw:%s, size: %d\n", __FUNCTION__, "NIC", pFirmware->ulFwLength); RTW_INFO("%s fw:%s, size: %d\n", __func__, "NIC", pFirmware->ulFwLength);
} }
break; break;
} }
@ -1205,13 +1205,13 @@ Hal_EfuseReadEFuse88E(
efuseTbl = (u8 *)rtw_zmalloc(EFUSE_MAP_LEN_88E); efuseTbl = (u8 *)rtw_zmalloc(EFUSE_MAP_LEN_88E);
if (efuseTbl == NULL) { if (efuseTbl == NULL) {
RTW_INFO("%s: alloc efuseTbl fail!\n", __FUNCTION__); RTW_INFO("%s: alloc efuseTbl fail!\n", __func__);
goto exit; goto exit;
} }
eFuseWord = (u16 **)rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, 2); eFuseWord = (u16 **)rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, 2);
if (eFuseWord == NULL) { if (eFuseWord == NULL) {
RTW_INFO("%s: alloc eFuseWord fail!\n", __FUNCTION__); RTW_INFO("%s: alloc eFuseWord fail!\n", __func__);
goto exit; goto exit;
} }
@ -1422,7 +1422,7 @@ exit:
#ifdef DBG_IOL_READ_EFUSE_MAP #ifdef DBG_IOL_READ_EFUSE_MAP
if (_rtw_memcmp(logical_map, pHalData->efuse_eeprom_data, 0x130) == _FALSE) { if (_rtw_memcmp(logical_map, pHalData->efuse_eeprom_data, 0x130) == _FALSE) {
int i; int i;
RTW_INFO("%s compare first 0x130 byte fail\n", __FUNCTION__); RTW_INFO("%s compare first 0x130 byte fail\n", __func__);
for (i = 0; i < 512; i++) { for (i = 0; i < 512; i++) {
if (i % 16 == 0) if (i % 16 == 0)
RTW_INFO("0x%03x: ", i); RTW_INFO("0x%03x: ", i);
@ -2856,7 +2856,7 @@ void Hal_ReadPowerSavingMode88E(
pwrctl->bSupportRemoteWakeup = (hwinfo[EEPROM_USB_OPTIONAL_FUNCTION0] & BIT1) ? _TRUE : _FALSE; pwrctl->bSupportRemoteWakeup = (hwinfo[EEPROM_USB_OPTIONAL_FUNCTION0] & BIT1) ? _TRUE : _FALSE;
#endif /* CONFIG_USB_HCI */ #endif /* CONFIG_USB_HCI */
RTW_INFO("%s...bHWPwrPindetect(%x)-bHWPowerdown(%x) ,bSupportRemoteWakeup(%x)\n", __FUNCTION__, RTW_INFO("%s...bHWPwrPindetect(%x)-bHWPowerdown(%x) ,bSupportRemoteWakeup(%x)\n", __func__,
pwrctl->bHWPwrPindetect, pwrctl->bHWPowerdown, pwrctl->bSupportRemoteWakeup); pwrctl->bHWPwrPindetect, pwrctl->bHWPowerdown, pwrctl->bSupportRemoteWakeup);
RTW_INFO("### PS params=> power_mgnt(%x),usbss_enable(%x) ###\n", padapter->registrypriv.power_mgnt, padapter->registrypriv.usbss_enable); RTW_INFO("### PS params=> power_mgnt(%x),usbss_enable(%x) ###\n", padapter->registrypriv.power_mgnt, padapter->registrypriv.usbss_enable);
@ -3264,12 +3264,12 @@ void Hal_ReadRFGainOffset(
else else
pHalData->eeprom_thermal_meter -= ((thermal_offset >> 1) & 0x0F); pHalData->eeprom_thermal_meter -= ((thermal_offset >> 1) & 0x0F);
RTW_INFO("%s =>thermal_offset:0x%02x pHalData->eeprom_thermal_meter=0x%02x\n", __FUNCTION__ , thermal_offset, pHalData->eeprom_thermal_meter); RTW_INFO("%s =>thermal_offset:0x%02x pHalData->eeprom_thermal_meter=0x%02x\n", __func__ , thermal_offset, pHalData->eeprom_thermal_meter);
} }
} }
RTW_INFO("%s => EEPRORFGainOffset = 0x%02x,EEPROMRFGainVal=0x%02x,thermal_offset:0x%02x\n", RTW_INFO("%s => EEPRORFGainOffset = 0x%02x,EEPROMRFGainVal=0x%02x,thermal_offset:0x%02x\n",
__FUNCTION__, pHalData->EEPROMRFGainOffset, pHalData->EEPROMRFGainVal, thermal_offset); __func__, pHalData->EEPROMRFGainOffset, pHalData->EEPROMRFGainVal, thermal_offset);
} }
@ -3543,7 +3543,7 @@ static void hw_var_set_opmode(PADAPTER Adapter, u8 variable, u8 *val)
if (rtw_mi_buddy_check_fwstate(Adapter, (WIFI_STATION_STATE | WIFI_ASOC_STATE))) { if (rtw_mi_buddy_check_fwstate(Adapter, (WIFI_STATION_STATE | WIFI_ASOC_STATE))) {
if (reset_tsf(Adapter, HW_PORT1) == _FALSE) if (reset_tsf(Adapter, HW_PORT1) == _FALSE)
RTW_INFO("ERROR! %s()-%d: Reset port1 TSF fail\n", RTW_INFO("ERROR! %s()-%d: Reset port1 TSF fail\n",
__FUNCTION__, __LINE__); __func__, __LINE__);
} }
#endif /* CONFIG_TSF_RESET_OFFLOAD */ #endif /* CONFIG_TSF_RESET_OFFLOAD */
#if defined(CONFIG_PCI_HCI) #if defined(CONFIG_PCI_HCI)
@ -3686,7 +3686,7 @@ static void hw_var_set_opmode(PADAPTER Adapter, u8 variable, u8 *val)
if (rtw_mi_buddy_check_fwstate(Adapter, (WIFI_STATION_STATE | WIFI_ASOC_STATE))) { if (rtw_mi_buddy_check_fwstate(Adapter, (WIFI_STATION_STATE | WIFI_ASOC_STATE))) {
if (reset_tsf(Adapter, HW_PORT0) == _FALSE) if (reset_tsf(Adapter, HW_PORT0) == _FALSE)
RTW_INFO("ERROR! %s()-%d: Reset port0 TSF fail\n", RTW_INFO("ERROR! %s()-%d: Reset port0 TSF fail\n",
__FUNCTION__, __LINE__); __func__, __LINE__);
} }
#endif /* CONFIG_TSF_RESET_OFFLOAD */ #endif /* CONFIG_TSF_RESET_OFFLOAD */
#if defined(CONFIG_PCI_HCI) #if defined(CONFIG_PCI_HCI)
@ -4138,11 +4138,11 @@ void SetHwReg8188E(_adapter *adapter, u8 variable, u8 *val)
case HW_VAR_ON_RCR_AM: case HW_VAR_ON_RCR_AM:
rtw_write32(adapter, REG_RCR, rtw_read32(adapter, REG_RCR) | RCR_AM); rtw_write32(adapter, REG_RCR, rtw_read32(adapter, REG_RCR) | RCR_AM);
RTW_INFO("%s, %d, RCR= %x\n", __FUNCTION__, __LINE__, rtw_read32(adapter, REG_RCR)); RTW_INFO("%s, %d, RCR= %x\n", __func__, __LINE__, rtw_read32(adapter, REG_RCR));
break; break;
case HW_VAR_OFF_RCR_AM: case HW_VAR_OFF_RCR_AM:
rtw_write32(adapter, REG_RCR, rtw_read32(adapter, REG_RCR) & (~RCR_AM)); rtw_write32(adapter, REG_RCR, rtw_read32(adapter, REG_RCR) & (~RCR_AM));
RTW_INFO("%s, %d, RCR= %x\n", __FUNCTION__, __LINE__, rtw_read32(adapter, REG_RCR)); RTW_INFO("%s, %d, RCR= %x\n", __func__, __LINE__, rtw_read32(adapter, REG_RCR));
break; break;
case HW_VAR_BEACON_INTERVAL: case HW_VAR_BEACON_INTERVAL:
rtw_write16(adapter, REG_BCN_INTERVAL, *((u16 *)val)); rtw_write16(adapter, REG_BCN_INTERVAL, *((u16 *)val));
@ -4152,7 +4152,7 @@ void SetHwReg8188E(_adapter *adapter, u8 variable, u8 *val)
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
u16 bcn_interval = *((u16 *)val); u16 bcn_interval = *((u16 *)val);
if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE) { if ((pmlmeinfo->state & 0x03) == WIFI_FW_AP_STATE) {
RTW_INFO("%s==> bcn_interval:%d, eraly_int:%d\n", __FUNCTION__, bcn_interval, bcn_interval >> 1); RTW_INFO("%s==> bcn_interval:%d, eraly_int:%d\n", __func__, bcn_interval, bcn_interval >> 1);
rtw_write8(adapter, REG_DRVERLYINT, bcn_interval >> 1); /* 50ms for sdio */ rtw_write8(adapter, REG_DRVERLYINT, bcn_interval >> 1); /* 50ms for sdio */
} }
} }
@ -4407,7 +4407,7 @@ void SetHwReg8188E(_adapter *adapter, u8 variable, u8 *val)
i++; i++;
if ((reg_200 & 0x00ffffff) != (reg_204 & 0x00ffffff)) { if ((reg_200 & 0x00ffffff) != (reg_204 & 0x00ffffff)) {
/* RTW_INFO("%s: (HW_VAR_CHECK_TXBUF)TXBUF NOT empty - 0x204=0x%x, 0x200=0x%x (%d)\n", __FUNCTION__, reg_204, reg_200, i); */ /* RTW_INFO("%s: (HW_VAR_CHECK_TXBUF)TXBUF NOT empty - 0x204=0x%x, 0x200=0x%x (%d)\n", __func__, reg_204, reg_200, i); */
rtw_msleep_os(10); rtw_msleep_os(10);
} else } else
break; break;
@ -4418,12 +4418,12 @@ void SetHwReg8188E(_adapter *adapter, u8 variable, u8 *val)
if (RTW_CANNOT_RUN(adapter)) if (RTW_CANNOT_RUN(adapter))
; ;
else if (pass_ms >= 2000 || (reg_200 & 0x00ffffff) != (reg_204 & 0x00ffffff)) { else if (pass_ms >= 2000 || (reg_200 & 0x00ffffff) != (reg_204 & 0x00ffffff)) {
RTW_PRINT("%s:(HW_VAR_CHECK_TXBUF)NOT empty(%d) in %d ms\n", __FUNCTION__, i, pass_ms); RTW_PRINT("%s:(HW_VAR_CHECK_TXBUF)NOT empty(%d) in %d ms\n", __func__, i, pass_ms);
RTW_PRINT("%s:(HW_VAR_CHECK_TXBUF)0x200=0x%08x, 0x204=0x%08x (0x%08x, 0x%08x)\n", RTW_PRINT("%s:(HW_VAR_CHECK_TXBUF)0x200=0x%08x, 0x204=0x%08x (0x%08x, 0x%08x)\n",
__FUNCTION__, reg_200, reg_204, init_reg_200, init_reg_204); __func__, reg_200, reg_204, init_reg_200, init_reg_204);
/* rtw_warn_on(1); */ /* rtw_warn_on(1); */
} else } else
RTW_INFO("%s:(HW_VAR_CHECK_TXBUF)TXBUF Empty(%d) in %d ms\n", __FUNCTION__, i, pass_ms); RTW_INFO("%s:(HW_VAR_CHECK_TXBUF)TXBUF Empty(%d) in %d ms\n", __func__, i, pass_ms);
retry_limit = 0x30; retry_limit = 0x30;
val16 = retry_limit << RETRY_LIMIT_SHORT_SHIFT | retry_limit << RETRY_LIMIT_LONG_SHIFT; val16 = retry_limit << RETRY_LIMIT_SHORT_SHIFT | retry_limit << RETRY_LIMIT_LONG_SHIFT;
@ -4850,7 +4850,7 @@ int rtl8188e_GpioFuncCheck(PADAPTER adapter, u8 gpio_num)
if (IS_HARDWARE_TYPE_8188E(adapter) == _FAIL) { if (IS_HARDWARE_TYPE_8188E(adapter) == _FAIL) {
if ((gpio_num > 7) || (gpio_num < 4)) { if ((gpio_num > 7) || (gpio_num < 4)) {
RTW_INFO("%s The gpio number does not included 4~7.\n",__FUNCTION__); RTW_INFO("%s The gpio number does not included 4~7.\n",__func__);
ret = _FAIL; ret = _FAIL;
} }
} }

6
hal/rtl8188e_phycfg.c
View file

@ -1768,7 +1768,7 @@ static void _PHY_SwChnl8188E(PADAPTER Adapter, u8 channel)
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
if (Adapter->bNotifyChannelChange) if (Adapter->bNotifyChannelChange)
RTW_INFO("[%s] ch = %d\n", __FUNCTION__, channel); RTW_INFO("[%s] ch = %d\n", __func__, channel);
/* s1. pre common command - CmdID_SetTxPowerLevel */ /* s1. pre common command - CmdID_SetTxPowerLevel */
PHY_SetTxPowerLevel8188E(Adapter, channel); PHY_SetTxPowerLevel8188E(Adapter, channel);
@ -1881,12 +1881,12 @@ PHY_SetSwChnlBWMode8188E(
IN u8 Offset80 IN u8 Offset80
) )
{ {
/* RTW_INFO("%s()===>\n",__FUNCTION__); */ /* RTW_INFO("%s()===>\n",__func__); */
PHY_SwChnl8188E(Adapter, channel); PHY_SwChnl8188E(Adapter, channel);
PHY_SetBWMode8188E(Adapter, Bandwidth, Offset40); PHY_SetBWMode8188E(Adapter, Bandwidth, Offset40);
/* RTW_INFO("<==%s()\n",__FUNCTION__); */ /* RTW_INFO("<==%s()\n",__func__); */
} }
static VOID _PHY_SetRFPathSwitch( static VOID _PHY_SetRFPathSwitch(

14
hal/rtl8188e_sreset.c
View file

@ -36,12 +36,12 @@ void rtl8188e_sreset_xmit_status_check(_adapter *padapter)
txdma_status = rtw_read32(padapter, REG_TXDMA_STATUS); txdma_status = rtw_read32(padapter, REG_TXDMA_STATUS);
if (txdma_status != 0x00 && txdma_status != 0xeaeaeaea) { if (txdma_status != 0x00 && txdma_status != 0xeaeaeaea) {
RTW_INFO("%s REG_TXDMA_STATUS:0x%08x\n", __FUNCTION__, txdma_status); RTW_INFO("%s REG_TXDMA_STATUS:0x%08x\n", __func__, txdma_status);
rtw_hal_sreset_reset(padapter); rtw_hal_sreset_reset(padapter);
} }
#ifdef CONFIG_USB_HCI #ifdef CONFIG_USB_HCI
/* total xmit irp = 4 */ /* total xmit irp = 4 */
/* RTW_INFO("==>%s free_xmitbuf_cnt(%d),txirp_cnt(%d)\n",__FUNCTION__,pxmitpriv->free_xmitbuf_cnt,pxmitpriv->txirp_cnt); */ /* RTW_INFO("==>%s free_xmitbuf_cnt(%d),txirp_cnt(%d)\n",__func__,pxmitpriv->free_xmitbuf_cnt,pxmitpriv->txirp_cnt); */
/* if(pxmitpriv->txirp_cnt == NR_XMITBUFF+1) */ /* if(pxmitpriv->txirp_cnt == NR_XMITBUFF+1) */
current_time = rtw_get_current_time(); current_time = rtw_get_current_time();
@ -59,7 +59,7 @@ void rtl8188e_sreset_xmit_status_check(_adapter *padapter)
/* padapter->Wifi_Error_Status = WIFI_TX_HANG; */ /* padapter->Wifi_Error_Status = WIFI_TX_HANG; */
ability = rtw_phydm_ability_get(padapter); ability = rtw_phydm_ability_get(padapter);
RTW_INFO("%s tx hang %s\n", __FUNCTION__, RTW_INFO("%s tx hang %s\n", __func__,
(ability & ODM_BB_ADAPTIVITY) ? "ODM_BB_ADAPTIVITY" : ""); (ability & ODM_BB_ADAPTIVITY) ? "ODM_BB_ADAPTIVITY" : "");
if (!(ability & ODM_BB_ADAPTIVITY)) if (!(ability & ODM_BB_ADAPTIVITY))
@ -86,15 +86,15 @@ void rtl8188e_sreset_linked_status_check(_adapter *padapter)
u8 fw_status = 0; u8 fw_status = 0;
rx_dma_status = rtw_read32(padapter, REG_RXDMA_STATUS); rx_dma_status = rtw_read32(padapter, REG_RXDMA_STATUS);
if (rx_dma_status != 0x00) { if (rx_dma_status != 0x00) {
RTW_INFO("%s REG_RXDMA_STATUS:0x%08x\n", __FUNCTION__, rx_dma_status); RTW_INFO("%s REG_RXDMA_STATUS:0x%08x\n", __func__, rx_dma_status);
rtw_write32(padapter, REG_RXDMA_STATUS, rx_dma_status); rtw_write32(padapter, REG_RXDMA_STATUS, rx_dma_status);
} }
fw_status = rtw_read8(padapter, REG_FMETHR); fw_status = rtw_read8(padapter, REG_FMETHR);
if (fw_status != 0x00) { if (fw_status != 0x00) {
if (fw_status == 1) if (fw_status == 1)
RTW_INFO("%s REG_FW_STATUS (0x%02x), Read_Efuse_Fail !!\n", __FUNCTION__, fw_status); RTW_INFO("%s REG_FW_STATUS (0x%02x), Read_Efuse_Fail !!\n", __func__, fw_status);
else if (fw_status == 2) else if (fw_status == 2)
RTW_INFO("%s REG_FW_STATUS (0x%02x), Condition_No_Match !!\n", __FUNCTION__, fw_status); RTW_INFO("%s REG_FW_STATUS (0x%02x), Condition_No_Match !!\n", __func__, fw_status);
} }
#if 0 #if 0
u32 regc50, regc58, reg824, reg800; u32 regc50, regc58, reg824, reg800;
@ -106,7 +106,7 @@ void rtl8188e_sreset_linked_status_check(_adapter *padapter)
((regc58 & 0xFFFFFF00) != 0x69543400) || ((regc58 & 0xFFFFFF00) != 0x69543400) ||
(((reg824 & 0xFFFFFF00) != 0x00390000) && (((reg824 & 0xFFFFFF00) != 0x80390000))) || (((reg824 & 0xFFFFFF00) != 0x00390000) && (((reg824 & 0xFFFFFF00) != 0x80390000))) ||
(((reg800 & 0xFFFFFF00) != 0x03040000) && ((reg800 & 0xFFFFFF00) != 0x83040000))) { (((reg800 & 0xFFFFFF00) != 0x03040000) && ((reg800 & 0xFFFFFF00) != 0x83040000))) {
RTW_INFO("%s regc50:0x%08x, regc58:0x%08x, reg824:0x%08x, reg800:0x%08x,\n", __FUNCTION__, RTW_INFO("%s regc50:0x%08x, regc58:0x%08x, reg824:0x%08x, reg800:0x%08x,\n", __func__,
regc50, regc58, reg824, reg800); regc50, regc58, reg824, reg800);
rtw_hal_sreset_reset(padapter); rtw_hal_sreset_reset(padapter);
} }

12
hal/rtl8188e_xmit.c
View file

@ -139,9 +139,9 @@ InsertEMContent_8188E(
#ifdef DBG_EMINFO #ifdef DBG_EMINFO
{ {
int i; int i;
RTW_INFO("\n%s ==> pEMInfo->EMPktNum =%d\n", __FUNCTION__, pEMInfo->EMPktNum); RTW_INFO("\n%s ==> pEMInfo->EMPktNum =%d\n", __func__, pEMInfo->EMPktNum);
for (i = 0; i < EARLY_MODE_MAX_PKT_NUM; i++) for (i = 0; i < EARLY_MODE_MAX_PKT_NUM; i++)
RTW_INFO("%s ==> pEMInfo->EMPktLen[%d] =%d\n", __FUNCTION__, i, pEMInfo->EMPktLen[i]); RTW_INFO("%s ==> pEMInfo->EMPktLen[%d] =%d\n", __func__, i, pEMInfo->EMPktLen[i]);
} }
#endif #endif
@ -219,12 +219,12 @@ void UpdateEarlyModeInfo8188E(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmi
pmem = pframe->buf_addr; pmem = pframe->buf_addr;
#ifdef DBG_EMINFO #ifdef DBG_EMINFO
RTW_INFO("\n%s ==> agg_num:%d\n", __FUNCTION__, pframe->agg_num); RTW_INFO("\n%s ==> agg_num:%d\n", __func__, pframe->agg_num);
for (index = 0; index < pframe->agg_num; index++) { for (index = 0; index < pframe->agg_num; index++) {
offset = pxmitpriv->agg_pkt[index].offset; offset = pxmitpriv->agg_pkt[index].offset;
pktlen = pxmitpriv->agg_pkt[index].pkt_len; pktlen = pxmitpriv->agg_pkt[index].pkt_len;
RTW_INFO("%s ==> agg_pkt[%d].offset=%d\n", __FUNCTION__, index, offset); RTW_INFO("%s ==> agg_pkt[%d].offset=%d\n", __func__, index, offset);
RTW_INFO("%s ==> agg_pkt[%d].pkt_len=%d\n", __FUNCTION__, index, pktlen); RTW_INFO("%s ==> agg_pkt[%d].pkt_len=%d\n", __func__, index, pktlen);
} }
#endif #endif
@ -264,7 +264,7 @@ void UpdateEarlyModeInfo8188E(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmi
} }
#ifdef DBG_EMINFO #ifdef DBG_EMINFO
RTW_INFO("%s ==> desc.pkt_len=%d\n", __FUNCTION__, ptxdesc->pktlen); RTW_INFO("%s ==> desc.pkt_len=%d\n", __func__, ptxdesc->pktlen);
#endif #endif
InsertEMContent_8188E(&eminfo, pEMInfo_mem); InsertEMContent_8188E(&eminfo, pEMInfo_mem);
} }

26
hal/rtl8188eu_xmit.c
View file

@ -270,7 +270,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz , u8 ba
/* 4 offset 0 */ /* 4 offset 0 */
ptxdesc->txdw0 |= cpu_to_le32(OWN | FSG | LSG); ptxdesc->txdw0 |= cpu_to_le32(OWN | FSG | LSG);
/* RTW_INFO("%s==> pkt_len=%d,bagg_pkt=%02x\n",__FUNCTION__,sz,bagg_pkt); */ /* RTW_INFO("%s==> pkt_len=%d,bagg_pkt=%02x\n",__func__,sz,bagg_pkt); */
ptxdesc->txdw0 |= cpu_to_le32(sz & 0x0000ffff);/* update TXPKTSIZE */ ptxdesc->txdw0 |= cpu_to_le32(sz & 0x0000ffff);/* update TXPKTSIZE */
offset = TXDESC_SIZE + OFFSET_SZ; offset = TXDESC_SIZE + OFFSET_SZ;
@ -280,7 +280,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz , u8 ba
offset += EARLY_MODE_INFO_SIZE ;/* 0x28 */ offset += EARLY_MODE_INFO_SIZE ;/* 0x28 */
} }
#endif #endif
/* RTW_INFO("%s==>offset(0x%02x)\n",__FUNCTION__,offset); */ /* RTW_INFO("%s==>offset(0x%02x)\n",__func__,offset); */
ptxdesc->txdw0 |= cpu_to_le32(((offset) << OFFSET_SHT) & 0x00ff0000);/* 32 bytes for TX Desc */ ptxdesc->txdw0 |= cpu_to_le32(((offset) << OFFSET_SHT) & 0x00ff0000);/* 32 bytes for TX Desc */
if (bmcst) if (bmcst)
@ -294,7 +294,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz , u8 ba
} }
} }
#endif #endif
/* RTW_INFO("%s, pkt_offset=0x%02x\n",__FUNCTION__,pxmitframe->pkt_offset); */ /* RTW_INFO("%s, pkt_offset=0x%02x\n",__func__,pxmitframe->pkt_offset); */
/* pkt_offset, unit:8 bytes padding */ /* pkt_offset, unit:8 bytes padding */
if (pxmitframe->pkt_offset > 0) if (pxmitframe->pkt_offset > 0)
@ -348,7 +348,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz , u8 ba
/* offset 20 */ /* offset 20 */
#ifdef CONFIG_USB_TX_AGGREGATION #ifdef CONFIG_USB_TX_AGGREGATION
if (pxmitframe->agg_num > 1) { if (pxmitframe->agg_num > 1) {
/* RTW_INFO("%s agg_num:%d\n",__FUNCTION__,pxmitframe->agg_num ); */ /* RTW_INFO("%s agg_num:%d\n",__func__,pxmitframe->agg_num ); */
ptxdesc->txdw5 |= cpu_to_le32((pxmitframe->agg_num << USB_TXAGG_NUM_SHT) & 0xFF000000); ptxdesc->txdw5 |= cpu_to_le32((pxmitframe->agg_num << USB_TXAGG_NUM_SHT) & 0xFF000000);
} }
#endif #endif
@ -727,12 +727,12 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
if (pxmitbuf == NULL) { if (pxmitbuf == NULL) {
pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv); pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv);
if (pxmitbuf == NULL) { if (pxmitbuf == NULL) {
/* RTW_INFO("%s #1, connot alloc xmitbuf!!!!\n",__FUNCTION__); */ /* RTW_INFO("%s #1, connot alloc xmitbuf!!!!\n",__func__); */
return _FALSE; return _FALSE;
} }
} }
/* RTW_INFO("%s =====================================\n",__FUNCTION__); */ /* RTW_INFO("%s =====================================\n",__func__); */
/* 3 1. pick up first frame */ /* 3 1. pick up first frame */
do { do {
rtw_free_xmitframe(pxmitpriv, pxmitframe); rtw_free_xmitframe(pxmitpriv, pxmitframe);
@ -771,7 +771,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
#endif #endif
if (rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe) == _FALSE) { if (rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe) == _FALSE) {
RTW_INFO("%s coalesce 1st xmitframe failed\n", __FUNCTION__); RTW_INFO("%s coalesce 1st xmitframe failed\n", __func__);
continue; continue;
} }
@ -866,7 +866,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
if (_RND8(pbuf + len) > MAX_XMITBUF_SZ) if (_RND8(pbuf + len) > MAX_XMITBUF_SZ)
/* if (_RND8(pbuf + len) > (MAX_XMITBUF_SZ/2))//to do : for TX TP finial tune , Georgia 2012-0323 */ /* if (_RND8(pbuf + len) > (MAX_XMITBUF_SZ/2))//to do : for TX TP finial tune , Georgia 2012-0323 */
{ {
/* RTW_INFO("%s....len> MAX_XMITBUF_SZ\n",__FUNCTION__); */ /* RTW_INFO("%s....len> MAX_XMITBUF_SZ\n",__func__); */
pxmitframe->agg_num = 1; pxmitframe->agg_num = 1;
pxmitframe->pkt_offset = 1; pxmitframe->pkt_offset = 1;
break; break;
@ -894,7 +894,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
pxmitframe->buf_addr = pxmitbuf->pbuf + pbuf; pxmitframe->buf_addr = pxmitbuf->pbuf + pbuf;
if (rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe) == _FALSE) { if (rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe) == _FALSE) {
RTW_INFO("%s coalesce failed\n", __FUNCTION__); RTW_INFO("%s coalesce failed\n", __func__);
rtw_free_xmitframe(pxmitpriv, pxmitframe); rtw_free_xmitframe(pxmitpriv, pxmitframe);
continue; continue;
} }
@ -973,7 +973,7 @@ agg_end:
/* 3 4. write xmit buffer to USB FIFO */ /* 3 4. write xmit buffer to USB FIFO */
ff_hwaddr = rtw_get_ff_hwaddr(pfirstframe); ff_hwaddr = rtw_get_ff_hwaddr(pfirstframe);
/* RTW_INFO("%s ===================================== write port,buf_size(%d)\n",__FUNCTION__,pbuf_tail); */ /* RTW_INFO("%s ===================================== write port,buf_size(%d)\n",__func__,pbuf_tail); */
/* xmit address == ((xmit_frame*)pxmitbuf->priv_data)->buf_addr */ /* xmit address == ((xmit_frame*)pxmitbuf->priv_data)->buf_addr */
rtw_write_port(padapter, ff_hwaddr, pbuf_tail, (u8 *)pxmitbuf); rtw_write_port(padapter, ff_hwaddr, pbuf_tail, (u8 *)pxmitbuf);
@ -1059,13 +1059,13 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv
static s32 xmitframe_direct(_adapter *padapter, struct xmit_frame *pxmitframe) static s32 xmitframe_direct(_adapter *padapter, struct xmit_frame *pxmitframe)
{ {
s32 res = _SUCCESS; s32 res = _SUCCESS;
/* RTW_INFO("==> %s\n",__FUNCTION__); */ /* RTW_INFO("==> %s\n",__func__); */
res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe); res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe);
if (res == _SUCCESS) if (res == _SUCCESS)
rtw_dump_xframe(padapter, pxmitframe); rtw_dump_xframe(padapter, pxmitframe);
else else
RTW_INFO("==> %s xmitframe_coalsece failed\n", __FUNCTION__); RTW_INFO("==> %s xmitframe_coalsece failed\n", __func__);
return res; return res;
} }
@ -1086,7 +1086,7 @@ static s32 pre_xmitframe(_adapter *padapter, struct xmit_frame *pxmitframe)
_enter_critical_bh(&pxmitpriv->lock, &irqL); _enter_critical_bh(&pxmitpriv->lock, &irqL);
/* RTW_INFO("==> %s\n",__FUNCTION__); */ /* RTW_INFO("==> %s\n",__func__); */
if (rtw_txframes_sta_ac_pending(padapter, pattrib) > 0) { if (rtw_txframes_sta_ac_pending(padapter, pattrib) > 0) {
/* RTW_INFO("enqueue AC(%d)\n",pattrib->priority); */ /* RTW_INFO("enqueue AC(%d)\n",pattrib->priority); */

12
hal/usb_halinit.c
View file

@ -54,7 +54,7 @@ _ConfigNormalChipOutEP_8188E(
break; break;
} }
RTW_INFO("%s OutEpQueueSel(0x%02x), OutEpNumber(%d)\n", __FUNCTION__, pHalData->OutEpQueueSel, pHalData->OutEpNumber); RTW_INFO("%s OutEpQueueSel(0x%02x), OutEpNumber(%d)\n", __func__, pHalData->OutEpQueueSel, pHalData->OutEpNumber);
} }
@ -1014,7 +1014,7 @@ _InitAntenna_Selection(IN PADAPTER Adapter)
if (pHalData->AntDivCfg == 0) if (pHalData->AntDivCfg == 0)
return; return;
RTW_INFO("==> %s ....\n", __FUNCTION__); RTW_INFO("==> %s ....\n", __func__);
rtw_write32(Adapter, REG_LEDCFG0, rtw_read32(Adapter, REG_LEDCFG0) | BIT23); rtw_write32(Adapter, REG_LEDCFG0, rtw_read32(Adapter, REG_LEDCFG0) | BIT23);
phy_set_bb_reg(Adapter, rFPGA0_XAB_RFParameter, BIT13, 0x01); phy_set_bb_reg(Adapter, rFPGA0_XAB_RFParameter, BIT13, 0x01);
@ -1208,7 +1208,7 @@ static u32 rtl8188eu_hal_init(PADAPTER Adapter)
if (Adapter->registrypriv.mp_mode == 0) { if (Adapter->registrypriv.mp_mode == 0) {
status = rtl8188e_FirmwareDownload(Adapter, _FALSE); status = rtl8188e_FirmwareDownload(Adapter, _FALSE);
if (status != _SUCCESS) { if (status != _SUCCESS) {
RTW_INFO("%s: Download Firmware failed!!\n", __FUNCTION__); RTW_INFO("%s: Download Firmware failed!!\n", __func__);
Adapter->bFWReady = _FALSE; Adapter->bFWReady = _FALSE;
pHalData->fw_ractrl = _FALSE; pHalData->fw_ractrl = _FALSE;
return status; return status;
@ -1256,7 +1256,7 @@ static u32 rtl8188eu_hal_init(PADAPTER Adapter)
#if defined(CONFIG_IOL_EFUSE_PATCH) #if defined(CONFIG_IOL_EFUSE_PATCH)
status = rtl8188e_iol_efuse_patch(Adapter); status = rtl8188e_iol_efuse_patch(Adapter);
if (status == _FAIL) { if (status == _FAIL) {
RTW_INFO("%s rtl8188e_iol_efuse_patch failed\n", __FUNCTION__); RTW_INFO("%s rtl8188e_iol_efuse_patch failed\n", __func__);
goto exit; goto exit;
} }
#endif #endif
@ -1466,7 +1466,7 @@ static u32 rtl8188eu_hal_init(PADAPTER Adapter)
exit: exit:
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_END); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_END);
RTW_INFO("%s in %dms\n", __FUNCTION__, rtw_get_passing_time_ms(init_start_time)); RTW_INFO("%s in %dms\n", __func__, rtw_get_passing_time_ms(init_start_time));
#ifdef DBG_HAL_INIT_PROFILING #ifdef DBG_HAL_INIT_PROFILING
hal_init_stages_timestamp[HAL_INIT_STAGES_END] = rtw_get_current_time(); hal_init_stages_timestamp[HAL_INIT_STAGES_END] = rtw_get_current_time();
@ -1587,7 +1587,7 @@ static u32 rtl8188eu_hal_deinit(PADAPTER Adapter)
{ {
struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(Adapter); struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(Adapter);
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter);
RTW_INFO("==> %s\n", __FUNCTION__); RTW_INFO("==> %s\n", __func__);
#ifdef CONFIG_SUPPORT_USB_INT #ifdef CONFIG_SUPPORT_USB_INT
rtw_write32(Adapter, REG_HIMR_88E, IMR_DISABLED_88E); rtw_write32(Adapter, REG_HIMR_88E, IMR_DISABLED_88E);

20
hal/usb_ops_linux.c
View file

@ -30,7 +30,7 @@ void interrupt_handler_8188eu(_adapter *padapter, u16 pkt_len, u8 *pbuf)
struct reportpwrstate_parm pwr_rpt; struct reportpwrstate_parm pwr_rpt;
if (pkt_len != INTERRUPT_MSG_FORMAT_LEN) { if (pkt_len != INTERRUPT_MSG_FORMAT_LEN) {
RTW_INFO("%s Invalid interrupt content length (%d)!\n", __FUNCTION__, pkt_len); RTW_INFO("%s Invalid interrupt content length (%d)!\n", __func__, pkt_len);
return ; return ;
} }
@ -48,7 +48,7 @@ void interrupt_handler_8188eu(_adapter *padapter, u16 pkt_len, u8 *pbuf)
hisr_ex = le32_to_cpu(hisr_ex); hisr_ex = le32_to_cpu(hisr_ex);
if ((hisr != 0) || (hisr_ex != 0)) if ((hisr != 0) || (hisr_ex != 0))
RTW_INFO("===> %s hisr:0x%08x ,hisr_ex:0x%08x\n", __FUNCTION__, hisr, hisr_ex); RTW_INFO("===> %s hisr:0x%08x ,hisr_ex:0x%08x\n", __func__, hisr, hisr_ex);
} }
#endif #endif
@ -91,13 +91,13 @@ void interrupt_handler_8188eu(_adapter *padapter, u16 pkt_len, u8 *pbuf)
#ifdef DBG_CONFIG_ERROR_DETECT_INT #ifdef DBG_CONFIG_ERROR_DETECT_INT
if (pHalData->IntArray[1] & IMR_TXERR_88E) if (pHalData->IntArray[1] & IMR_TXERR_88E)
RTW_INFO("===> %s Tx Error Flag Interrupt Status\n", __FUNCTION__); RTW_INFO("===> %s Tx Error Flag Interrupt Status\n", __func__);
if (pHalData->IntArray[1] & IMR_RXERR_88E) if (pHalData->IntArray[1] & IMR_RXERR_88E)
RTW_INFO("===> %s Rx Error Flag INT Status\n", __FUNCTION__); RTW_INFO("===> %s Rx Error Flag INT Status\n", __func__);
if (pHalData->IntArray[1] & IMR_TXFOVW_88E) if (pHalData->IntArray[1] & IMR_TXFOVW_88E)
RTW_INFO("===> %s Transmit FIFO Overflow\n", __FUNCTION__); RTW_INFO("===> %s Transmit FIFO Overflow\n", __func__);
if (pHalData->IntArray[1] & IMR_RXFOVW_88E) if (pHalData->IntArray[1] & IMR_RXFOVW_88E)
RTW_INFO("===> %s Receive FIFO Overflow\n", __FUNCTION__); RTW_INFO("===> %s Receive FIFO Overflow\n", __func__);
#endif/* DBG_CONFIG_ERROR_DETECT_INT */ #endif/* DBG_CONFIG_ERROR_DETECT_INT */
@ -148,7 +148,7 @@ int recvbuf2recvframe(PADAPTER padapter, void *ptr)
precvframe = rtw_alloc_recvframe(pfree_recv_queue); precvframe = rtw_alloc_recvframe(pfree_recv_queue);
if (precvframe == NULL) { if (precvframe == NULL) {
RTW_INFO("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n", __FUNCTION__, __LINE__); RTW_INFO("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n", __func__, __LINE__);
goto _exit_recvbuf2recvframe; goto _exit_recvbuf2recvframe;
} }
@ -161,7 +161,7 @@ int recvbuf2recvframe(PADAPTER padapter, void *ptr)
pattrib = &precvframe->u.hdr.attrib; pattrib = &precvframe->u.hdr.attrib;
if ((padapter->registrypriv.mp_mode == 0) && ((pattrib->crc_err) || (pattrib->icv_err))) { if ((padapter->registrypriv.mp_mode == 0) && ((pattrib->crc_err) || (pattrib->icv_err))) {
RTW_INFO("%s: RX Warning! crc_err=%d icv_err=%d, skip!\n", __FUNCTION__, pattrib->crc_err, pattrib->icv_err); RTW_INFO("%s: RX Warning! crc_err=%d icv_err=%d, skip!\n", __func__, pattrib->crc_err, pattrib->icv_err);
rtw_free_recvframe(precvframe, pfree_recv_queue); rtw_free_recvframe(precvframe, pfree_recv_queue);
goto _exit_recvbuf2recvframe; goto _exit_recvbuf2recvframe;
} }
@ -171,7 +171,7 @@ int recvbuf2recvframe(PADAPTER padapter, void *ptr)
pattrib->shift_sz + le16_to_cpu(pattrib->pkt_len); pattrib->shift_sz + le16_to_cpu(pattrib->pkt_len);
if ((le16_to_cpu(pattrib->pkt_len) <= 0) || (pkt_offset > transfer_len)) { if ((le16_to_cpu(pattrib->pkt_len) <= 0) || (pkt_offset > transfer_len)) {
RTW_INFO("%s()-%d: RX Warning!,pkt_len<=0 or pkt_offset> transfoer_len\n", __FUNCTION__, __LINE__); RTW_INFO("%s()-%d: RX Warning!,pkt_len<=0 or pkt_offset> transfoer_len\n", __func__, __LINE__);
rtw_free_recvframe(precvframe, pfree_recv_queue); rtw_free_recvframe(precvframe, pfree_recv_queue);
goto _exit_recvbuf2recvframe; goto _exit_recvbuf2recvframe;
} }
@ -222,7 +222,7 @@ int recvbuf2recvframe(PADAPTER padapter, void *ptr)
le32_to_cpu(pattrib->MacIDValidEntry[0]), le32_to_cpu(pattrib->MacIDValidEntry[0]),
le32_to_cpu(pattrib->MacIDValidEntry[1])); le32_to_cpu(pattrib->MacIDValidEntry[1]));
} else if (pattrib->pkt_rpt_type == HIS_REPORT) { } else if (pattrib->pkt_rpt_type == HIS_REPORT) {
/* RTW_INFO("%s , rx USB HISR\n",__FUNCTION__); */ /* RTW_INFO("%s , rx USB HISR\n",__func__); */
#ifdef CONFIG_SUPPORT_USB_INT #ifdef CONFIG_SUPPORT_USB_INT
interrupt_handler_8188eu(padapter, le16_to_cpu(pattrib->pkt_len), precvframe->u.hdr.rx_data); interrupt_handler_8188eu(padapter, le16_to_cpu(pattrib->pkt_len), precvframe->u.hdr.rx_data);
#endif #endif

72
include/osdep_service.h
View file

@ -150,48 +150,48 @@ void dbg_rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *addr, dm
#endif /* CONFIG_USB_HCI */ #endif /* CONFIG_USB_HCI */
#ifdef CONFIG_USE_VMALLOC #ifdef CONFIG_USE_VMALLOC
#define rtw_vmalloc(sz) dbg_rtw_vmalloc((sz), MSTAT_TYPE_VIR, __FUNCTION__, __LINE__) #define rtw_vmalloc(sz) dbg_rtw_vmalloc((sz), MSTAT_TYPE_VIR, __func__, __LINE__)
#define rtw_zvmalloc(sz) dbg_rtw_zvmalloc((sz), MSTAT_TYPE_VIR, __FUNCTION__, __LINE__) #define rtw_zvmalloc(sz) dbg_rtw_zvmalloc((sz), MSTAT_TYPE_VIR, __func__, __LINE__)
#define rtw_vmfree(pbuf, sz) dbg_rtw_vmfree((pbuf), (sz), MSTAT_TYPE_VIR, __FUNCTION__, __LINE__) #define rtw_vmfree(pbuf, sz) dbg_rtw_vmfree((pbuf), (sz), MSTAT_TYPE_VIR, __func__, __LINE__)
#define rtw_vmalloc_f(sz, mstat_f) dbg_rtw_vmalloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_VIR, __FUNCTION__, __LINE__) #define rtw_vmalloc_f(sz, mstat_f) dbg_rtw_vmalloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_VIR, __func__, __LINE__)
#define rtw_zvmalloc_f(sz, mstat_f) dbg_rtw_zvmalloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_VIR, __FUNCTION__, __LINE__) #define rtw_zvmalloc_f(sz, mstat_f) dbg_rtw_zvmalloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_VIR, __func__, __LINE__)
#define rtw_vmfree_f(pbuf, sz, mstat_f) dbg_rtw_vmfree((pbuf), (sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_VIR, __FUNCTION__, __LINE__) #define rtw_vmfree_f(pbuf, sz, mstat_f) dbg_rtw_vmfree((pbuf), (sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_VIR, __func__, __LINE__)
#else /* CONFIG_USE_VMALLOC */ #else /* CONFIG_USE_VMALLOC */
#define rtw_vmalloc(sz) dbg_rtw_malloc((sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_vmalloc(sz) dbg_rtw_malloc((sz), MSTAT_TYPE_PHY, __func__, __LINE__)
#define rtw_zvmalloc(sz) dbg_rtw_zmalloc((sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_zvmalloc(sz) dbg_rtw_zmalloc((sz), MSTAT_TYPE_PHY, __func__, __LINE__)
#define rtw_vmfree(pbuf, sz) dbg_rtw_mfree((pbuf), (sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_vmfree(pbuf, sz) dbg_rtw_mfree((pbuf), (sz), MSTAT_TYPE_PHY, __func__, __LINE__)
#define rtw_vmalloc_f(sz, mstat_f) dbg_rtw_malloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_vmalloc_f(sz, mstat_f) dbg_rtw_malloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __func__, __LINE__)
#define rtw_zvmalloc_f(sz, mstat_f) dbg_rtw_zmalloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_zvmalloc_f(sz, mstat_f) dbg_rtw_zmalloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __func__, __LINE__)
#define rtw_vmfree_f(pbuf, sz, mstat_f) dbg_rtw_mfree((pbuf), (sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_vmfree_f(pbuf, sz, mstat_f) dbg_rtw_mfree((pbuf), (sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __func__, __LINE__)
#endif /* CONFIG_USE_VMALLOC */ #endif /* CONFIG_USE_VMALLOC */
#define rtw_malloc(sz) dbg_rtw_malloc((sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_malloc(sz) dbg_rtw_malloc((sz), MSTAT_TYPE_PHY, __func__, __LINE__)
#define rtw_zmalloc(sz) dbg_rtw_zmalloc((sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_zmalloc(sz) dbg_rtw_zmalloc((sz), MSTAT_TYPE_PHY, __func__, __LINE__)
#define rtw_mfree(pbuf, sz) dbg_rtw_mfree((pbuf), (sz), MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_mfree(pbuf, sz) dbg_rtw_mfree((pbuf), (sz), MSTAT_TYPE_PHY, __func__, __LINE__)
#define rtw_malloc_f(sz, mstat_f) dbg_rtw_malloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_malloc_f(sz, mstat_f) dbg_rtw_malloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __func__, __LINE__)
#define rtw_zmalloc_f(sz, mstat_f) dbg_rtw_zmalloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_zmalloc_f(sz, mstat_f) dbg_rtw_zmalloc((sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __func__, __LINE__)
#define rtw_mfree_f(pbuf, sz, mstat_f) dbg_rtw_mfree((pbuf), (sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __FUNCTION__, __LINE__) #define rtw_mfree_f(pbuf, sz, mstat_f) dbg_rtw_mfree((pbuf), (sz), ((mstat_f) & 0xff00) | MSTAT_TYPE_PHY, __func__, __LINE__)
#define rtw_skb_alloc(size) dbg_rtw_skb_alloc((size), MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) #define rtw_skb_alloc(size) dbg_rtw_skb_alloc((size), MSTAT_TYPE_SKB, __func__, __LINE__)
#define rtw_skb_free(skb) dbg_rtw_skb_free((skb), MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) #define rtw_skb_free(skb) dbg_rtw_skb_free((skb), MSTAT_TYPE_SKB, __func__, __LINE__)
#define rtw_skb_alloc_f(size, mstat_f) dbg_rtw_skb_alloc((size), ((mstat_f) & 0xff00) | MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) #define rtw_skb_alloc_f(size, mstat_f) dbg_rtw_skb_alloc((size), ((mstat_f) & 0xff00) | MSTAT_TYPE_SKB, __func__, __LINE__)
#define rtw_skb_free_f(skb, mstat_f) dbg_rtw_skb_free((skb), ((mstat_f) & 0xff00) | MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) #define rtw_skb_free_f(skb, mstat_f) dbg_rtw_skb_free((skb), ((mstat_f) & 0xff00) | MSTAT_TYPE_SKB, __func__, __LINE__)
#define rtw_skb_copy(skb) dbg_rtw_skb_copy((skb), MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) #define rtw_skb_copy(skb) dbg_rtw_skb_copy((skb), MSTAT_TYPE_SKB, __func__, __LINE__)
#define rtw_skb_clone(skb) dbg_rtw_skb_clone((skb), MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) #define rtw_skb_clone(skb) dbg_rtw_skb_clone((skb), MSTAT_TYPE_SKB, __func__, __LINE__)
#define rtw_skb_copy_f(skb, mstat_f) dbg_rtw_skb_copy((skb), ((mstat_f) & 0xff00) | MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) #define rtw_skb_copy_f(skb, mstat_f) dbg_rtw_skb_copy((skb), ((mstat_f) & 0xff00) | MSTAT_TYPE_SKB, __func__, __LINE__)
#define rtw_skb_clone_f(skb, mstat_f) dbg_rtw_skb_clone((skb), ((mstat_f) & 0xff00) | MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) #define rtw_skb_clone_f(skb, mstat_f) dbg_rtw_skb_clone((skb), ((mstat_f) & 0xff00) | MSTAT_TYPE_SKB, __func__, __LINE__)
#define rtw_netif_rx(ndev, skb) dbg_rtw_netif_rx(ndev, skb, MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) #define rtw_netif_rx(ndev, skb) dbg_rtw_netif_rx(ndev, skb, MSTAT_TYPE_SKB, __func__, __LINE__)
#ifdef CONFIG_RTW_NAPI #ifdef CONFIG_RTW_NAPI
#define rtw_netif_receive_skb(ndev, skb) dbg_rtw_netif_receive_skb(ndev, skb, MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) #define rtw_netif_receive_skb(ndev, skb) dbg_rtw_netif_receive_skb(ndev, skb, MSTAT_TYPE_SKB, __func__, __LINE__)
#ifdef CONFIG_RTW_GRO #ifdef CONFIG_RTW_GRO
#define rtw_napi_gro_receive(napi, skb) dbg_rtw_napi_gro_receive(napi, skb, MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) #define rtw_napi_gro_receive(napi, skb) dbg_rtw_napi_gro_receive(napi, skb, MSTAT_TYPE_SKB, __func__, __LINE__)
#endif #endif
#endif /* CONFIG_RTW_NAPI */ #endif /* CONFIG_RTW_NAPI */
#define rtw_skb_queue_purge(sk_buff_head) dbg_rtw_skb_queue_purge(sk_buff_head, MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) #define rtw_skb_queue_purge(sk_buff_head) dbg_rtw_skb_queue_purge(sk_buff_head, MSTAT_TYPE_SKB, __func__, __LINE__)
#ifdef CONFIG_USB_HCI #ifdef CONFIG_USB_HCI
#define rtw_usb_buffer_alloc(dev, size, dma) dbg_rtw_usb_buffer_alloc((dev), (size), (dma), MSTAT_TYPE_USB, __FUNCTION__, __LINE__) #define rtw_usb_buffer_alloc(dev, size, dma) dbg_rtw_usb_buffer_alloc((dev), (size), (dma), MSTAT_TYPE_USB, __func__, __LINE__)
#define rtw_usb_buffer_free(dev, size, addr, dma) dbg_rtw_usb_buffer_free((dev), (size), (addr), (dma), MSTAT_TYPE_USB, __FUNCTION__, __LINE__) #define rtw_usb_buffer_free(dev, size, addr, dma) dbg_rtw_usb_buffer_free((dev), (size), (addr), (dma), MSTAT_TYPE_USB, __func__, __LINE__)
#define rtw_usb_buffer_alloc_f(dev, size, dma, mstat_f) dbg_rtw_usb_buffer_alloc((dev), (size), (dma), ((mstat_f) & 0xff00) | MSTAT_TYPE_USB, __FUNCTION__, __LINE__) #define rtw_usb_buffer_alloc_f(dev, size, dma, mstat_f) dbg_rtw_usb_buffer_alloc((dev), (size), (dma), ((mstat_f) & 0xff00) | MSTAT_TYPE_USB, __func__, __LINE__)
#define rtw_usb_buffer_free_f(dev, size, addr, dma, mstat_f) dbg_rtw_usb_buffer_free((dev), (size), (addr), (dma), ((mstat_f) & 0xff00) | MSTAT_TYPE_USB, __FUNCTION__, __LINE__) #define rtw_usb_buffer_free_f(dev, size, addr, dma, mstat_f) dbg_rtw_usb_buffer_free((dev), (size), (addr), (dma), ((mstat_f) & 0xff00) | MSTAT_TYPE_USB, __func__, __LINE__)
#endif /* CONFIG_USB_HCI */ #endif /* CONFIG_USB_HCI */
#else /* DBG_MEM_ALLOC */ #else /* DBG_MEM_ALLOC */
@ -313,8 +313,8 @@ extern void rtw_usleep_os(int us);
extern u32 rtw_atoi(u8 *s); extern u32 rtw_atoi(u8 *s);
#ifdef DBG_DELAY_OS #ifdef DBG_DELAY_OS
#define rtw_mdelay_os(ms) _rtw_mdelay_os((ms), __FUNCTION__, __LINE__) #define rtw_mdelay_os(ms) _rtw_mdelay_os((ms), __func__, __LINE__)
#define rtw_udelay_os(ms) _rtw_udelay_os((ms), __FUNCTION__, __LINE__) #define rtw_udelay_os(ms) _rtw_udelay_os((ms), __func__, __LINE__)
extern void _rtw_mdelay_os(int ms, const char *func, const int line); extern void _rtw_mdelay_os(int ms, const char *func, const int line);
extern void _rtw_udelay_os(int us, const char *func, const int line); extern void _rtw_udelay_os(int us, const char *func, const int line);
#else #else

14
include/rtw_io.h
View file

@ -374,17 +374,17 @@ int dbg_rtw_sd_iwrite32(_adapter *adapter, u32 addr, u32 val, const char *caller
#endif /* CONFIG_SDIO_INDIRECT_ACCESS */ #endif /* CONFIG_SDIO_INDIRECT_ACCESS */
#endif /* CONFIG_SDIO_HCI */ #endif /* CONFIG_SDIO_HCI */
#define rtw_read8(adapter, addr) dbg_rtw_read8((adapter), (addr), __FUNCTION__, __LINE__) #define rtw_read8(adapter, addr) dbg_rtw_read8((adapter), (addr), __func__, __LINE__)
#define rtw_read16(adapter, addr) dbg_rtw_read16((adapter), (addr), __FUNCTION__, __LINE__) #define rtw_read16(adapter, addr) dbg_rtw_read16((adapter), (addr), __func__, __LINE__)
#define rtw_read32(adapter, addr) dbg_rtw_read32((adapter), (addr), __FUNCTION__, __LINE__) #define rtw_read32(adapter, addr) dbg_rtw_read32((adapter), (addr), __func__, __LINE__)
#define rtw_read_mem(adapter, addr, cnt, mem) _rtw_read_mem((adapter), (addr), (cnt), (mem)) #define rtw_read_mem(adapter, addr, cnt, mem) _rtw_read_mem((adapter), (addr), (cnt), (mem))
#define rtw_read_port(adapter, addr, cnt, mem) _rtw_read_port((adapter), (addr), (cnt), (mem)) #define rtw_read_port(adapter, addr, cnt, mem) _rtw_read_port((adapter), (addr), (cnt), (mem))
#define rtw_read_port_cancel(adapter) _rtw_read_port_cancel((adapter)) #define rtw_read_port_cancel(adapter) _rtw_read_port_cancel((adapter))
#define rtw_write8(adapter, addr, val) dbg_rtw_write8((adapter), (addr), (val), __FUNCTION__, __LINE__) #define rtw_write8(adapter, addr, val) dbg_rtw_write8((adapter), (addr), (val), __func__, __LINE__)
#define rtw_write16(adapter, addr, val) dbg_rtw_write16((adapter), (addr), (val), __FUNCTION__, __LINE__) #define rtw_write16(adapter, addr, val) dbg_rtw_write16((adapter), (addr), (val), __func__, __LINE__)
#define rtw_write32(adapter, addr, val) dbg_rtw_write32((adapter), (addr), (val), __FUNCTION__, __LINE__) #define rtw_write32(adapter, addr, val) dbg_rtw_write32((adapter), (addr), (val), __func__, __LINE__)
#define rtw_writeN(adapter, addr, length, data) dbg_rtw_writeN((adapter), (addr), (length), (data), __FUNCTION__, __LINE__) #define rtw_writeN(adapter, addr, length, data) dbg_rtw_writeN((adapter), (addr), (length), (data), __func__, __LINE__)
#define rtw_write8_async(adapter, addr, val) _rtw_write8_async((adapter), (addr), (val)) #define rtw_write8_async(adapter, addr, val) _rtw_write8_async((adapter), (addr), (val))
#define rtw_write16_async(adapter, addr, val) _rtw_write16_async((adapter), (addr), (val)) #define rtw_write16_async(adapter, addr, val) _rtw_write16_async((adapter), (addr), (val))

6
include/rtw_iol.h
View file

@ -121,9 +121,9 @@ int rtw_IOL_exec_empty_cmds_sync(ADAPTER *adapter, u32 max_wating_ms);
int dbg_rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, const char *caller, const int line); int dbg_rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, const char *caller, const int line);
int dbg_rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, const char *caller, const int line); int dbg_rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, const char *caller, const int line);
int dbg_rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value, const char *caller, const int line); int dbg_rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value, const char *caller, const int line);
#define rtw_IOL_append_WB_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WB_cmd((xmit_frame), (addr), (value), __FUNCTION__, __LINE__) #define rtw_IOL_append_WB_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WB_cmd((xmit_frame), (addr), (value), __func__, __LINE__)
#define rtw_IOL_append_WW_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WW_cmd((xmit_frame), (addr), (value), __FUNCTION__, __LINE__) #define rtw_IOL_append_WW_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WW_cmd((xmit_frame), (addr), (value), __func__, __LINE__)
#define rtw_IOL_append_WD_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WD_cmd((xmit_frame), (addr), (value), __FUNCTION__, __LINE__) #define rtw_IOL_append_WD_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WD_cmd((xmit_frame), (addr), (value), __func__, __LINE__)
#else #else
#define rtw_IOL_append_WB_cmd(xmit_frame, addr, value) _rtw_IOL_append_WB_cmd((xmit_frame), (addr), (value)) #define rtw_IOL_append_WB_cmd(xmit_frame, addr, value) _rtw_IOL_append_WB_cmd((xmit_frame), (addr), (value))
#define rtw_IOL_append_WW_cmd(xmit_frame, addr, value) _rtw_IOL_append_WW_cmd((xmit_frame), (addr), (value)) #define rtw_IOL_append_WW_cmd(xmit_frame, addr, value) _rtw_IOL_append_WW_cmd((xmit_frame), (addr), (value))

2
include/rtw_mlme.h
View file

@ -853,7 +853,7 @@ struct mlme_priv {
#define mlme_set_scan_to_timer(mlme, ms) \ #define mlme_set_scan_to_timer(mlme, ms) \
do { \ do { \
/* RTW_INFO("%s set_scan_to_timer(%p, %d)\n", __FUNCTION__, (mlme), (ms)); */ \ /* RTW_INFO("%s set_scan_to_timer(%p, %d)\n", __func__, (mlme), (ms)); */ \
_set_timer(&(mlme)->scan_to_timer, (ms)); \ _set_timer(&(mlme)->scan_to_timer, (ms)); \
} while (0) } while (0)

4
include/rtw_mlme_ext.h
View file

@ -1030,13 +1030,13 @@ void reassoc_timer_hdl(_adapter *padapter);
#define set_survey_timer(mlmeext, ms) \ #define set_survey_timer(mlmeext, ms) \
do { \ do { \
/*RTW_INFO("%s set_survey_timer(%p, %d)\n", __FUNCTION__, (mlmeext), (ms));*/ \ /*RTW_INFO("%s set_survey_timer(%p, %d)\n", __func__, (mlmeext), (ms));*/ \
_set_timer(&(mlmeext)->survey_timer, (ms)); \ _set_timer(&(mlmeext)->survey_timer, (ms)); \
} while (0) } while (0)
#define set_link_timer(mlmeext, ms) \ #define set_link_timer(mlmeext, ms) \
do { \ do { \
/*RTW_INFO("%s set_link_timer(%p, %d)\n", __FUNCTION__, (mlmeext), (ms));*/ \ /*RTW_INFO("%s set_link_timer(%p, %d)\n", __func__, (mlmeext), (ms));*/ \
_set_timer(&(mlmeext)->link_timer, (ms)); \ _set_timer(&(mlmeext)->link_timer, (ms)); \
} while (0) } while (0)

8
include/rtw_p2p.h
View file

@ -137,10 +137,10 @@ void dbg_rtw_p2p_set_state(struct wifidirect_info *wdinfo, enum P2P_STATE state,
void dbg_rtw_p2p_set_pre_state(struct wifidirect_info *wdinfo, enum P2P_STATE state, const char *caller, int line); void dbg_rtw_p2p_set_pre_state(struct wifidirect_info *wdinfo, enum P2P_STATE state, const char *caller, int line);
/* void dbg_rtw_p2p_restore_state(struct wifidirect_info *wdinfo, const char *caller, int line); */ /* void dbg_rtw_p2p_restore_state(struct wifidirect_info *wdinfo, const char *caller, int line); */
void dbg_rtw_p2p_set_role(struct wifidirect_info *wdinfo, enum P2P_ROLE role, const char *caller, int line); void dbg_rtw_p2p_set_role(struct wifidirect_info *wdinfo, enum P2P_ROLE role, const char *caller, int line);
#define rtw_p2p_set_state(wdinfo, state) dbg_rtw_p2p_set_state(wdinfo, state, __FUNCTION__, __LINE__) #define rtw_p2p_set_state(wdinfo, state) dbg_rtw_p2p_set_state(wdinfo, state, __func__, __LINE__)
#define rtw_p2p_set_pre_state(wdinfo, state) dbg_rtw_p2p_set_pre_state(wdinfo, state, __FUNCTION__, __LINE__) #define rtw_p2p_set_pre_state(wdinfo, state) dbg_rtw_p2p_set_pre_state(wdinfo, state, __func__, __LINE__)
#define rtw_p2p_set_role(wdinfo, role) dbg_rtw_p2p_set_role(wdinfo, role, __FUNCTION__, __LINE__) #define rtw_p2p_set_role(wdinfo, role) dbg_rtw_p2p_set_role(wdinfo, role, __func__, __LINE__)
/* #define rtw_p2p_restore_state(wdinfo) dbg_rtw_p2p_restore_state(wdinfo, __FUNCTION__, __LINE__) */ /* #define rtw_p2p_restore_state(wdinfo) dbg_rtw_p2p_restore_state(wdinfo, __func__, __LINE__) */
#else /* CONFIG_DBG_P2P */ #else /* CONFIG_DBG_P2P */
#define rtw_p2p_set_state(wdinfo, state) _rtw_p2p_set_state(wdinfo, state) #define rtw_p2p_set_state(wdinfo, state) _rtw_p2p_set_state(wdinfo, state)
#define rtw_p2p_set_pre_state(wdinfo, state) _rtw_p2p_set_pre_state(wdinfo, state) #define rtw_p2p_set_pre_state(wdinfo, state) _rtw_p2p_set_pre_state(wdinfo, state)

6
include/rtw_pwrctrl.h
View file

@ -461,7 +461,7 @@ struct pwrctrl_priv {
#define _rtw_set_pwr_state_check_timer(pwrctl, ms) \ #define _rtw_set_pwr_state_check_timer(pwrctl, ms) \
do { \ do { \
/*RTW_INFO("%s _rtw_set_pwr_state_check_timer(%p, %d)\n", __FUNCTION__, (pwrctl), (ms));*/ \ /*RTW_INFO("%s _rtw_set_pwr_state_check_timer(%p, %d)\n", __func__, (pwrctl), (ms));*/ \
_set_timer(&(pwrctl)->pwr_state_check_timer, (ms)); \ _set_timer(&(pwrctl)->pwr_state_check_timer, (ms)); \
} while (0) } while (0)
@ -538,8 +538,8 @@ void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv);
u8 rtw_interface_ps_func(_adapter *padapter, HAL_INTF_PS_FUNC efunc_id, u8 *val); u8 rtw_interface_ps_func(_adapter *padapter, HAL_INTF_PS_FUNC efunc_id, u8 *val);
void rtw_set_ips_deny(_adapter *padapter, u32 ms); void rtw_set_ips_deny(_adapter *padapter, u32 ms);
int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller); int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller);
#define rtw_pwr_wakeup(adapter) _rtw_pwr_wakeup(adapter, RTW_PWR_STATE_CHK_INTERVAL, __FUNCTION__) #define rtw_pwr_wakeup(adapter) _rtw_pwr_wakeup(adapter, RTW_PWR_STATE_CHK_INTERVAL, __func__)
#define rtw_pwr_wakeup_ex(adapter, ips_deffer_ms) _rtw_pwr_wakeup(adapter, ips_deffer_ms, __FUNCTION__) #define rtw_pwr_wakeup_ex(adapter, ips_deffer_ms) _rtw_pwr_wakeup(adapter, ips_deffer_ms, __func__)
int rtw_pm_set_ips(_adapter *padapter, u8 mode); int rtw_pm_set_ips(_adapter *padapter, u8 mode);
int rtw_pm_set_lps(_adapter *padapter, u8 mode); int rtw_pm_set_lps(_adapter *padapter, u8 mode);

4
include/rtw_wapi.h
View file

@ -40,14 +40,14 @@ static inline void dump_buf(u8 *buf, u32 len)
if (!(_Exp)) { \ if (!(_Exp)) { \
printk("RTWLAN: "); \ printk("RTWLAN: "); \
printk("Assertion failed! %s,%s, line=%d\n", \ printk("Assertion failed! %s,%s, line=%d\n", \
#_Exp, __FUNCTION__, __LINE__); \ #_Exp, __func__, __LINE__); \
return; \ return; \
} }
#define RT_ASSERT_RET_VALUE(_Exp, Ret) \ #define RT_ASSERT_RET_VALUE(_Exp, Ret) \
if (!(_Exp)) { \ if (!(_Exp)) { \
printk("RTWLAN: "); \ printk("RTWLAN: "); \
printk("Assertion failed! %s,%s, line=%d\n", \ printk("Assertion failed! %s,%s, line=%d\n", \
#_Exp, __FUNCTION__, __LINE__); \ #_Exp, __func__, __LINE__); \
return Ret; \ return Ret; \
} }

87
os_dep/custom_gpio_linux.c
View file

@ -28,10 +28,8 @@
#if !(defined ANDROID_2X) #if !(defined ANDROID_2X)
#ifdef CONFIG_RTL8188E
#include <mach/regulator.h> #include <mach/regulator.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#endif /* CONFIG_RTL8188E */
#ifndef GPIO_WIFI_POWER #ifndef GPIO_WIFI_POWER
#define GPIO_WIFI_POWER -1 #define GPIO_WIFI_POWER -1
@ -70,15 +68,6 @@ int rtw_wifi_gpio_init(void)
if (GPIO_WIFI_POWER > 0) if (GPIO_WIFI_POWER > 0)
gpio_request(GPIO_WIFI_POWER, "wifi_power"); gpio_request(GPIO_WIFI_POWER, "wifi_power");
#ifdef CONFIG_SDIO_HCI
#if (defined(CONFIG_RTL8723B)) && (MP_DRIVER == 1)
if (rtw_mp_mode == 1) {
RTW_INFO("%s GPIO_BT_RESET pin special for mp_test\n", __func__);
if (GPIO_BT_RESET > 0)
gpio_request(GPIO_BT_RESET , "bt_rst");
}
#endif
#endif
return 0; return 0;
} }
@ -93,15 +82,6 @@ int rtw_wifi_gpio_deinit(void)
if (GPIO_WIFI_POWER > 0) if (GPIO_WIFI_POWER > 0)
gpio_free(GPIO_WIFI_POWER); gpio_free(GPIO_WIFI_POWER);
#ifdef CONFIG_SDIO_HCI
#if (defined(CONFIG_RTL8723B)) && (MP_DRIVER == 1)
if (rtw_mp_mode == 1) {
RTW_INFO("%s GPIO_BT_RESET pin special for mp_test\n", __func__);
if (GPIO_BT_RESET > 0)
gpio_free(GPIO_BT_RESET);
}
#endif
#endif
return 0; return 0;
} }
@ -111,7 +91,7 @@ void rtw_wifi_gpio_wlan_ctrl(int onoff)
switch (onoff) { switch (onoff) {
case WLAN_PWDN_OFF: case WLAN_PWDN_OFF:
RTW_INFO("%s: call customer specific GPIO(%d) to set wifi power down pin to 0\n", RTW_INFO("%s: call customer specific GPIO(%d) to set wifi power down pin to 0\n",
__FUNCTION__, GPIO_WIFI_RESET); __func__, GPIO_WIFI_RESET);
#ifndef CONFIG_DONT_BUS_SCAN #ifndef CONFIG_DONT_BUS_SCAN
if (GPIO_WIFI_RESET > 0) if (GPIO_WIFI_RESET > 0)
@ -121,7 +101,7 @@ void rtw_wifi_gpio_wlan_ctrl(int onoff)
case WLAN_PWDN_ON: case WLAN_PWDN_ON:
RTW_INFO("%s: callc customer specific GPIO(%d) to set wifi power down pin to 1\n", RTW_INFO("%s: callc customer specific GPIO(%d) to set wifi power down pin to 1\n",
__FUNCTION__, GPIO_WIFI_RESET); __func__, GPIO_WIFI_RESET);
if (GPIO_WIFI_RESET > 0) if (GPIO_WIFI_RESET > 0)
gpio_direction_output(GPIO_WIFI_RESET , 1); gpio_direction_output(GPIO_WIFI_RESET , 1);
@ -132,28 +112,6 @@ void rtw_wifi_gpio_wlan_ctrl(int onoff)
case WLAN_POWER_ON: case WLAN_POWER_ON:
break; break;
#ifdef CONFIG_SDIO_HCI
#if (defined(CONFIG_RTL8723B)) && (MP_DRIVER == 1)
case WLAN_BT_PWDN_OFF:
if (rtw_mp_mode == 1) {
RTW_INFO("%s: call customer specific GPIO to set wifi power down pin to 0\n",
__FUNCTION__);
if (GPIO_BT_RESET > 0)
gpio_direction_output(GPIO_BT_RESET , 0);
}
break;
case WLAN_BT_PWDN_ON:
if (rtw_mp_mode == 1) {
RTW_INFO("%s: callc customer specific GPIO to set wifi power down pin to 1 %x\n",
__FUNCTION__, GPIO_BT_RESET);
if (GPIO_BT_RESET > 0)
gpio_direction_output(GPIO_BT_RESET , 1);
}
break;
#endif
#endif
} }
} }
@ -161,21 +119,11 @@ void rtw_wifi_gpio_wlan_ctrl(int onoff)
#include <mach/ldo.h> #include <mach/ldo.h>
#ifdef CONFIG_RTL8188E
extern int sprd_3rdparty_gpio_wifi_power; extern int sprd_3rdparty_gpio_wifi_power;
#endif
extern int sprd_3rdparty_gpio_wifi_pwd; extern int sprd_3rdparty_gpio_wifi_pwd;
#if defined(CONFIG_RTL8723B)
extern int sprd_3rdparty_gpio_bt_reset;
#endif
int rtw_wifi_gpio_init(void) int rtw_wifi_gpio_init(void)
{ {
#if defined(CONFIG_RTL8723B)
if (sprd_3rdparty_gpio_bt_reset > 0)
gpio_direction_output(sprd_3rdparty_gpio_bt_reset, 1);
#endif
return 0; return 0;
} }
@ -190,7 +138,7 @@ void rtw_wifi_gpio_wlan_ctrl(int onoff)
switch (onoff) { switch (onoff) {
case WLAN_PWDN_OFF: case WLAN_PWDN_OFF:
RTW_INFO("%s: call customer specific GPIO to set wifi power down pin to 0\n", RTW_INFO("%s: call customer specific GPIO to set wifi power down pin to 0\n",
__FUNCTION__); __func__);
if (sprd_3rdparty_gpio_wifi_pwd > 0) if (sprd_3rdparty_gpio_wifi_pwd > 0)
gpio_set_value(sprd_3rdparty_gpio_wifi_pwd, 0); gpio_set_value(sprd_3rdparty_gpio_wifi_pwd, 0);
@ -202,7 +150,7 @@ void rtw_wifi_gpio_wlan_ctrl(int onoff)
case WLAN_PWDN_ON: case WLAN_PWDN_ON:
RTW_INFO("%s: callc customer specific GPIO to set wifi power down pin to 1\n", RTW_INFO("%s: callc customer specific GPIO to set wifi power down pin to 1\n",
__FUNCTION__); __func__);
if (sprd_3rdparty_gpio_wifi_pwd == 60) { if (sprd_3rdparty_gpio_wifi_pwd == 60) {
RTW_INFO("%s: turn on VSIM2 2.8V\n", __func__); RTW_INFO("%s: turn on VSIM2 2.8V\n", __func__);
LDO_SetVoltLevel(LDO_LDO_SIM2, LDO_VOLT_LEVEL0); LDO_SetVoltLevel(LDO_LDO_SIM2, LDO_VOLT_LEVEL0);
@ -213,30 +161,27 @@ void rtw_wifi_gpio_wlan_ctrl(int onoff)
break; break;
case WLAN_POWER_OFF: case WLAN_POWER_OFF:
#ifdef CONFIG_RTL8188E
#ifdef CONFIG_WIF1_LDO #ifdef CONFIG_WIF1_LDO
RTW_INFO("%s: turn off VDD-WIFI0 1.2V\n", __FUNCTION__); RTW_INFO("%s: turn off VDD-WIFI0 1.2V\n", __func__);
LDO_TurnOffLDO(LDO_LDO_WIF1); LDO_TurnOffLDO(LDO_LDO_WIF1);
#endif /* CONFIG_WIF1_LDO */ #endif /* CONFIG_WIF1_LDO */
RTW_INFO("%s: turn off VDD-WIFI0 3.3V\n", __FUNCTION__); RTW_INFO("%s: turn off VDD-WIFI0 3.3V\n", __func__);
LDO_TurnOffLDO(LDO_LDO_WIF0); LDO_TurnOffLDO(LDO_LDO_WIF0);
RTW_INFO("%s: call customer specific GPIO(%d) to turn off wifi power\n", RTW_INFO("%s: call customer specific GPIO(%d) to turn off wifi power\n",
__FUNCTION__, sprd_3rdparty_gpio_wifi_power); __func__, sprd_3rdparty_gpio_wifi_power);
if (sprd_3rdparty_gpio_wifi_power != 65535) if (sprd_3rdparty_gpio_wifi_power != 65535)
gpio_set_value(sprd_3rdparty_gpio_wifi_power, 0); gpio_set_value(sprd_3rdparty_gpio_wifi_power, 0);
#endif
break; break;
case WLAN_POWER_ON: case WLAN_POWER_ON:
#ifdef CONFIG_RTL8188E
RTW_INFO("%s: call customer specific GPIO(%d) to turn on wifi power\n", RTW_INFO("%s: call customer specific GPIO(%d) to turn on wifi power\n",
__FUNCTION__, sprd_3rdparty_gpio_wifi_power); __func__, sprd_3rdparty_gpio_wifi_power);
if (sprd_3rdparty_gpio_wifi_power != 65535) if (sprd_3rdparty_gpio_wifi_power != 65535)
gpio_set_value(sprd_3rdparty_gpio_wifi_power, 1); gpio_set_value(sprd_3rdparty_gpio_wifi_power, 1);
RTW_INFO("%s: turn on VDD-WIFI0 3.3V\n", __FUNCTION__); RTW_INFO("%s: turn on VDD-WIFI0 3.3V\n", __func__);
LDO_TurnOnLDO(LDO_LDO_WIF0); LDO_TurnOnLDO(LDO_LDO_WIF0);
LDO_SetVoltLevel(LDO_LDO_WIF0, LDO_VOLT_LEVEL1); LDO_SetVoltLevel(LDO_LDO_WIF0, LDO_VOLT_LEVEL1);
@ -245,25 +190,15 @@ void rtw_wifi_gpio_wlan_ctrl(int onoff)
LDO_TurnOnLDO(LDO_LDO_WIF1); LDO_TurnOnLDO(LDO_LDO_WIF1);
LDO_SetVoltLevel(LDO_LDO_WIF1, LDO_VOLT_LEVEL3); LDO_SetVoltLevel(LDO_LDO_WIF1, LDO_VOLT_LEVEL3);
#endif /* CONFIG_WIF1_LDO */ #endif /* CONFIG_WIF1_LDO */
#endif
break; break;
case WLAN_BT_PWDN_OFF: case WLAN_BT_PWDN_OFF:
RTW_INFO("%s: call customer specific GPIO to set bt power down pin to 0\n", RTW_INFO("%s: call customer specific GPIO to set bt power down pin to 0\n",
__FUNCTION__); __func__);
#if defined(CONFIG_RTL8723B)
if (sprd_3rdparty_gpio_bt_reset > 0)
gpio_set_value(sprd_3rdparty_gpio_bt_reset, 0);
#endif
break; break;
case WLAN_BT_PWDN_ON: case WLAN_BT_PWDN_ON:
RTW_INFO("%s: callc customer specific GPIO to set bt power down pin to 1\n", RTW_INFO("%s: callc customer specific GPIO to set bt power down pin to 1\n",
__FUNCTION__); __func__);
#if defined(CONFIG_RTL8723B)
if (sprd_3rdparty_gpio_bt_reset > 0)
gpio_set_value(sprd_3rdparty_gpio_bt_reset, 1);
#endif
break; break;
} }
} }

72
os_dep/ioctl_cfg80211.c
View file

@ -423,7 +423,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(_adapter *padapter, struct wlan_net
pbuf = rtw_zmalloc(buf_size); pbuf = rtw_zmalloc(buf_size);
if (pbuf == NULL) { if (pbuf == NULL) {
RTW_INFO("%s pbuf allocate failed !!\n", __FUNCTION__); RTW_INFO("%s pbuf allocate failed !!\n", __func__);
return bss; return bss;
} }
@ -431,7 +431,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(_adapter *padapter, struct wlan_net
bssinf_len = pnetwork->network.IELength + sizeof(struct rtw_ieee80211_hdr_3addr); bssinf_len = pnetwork->network.IELength + sizeof(struct rtw_ieee80211_hdr_3addr);
if (bssinf_len > buf_size) { if (bssinf_len > buf_size) {
RTW_INFO("%s IE Length too long > %zu byte\n", __FUNCTION__, buf_size); RTW_INFO("%s IE Length too long > %zu byte\n", __func__, buf_size);
goto exit; goto exit;
} }
@ -441,7 +441,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(_adapter *padapter, struct wlan_net
if (rtw_get_wapi_ie(pnetwork->network.IEs, pnetwork->network.IELength, NULL, &wapi_len) > 0) { if (rtw_get_wapi_ie(pnetwork->network.IEs, pnetwork->network.IELength, NULL, &wapi_len) > 0) {
if (wapi_len > 0) { if (wapi_len > 0) {
RTW_INFO("%s, no support wapi!\n", __FUNCTION__); RTW_INFO("%s, no support wapi!\n", __func__);
goto exit; goto exit;
} }
} }
@ -878,7 +878,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
struct security_priv *psecuritypriv = &(padapter->securitypriv); struct security_priv *psecuritypriv = &(padapter->securitypriv);
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
param->u.crypt.err = 0; param->u.crypt.err = 0;
param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0'; param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0';
@ -965,7 +965,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
if (!psta && check_fwstate(pmlmepriv, WIFI_AP_STATE)) { /* group key */ if (!psta && check_fwstate(pmlmepriv, WIFI_AP_STATE)) { /* group key */
if (param->u.crypt.set_tx == 0) { /* group key */ if (param->u.crypt.set_tx == 0) { /* group key */
if (strcmp(param->u.crypt.alg, "WEP") == 0) { if (strcmp(param->u.crypt.alg, "WEP") == 0) {
RTW_INFO("%s, set group_key, WEP\n", __FUNCTION__); RTW_INFO("%s, set group_key, WEP\n", __func__);
_rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len > 16 ? 16 : param->u.crypt.key_len)); _rtw_memcpy(psecuritypriv->dot118021XGrpKey[param->u.crypt.idx].skey, param->u.crypt.key, (param->u.crypt.key_len > 16 ? 16 : param->u.crypt.key_len));
@ -974,7 +974,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
psecuritypriv->dot118021XGrpPrivacy = _WEP104_; psecuritypriv->dot118021XGrpPrivacy = _WEP104_;
} else if (strcmp(param->u.crypt.alg, "TKIP") == 0) { } else if (strcmp(param->u.crypt.alg, "TKIP") == 0) {
RTW_INFO("%s, set group_key, TKIP\n", __FUNCTION__); RTW_INFO("%s, set group_key, TKIP\n", __func__);
psecuritypriv->dot118021XGrpPrivacy = _TKIP_; psecuritypriv->dot118021XGrpPrivacy = _TKIP_;
@ -988,7 +988,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
psecuritypriv->busetkipkey = _TRUE; psecuritypriv->busetkipkey = _TRUE;
} else if (strcmp(param->u.crypt.alg, "CCMP") == 0) { } else if (strcmp(param->u.crypt.alg, "CCMP") == 0) {
RTW_INFO("%s, set group_key, CCMP\n", __FUNCTION__); RTW_INFO("%s, set group_key, CCMP\n", __func__);
psecuritypriv->dot118021XGrpPrivacy = _AES_; psecuritypriv->dot118021XGrpPrivacy = _AES_;
@ -1012,7 +1012,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
} }
#endif /* CONFIG_IEEE80211W */ #endif /* CONFIG_IEEE80211W */
else { else {
RTW_INFO("%s, set group_key, none\n", __FUNCTION__); RTW_INFO("%s, set group_key, none\n", __func__);
psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_; psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_;
} }
@ -1043,13 +1043,13 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
_rtw_memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len > 16 ? 16 : param->u.crypt.key_len)); _rtw_memcpy(psta->dot118021x_UncstKey.skey, param->u.crypt.key, (param->u.crypt.key_len > 16 ? 16 : param->u.crypt.key_len));
if (strcmp(param->u.crypt.alg, "WEP") == 0) { if (strcmp(param->u.crypt.alg, "WEP") == 0) {
RTW_INFO("%s, set pairwise key, WEP\n", __FUNCTION__); RTW_INFO("%s, set pairwise key, WEP\n", __func__);
psta->dot118021XPrivacy = _WEP40_; psta->dot118021XPrivacy = _WEP40_;
if (param->u.crypt.key_len == 13) if (param->u.crypt.key_len == 13)
psta->dot118021XPrivacy = _WEP104_; psta->dot118021XPrivacy = _WEP104_;
} else if (strcmp(param->u.crypt.alg, "TKIP") == 0) { } else if (strcmp(param->u.crypt.alg, "TKIP") == 0) {
RTW_INFO("%s, set pairwise key, TKIP\n", __FUNCTION__); RTW_INFO("%s, set pairwise key, TKIP\n", __func__);
psta->dot118021XPrivacy = _TKIP_; psta->dot118021XPrivacy = _TKIP_;
@ -1062,11 +1062,11 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa
} else if (strcmp(param->u.crypt.alg, "CCMP") == 0) { } else if (strcmp(param->u.crypt.alg, "CCMP") == 0) {
RTW_INFO("%s, set pairwise key, CCMP\n", __FUNCTION__); RTW_INFO("%s, set pairwise key, CCMP\n", __func__);
psta->dot118021XPrivacy = _AES_; psta->dot118021XPrivacy = _AES_;
} else { } else {
RTW_INFO("%s, set pairwise key, none\n", __FUNCTION__); RTW_INFO("%s, set pairwise key, none\n", __func__);
psta->dot118021XPrivacy = _NO_PRIVACY_; psta->dot118021XPrivacy = _NO_PRIVACY_;
} }
@ -1911,7 +1911,7 @@ void rtw_cfg80211_indicate_scan_done(_adapter *adapter, bool aborted)
_enter_critical_bh(&pwdev_priv->scan_req_lock, &irqL); _enter_critical_bh(&pwdev_priv->scan_req_lock, &irqL);
if (pwdev_priv->scan_request != NULL) { if (pwdev_priv->scan_request != NULL) {
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
RTW_INFO("%s with scan req\n", __FUNCTION__); RTW_INFO("%s with scan req\n", __func__);
#endif #endif
/* avoid WARN_ON(request != wiphy_to_dev(request->wiphy)->scan_req); */ /* avoid WARN_ON(request != wiphy_to_dev(request->wiphy)->scan_req); */
@ -1927,7 +1927,7 @@ void rtw_cfg80211_indicate_scan_done(_adapter *adapter, bool aborted)
pwdev_priv->scan_request = NULL; pwdev_priv->scan_request = NULL;
} else { } else {
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
RTW_INFO("%s without scan req\n", __FUNCTION__); RTW_INFO("%s without scan req\n", __func__);
#endif #endif
} }
_exit_critical_bh(&pwdev_priv->scan_req_lock, &irqL); _exit_critical_bh(&pwdev_priv->scan_req_lock, &irqL);
@ -2114,7 +2114,7 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(_adapter *padapter, char *buf, in
pmlmepriv->wps_probe_req_ie = rtw_malloc(wps_ielen); pmlmepriv->wps_probe_req_ie = rtw_malloc(wps_ielen);
if (pmlmepriv->wps_probe_req_ie == NULL) { if (pmlmepriv->wps_probe_req_ie == NULL) {
RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
return -EINVAL; return -EINVAL;
} }
@ -2145,7 +2145,7 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(_adapter *padapter, char *buf, in
pmlmepriv->p2p_probe_req_ie = rtw_malloc(p2p_ielen); pmlmepriv->p2p_probe_req_ie = rtw_malloc(p2p_ielen);
if (pmlmepriv->p2p_probe_req_ie == NULL) { if (pmlmepriv->p2p_probe_req_ie == NULL) {
RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
return -EINVAL; return -EINVAL;
} }
@ -2868,7 +2868,7 @@ static int rtw_cfg80211_set_wpa_ie(_adapter *padapter, u8 *pie, size_t ielen)
p2p_ie = rtw_get_p2p_ie(buf, ielen, NULL, &p2p_ielen); p2p_ie = rtw_get_p2p_ie(buf, ielen, NULL, &p2p_ielen);
if (p2p_ie) { if (p2p_ie) {
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
RTW_INFO("%s p2p_assoc_req_ielen=%d\n", __FUNCTION__, p2p_ielen); RTW_INFO("%s p2p_assoc_req_ielen=%d\n", __func__, p2p_ielen);
#endif #endif
if (pmlmepriv->p2p_assoc_req_ie) { if (pmlmepriv->p2p_assoc_req_ie) {
@ -2880,7 +2880,7 @@ static int rtw_cfg80211_set_wpa_ie(_adapter *padapter, u8 *pie, size_t ielen)
pmlmepriv->p2p_assoc_req_ie = rtw_malloc(p2p_ielen); pmlmepriv->p2p_assoc_req_ie = rtw_malloc(p2p_ielen);
if (pmlmepriv->p2p_assoc_req_ie == NULL) { if (pmlmepriv->p2p_assoc_req_ie == NULL) {
RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
goto exit; goto exit;
} }
_rtw_memcpy(pmlmepriv->p2p_assoc_req_ie, p2p_ie, p2p_ielen); _rtw_memcpy(pmlmepriv->p2p_assoc_req_ie, p2p_ie, p2p_ielen);
@ -2898,7 +2898,7 @@ static int rtw_cfg80211_set_wpa_ie(_adapter *padapter, u8 *pie, size_t ielen)
wfd_ie = rtw_get_wfd_ie(buf, ielen, NULL, &wfd_ielen); wfd_ie = rtw_get_wfd_ie(buf, ielen, NULL, &wfd_ielen);
if (wfd_ie) { if (wfd_ie) {
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
RTW_INFO("%s wfd_assoc_req_ielen=%d\n", __FUNCTION__, wfd_ielen); RTW_INFO("%s wfd_assoc_req_ielen=%d\n", __func__, wfd_ielen);
#endif #endif
if (rtw_mlme_update_wfd_ie_data(pmlmepriv, MLME_ASSOC_REQ_IE, wfd_ie, wfd_ielen) != _SUCCESS) if (rtw_mlme_update_wfd_ie_data(pmlmepriv, MLME_ASSOC_REQ_IE, wfd_ie, wfd_ielen) != _SUCCESS)
@ -2971,7 +2971,7 @@ static int cfg80211_rtw_join_ibss(struct wiphy *wiphy, struct net_device *ndev,
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
if (rtw_mi_buddy_check_fwstate(padapter, _FW_UNDER_LINKING)) { if (rtw_mi_buddy_check_fwstate(padapter, _FW_UNDER_LINKING)) {
RTW_INFO("%s, but buddy_intf is under linking\n", __FUNCTION__); RTW_INFO("%s, but buddy_intf is under linking\n", __func__);
ret = -EINVAL; ret = -EINVAL;
goto cancel_ps_deny; goto cancel_ps_deny;
} }
@ -3077,7 +3077,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
if (adapter_wdev_data(padapter)->block == _TRUE) { if (adapter_wdev_data(padapter)->block == _TRUE) {
ret = -EBUSY; ret = -EBUSY;
RTW_INFO("%s wdev_priv.block is set\n", __FUNCTION__); RTW_INFO("%s wdev_priv.block is set\n", __func__);
goto exit; goto exit;
} }
@ -3192,7 +3192,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
if (sme->key_len > 0 && sme->key) { if (sme->key_len > 0 && sme->key) {
u32 wep_key_idx, wep_key_len, wep_total_len; u32 wep_key_idx, wep_key_len, wep_total_len;
NDIS_802_11_WEP *pwep = NULL; NDIS_802_11_WEP *pwep = NULL;
RTW_INFO("%s(): Shared/Auto WEP\n", __FUNCTION__); RTW_INFO("%s(): Shared/Auto WEP\n", __func__);
wep_key_idx = sme->key_idx; wep_key_idx = sme->key_idx;
wep_key_len = sme->key_len; wep_key_len = sme->key_len;
@ -3281,7 +3281,7 @@ cancel_ps_deny:
rtw_ps_deny_cancel(padapter, PS_DENY_JOIN); rtw_ps_deny_cancel(padapter, PS_DENY_JOIN);
exit: exit:
RTW_INFO("<=%s, ret %d\n", __FUNCTION__, ret); RTW_INFO("<=%s, ret %d\n", __func__, ret);
#ifdef SUPPLICANT_RTK_VERSION_LOWER_THAN_JB42 #ifdef SUPPLICANT_RTK_VERSION_LOWER_THAN_JB42
padapter->mlmepriv.not_indic_disco = _FALSE; padapter->mlmepriv.not_indic_disco = _FALSE;
@ -4049,7 +4049,7 @@ static int rtw_add_beacon(_adapter *adapter, const u8 *head, size_t head_len, co
/* struct sta_priv *pstapriv = &padapter->stapriv; */ /* struct sta_priv *pstapriv = &padapter->stapriv; */
RTW_INFO("%s beacon_head_len=%zu, beacon_tail_len=%zu\n", __FUNCTION__, head_len, tail_len); RTW_INFO("%s beacon_head_len=%zu, beacon_tail_len=%zu\n", __func__, head_len, tail_len);
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE)
@ -4284,7 +4284,7 @@ static int cfg80211_rtw_add_station(struct wiphy *wiphy, struct net_device *ndev
if (psta == NULL) { if (psta == NULL) {
psta = rtw_alloc_stainfo(pstapriv, (u8 *)mac); psta = rtw_alloc_stainfo(pstapriv, (u8 *)mac);
if (psta == NULL) { if (psta == NULL) {
RTW_INFO("[%s] Alloc station for "MAC_FMT" fail\n", __FUNCTION__, MAC_ARG(mac)); RTW_INFO("[%s] Alloc station for "MAC_FMT" fail\n", __func__, MAC_ARG(mac));
ret = -EOPNOTSUPP; ret = -EOPNOTSUPP;
goto exit; goto exit;
} }
@ -4826,7 +4826,7 @@ void rtw_cfg80211_issue_p2p_provision_request(_adapter *padapter, const u8 *buf,
size_t frame_body_len = len - sizeof(struct rtw_ieee80211_hdr_3addr); size_t frame_body_len = len - sizeof(struct rtw_ieee80211_hdr_3addr);
__be16 be_tmp; __be16 be_tmp;
RTW_INFO("[%s] In\n", __FUNCTION__); RTW_INFO("[%s] In\n", __func__);
/* prepare for building provision_request frame */ /* prepare for building provision_request frame */
_rtw_memcpy(pwdinfo->tx_prov_disc_info.peerIFAddr, GetAddr1Ptr(buf), ETH_ALEN); _rtw_memcpy(pwdinfo->tx_prov_disc_info.peerIFAddr, GetAddr1Ptr(buf), ETH_ALEN);
@ -6001,7 +6001,7 @@ static int cfg80211_rtw_tdls_mgmt(struct wiphy *wiphy,
/* Debug purpose */ /* Debug purpose */
#if 1 #if 1
RTW_INFO("%s %d\n", __FUNCTION__, __LINE__); RTW_INFO("%s %d\n", __func__, __LINE__);
RTW_INFO("peer:"MAC_FMT", action code:%d, dialog:%d, status code:%d\n", RTW_INFO("peer:"MAC_FMT", action code:%d, dialog:%d, status code:%d\n",
MAC_ARG(txmgmt.peer), txmgmt.action_code, MAC_ARG(txmgmt.peer), txmgmt.action_code,
txmgmt.dialog_token, txmgmt.status_code); txmgmt.dialog_token, txmgmt.status_code);
@ -6087,7 +6087,7 @@ static int cfg80211_rtw_tdls_oper(struct wiphy *wiphy,
if (padapter->wdinfo.wfd_tdls_weaksec == _TRUE) if (padapter->wdinfo.wfd_tdls_weaksec == _TRUE)
issue_tdls_setup_req(padapter, &txmgmt, _TRUE); issue_tdls_setup_req(padapter, &txmgmt, _TRUE);
else else
RTW_INFO("[%s] Current link is not AES, SKIP sending the tdls setup request!!\n", __FUNCTION__); RTW_INFO("[%s] Current link is not AES, SKIP sending the tdls setup request!!\n", __func__);
} else } else
#endif /* CONFIG_WFD */ #endif /* CONFIG_WFD */
{ {
@ -6206,7 +6206,7 @@ static int rtw_cfg80211_set_beacon_wpsp2pie(struct net_device *ndev, char *buf,
pmlmepriv->wps_beacon_ie = rtw_malloc(wps_ielen); pmlmepriv->wps_beacon_ie = rtw_malloc(wps_ielen);
if (pmlmepriv->wps_beacon_ie == NULL) { if (pmlmepriv->wps_beacon_ie == NULL) {
RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
return -EINVAL; return -EINVAL;
} }
@ -6237,7 +6237,7 @@ static int rtw_cfg80211_set_beacon_wpsp2pie(struct net_device *ndev, char *buf,
pmlmepriv->p2p_beacon_ie = rtw_malloc(p2p_ielen); pmlmepriv->p2p_beacon_ie = rtw_malloc(p2p_ielen);
if (pmlmepriv->p2p_beacon_ie == NULL) { if (pmlmepriv->p2p_beacon_ie == NULL) {
RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
return -EINVAL; return -EINVAL;
} }
@ -6316,7 +6316,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu
pmlmepriv->wps_probe_resp_ie = rtw_malloc(wps_ielen); pmlmepriv->wps_probe_resp_ie = rtw_malloc(wps_ielen);
if (pmlmepriv->wps_probe_resp_ie == NULL) { if (pmlmepriv->wps_probe_resp_ie == NULL) {
RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
return -EINVAL; return -EINVAL;
} }
@ -6364,7 +6364,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu
/* Check P2P Capability ATTR */ /* Check P2P Capability ATTR */
if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8 *)&le_tmp, (uint *)&attr_contentlen)) { if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8 *)&le_tmp, (uint *)&attr_contentlen)) {
u8 grp_cap = 0; u8 grp_cap = 0;
/* RTW_INFO( "[%s] Got P2P Capability Attr!!\n", __FUNCTION__ ); */ /* RTW_INFO( "[%s] Got P2P Capability Attr!!\n", __func__ ); */
cap_attr = le16_to_cpu(le_tmp); cap_attr = le16_to_cpu(le_tmp);
grp_cap = (u8)((cap_attr >> 8) & 0xff); grp_cap = (u8)((cap_attr >> 8) & 0xff);
@ -6385,7 +6385,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu
pmlmepriv->p2p_probe_resp_ie = rtw_malloc(p2p_ielen); pmlmepriv->p2p_probe_resp_ie = rtw_malloc(p2p_ielen);
if (pmlmepriv->p2p_probe_resp_ie == NULL) { if (pmlmepriv->p2p_probe_resp_ie == NULL) {
RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
return -EINVAL; return -EINVAL;
} }
@ -6401,7 +6401,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu
pmlmepriv->p2p_go_probe_resp_ie = rtw_malloc(p2p_ielen); pmlmepriv->p2p_go_probe_resp_ie = rtw_malloc(p2p_ielen);
if (pmlmepriv->p2p_go_probe_resp_ie == NULL) { if (pmlmepriv->p2p_go_probe_resp_ie == NULL) {
RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
return -EINVAL; return -EINVAL;
} }
@ -6456,7 +6456,7 @@ static int rtw_cfg80211_set_assoc_resp_wpsp2pie(struct net_device *net, char *bu
pmlmepriv->wps_assoc_resp_ie = rtw_malloc(ie_len); pmlmepriv->wps_assoc_resp_ie = rtw_malloc(ie_len);
if (pmlmepriv->wps_assoc_resp_ie == NULL) { if (pmlmepriv->wps_assoc_resp_ie == NULL) {
RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
return -EINVAL; return -EINVAL;
} }
_rtw_memcpy(pmlmepriv->wps_assoc_resp_ie, ie, ie_len); _rtw_memcpy(pmlmepriv->wps_assoc_resp_ie, ie, ie_len);
@ -6475,7 +6475,7 @@ static int rtw_cfg80211_set_assoc_resp_wpsp2pie(struct net_device *net, char *bu
pmlmepriv->p2p_assoc_resp_ie = rtw_malloc(ie_len); pmlmepriv->p2p_assoc_resp_ie = rtw_malloc(ie_len);
if (pmlmepriv->p2p_assoc_resp_ie == NULL) { if (pmlmepriv->p2p_assoc_resp_ie == NULL) {
RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); RTW_INFO("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__);
return -EINVAL; return -EINVAL;
} }
_rtw_memcpy(pmlmepriv->p2p_assoc_resp_ie, ie, ie_len); _rtw_memcpy(pmlmepriv->p2p_assoc_resp_ie, ie, ie_len);

460
os_dep/ioctl_linux.c
View file

File diff suppressed because it is too large Load diff

402
os_dep/ioctl_mp.c
View file

@ -24,11 +24,6 @@
#include <rtw_mp_ioctl.h> #include <rtw_mp_ioctl.h>
#include "../../hal/phydm/phydm_precomp.h" #include "../../hal/phydm/phydm_precomp.h"
#if defined(CONFIG_RTL8723B)
#include <rtw_bt_mp.h>
#endif
/* /*
* Input Format: %s,%d,%d * Input Format: %s,%d,%d
* %s is width, could be * %s is width, could be
@ -1099,34 +1094,7 @@ int rtw_mp_thermal(struct net_device *dev,
{ {
u8 val; u8 val;
int bwrite = 1; int bwrite = 1;
#ifdef CONFIG_RTL8188E
u16 addr = EEPROM_THERMAL_METER_88E; u16 addr = EEPROM_THERMAL_METER_88E;
#endif
#if defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A) || defined(CONFIG_RTL8814A)
u16 addr = EEPROM_THERMAL_METER_8812;
#endif
#ifdef CONFIG_RTL8192E
u16 addr = EEPROM_THERMAL_METER_8192E;
#endif
#ifdef CONFIG_RTL8723B
u16 addr = EEPROM_THERMAL_METER_8723B;
#endif
#ifdef CONFIG_RTL8703B
u16 addr = EEPROM_THERMAL_METER_8703B;
#endif
#ifdef CONFIG_RTL8723D
u16 addr = EEPROM_THERMAL_METER_8723D;
#endif
#ifdef CONFIG_RTL8188F
u16 addr = EEPROM_THERMAL_METER_8188F;
#endif
#ifdef CONFIG_RTL8822B
u16 addr = EEPROM_THERMAL_METER_8822B;
#endif
#ifdef CONFIG_RTL8821C
u16 addr = EEPROM_THERMAL_METER_8821C;
#endif
u16 cnt = 1; u16 cnt = 1;
u16 max_available_size = 0; u16 max_available_size = 0;
PADAPTER padapter = rtw_netdev_priv(dev); PADAPTER padapter = rtw_netdev_priv(dev);
@ -1501,20 +1469,9 @@ int rtw_mp_pretx_proc(PADAPTER padapter, u8 bStartTest, char *extra)
} else } else
pmp_priv->mode = MP_ON; pmp_priv->mode = MP_ON;
#if defined(CONFIG_RTL8812A)
if (IS_HARDWARE_TYPE_8812AU(padapter)) {
/* <20130425, Kordan> Turn off OFDM Rx to prevent from CCA causing Tx hang.*/
if (pmp_priv->mode == MP_PACKET_TX)
phy_set_bb_reg(padapter, rCCAonSec_Jaguar, BIT3, 1);
else
phy_set_bb_reg(padapter, rCCAonSec_Jaguar, BIT3, 0);
}
#endif
return 0; return 0;
} }
int rtw_mp_tx(struct net_device *dev, int rtw_mp_tx(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
@ -1963,24 +1920,7 @@ int rtw_mp_hwtx(struct net_device *dev,
struct mp_priv *pmp_priv = &padapter->mppriv; struct mp_priv *pmp_priv = &padapter->mppriv;
PMPT_CONTEXT pMptCtx = &(padapter->mppriv.mpt_ctx); PMPT_CONTEXT pMptCtx = &(padapter->mppriv.mpt_ctx);
#if defined(CONFIG_RTL8814A) || defined(CONFIG_RTL8821B) || defined(CONFIG_RTL8822B) || defined(CONFIG_RTL8821C)
u8 input[128];
if (wrqu->data.length > 128)
return -EFAULT;
if (copy_from_user(input, wrqu->data.pointer, wrqu->data.length))
return -EFAULT;
_rtw_memset(&pMptCtx->PMacTxInfo, 0, sizeof(RT_PMAC_TX_INFO));
_rtw_memcpy((void *)&pMptCtx->PMacTxInfo, (void *)input, sizeof(RT_PMAC_TX_INFO));
mpt_ProSetPMacTx(padapter);
sprintf(extra, "Set PMac Tx Mode start\n");
wrqu->data.length = strlen(extra);
#endif
return 0; return 0;
} }
int rtw_efuse_mask_file(struct net_device *dev, int rtw_efuse_mask_file(struct net_device *dev,
@ -2103,346 +2043,4 @@ int rtw_efuse_file_map(struct net_device *dev,
return 0; return 0;
} }
#if defined(CONFIG_RTL8723B)
int rtw_mp_SetBT(struct net_device *dev,
struct iw_request_info *info,
union iwreq_data *wrqu, char *extra)
{
PADAPTER padapter = rtw_netdev_priv(dev);
struct hal_ops *pHalFunc = &padapter->hal_func;
HAL_DATA_TYPE *pHalData = GET_HAL_DATA(padapter);
BT_REQ_CMD BtReq;
PMPT_CONTEXT pMptCtx = &(padapter->mppriv.mpt_ctx);
PBT_RSP_CMD pBtRsp = (PBT_RSP_CMD)&pMptCtx->mptOutBuf[0];
char input[128];
char *pch, *ptmp, *token, *tmp[2] = {0x00, 0x00};
u8 setdata[100];
u8 resetbt = 0x00;
u8 tempval, BTStatus;
u8 H2cSetbtmac[6];
u8 u1H2CBtMpOperParm[4] = {0x01};
int testmode = 1, ready = 1, trxparam = 1, setgen = 1, getgen = 1, testctrl = 1, testbt = 1, readtherm = 1, setbtmac = 1;
u32 i = 0, ii = 0, jj = 0, kk = 0, cnts = 0, status = 0;
PRT_MP_FIRMWARE pBTFirmware = NULL;
if (wrqu->data.length > 128)
return -EFAULT;
if (copy_from_user(extra, wrqu->data.pointer, wrqu->data.length))
return -EFAULT;
if (strlen(extra) < 1)
return -EFAULT;
RTW_INFO("%s:iwpriv in=%s\n", __func__, extra);
ready = strncmp(extra, "ready", 5);
testmode = strncmp(extra, "testmode", 8); /* strncmp TRUE is 0*/
trxparam = strncmp(extra, "trxparam", 8);
setgen = strncmp(extra, "setgen", 6);
getgen = strncmp(extra, "getgen", 6);
testctrl = strncmp(extra, "testctrl", 8);
testbt = strncmp(extra, "testbt", 6);
readtherm = strncmp(extra, "readtherm", 9);
setbtmac = strncmp(extra, "setbtmac", 8);
if (strncmp(extra, "dlbt", 4) == 0) {
pHalData->LastHMEBoxNum = 0;
padapter->bBTFWReady = _FALSE;
rtw_write8(padapter, 0xa3, 0x05);
BTStatus = rtw_read8(padapter, 0xa0);
RTW_INFO("%s: btwmap before read 0xa0 BT Status =0x%x\n", __func__, BTStatus);
if (BTStatus != 0x04) {
sprintf(extra, "BT Status not Active DLFW FAIL\n");
goto exit;
}
tempval = rtw_read8(padapter, 0x6B);
tempval |= BIT7;
rtw_write8(padapter, 0x6B, tempval);
/* Attention!! Between 0x6A[14] and 0x6A[15] setting need 100us delay*/
/* So don't write 0x6A[14]=1 and 0x6A[15]=0 together!*/
rtw_usleep_os(100);
/* disable BT power cut*/
/* 0x6A[14] = 0*/
tempval = rtw_read8(padapter, 0x6B);
tempval &= ~BIT6;
rtw_write8(padapter, 0x6B, tempval);
rtw_usleep_os(100);
MPT_PwrCtlDM(padapter, 0);
rtw_write32(padapter, 0xcc, (rtw_read32(padapter, 0xcc) | 0x00000004));
rtw_write32(padapter, 0x6b, (rtw_read32(padapter, 0x6b) & 0xFFFFFFEF));
rtw_msleep_os(600);
rtw_write32(padapter, 0x6b, (rtw_read32(padapter, 0x6b) | 0x00000010));
rtw_write32(padapter, 0xcc, (rtw_read32(padapter, 0xcc) & 0xFFFFFFFB));
rtw_msleep_os(1200);
pBTFirmware = (PRT_MP_FIRMWARE)rtw_zmalloc(sizeof(RT_MP_FIRMWARE));
if (pBTFirmware == NULL)
goto exit;
padapter->bBTFWReady = _FALSE;
FirmwareDownloadBT(padapter, pBTFirmware);
if (pBTFirmware)
rtw_mfree((u8 *)pBTFirmware, sizeof(RT_MP_FIRMWARE));
RTW_INFO("Wait for FirmwareDownloadBT fw boot!\n");
rtw_msleep_os(2000);
_rtw_memset(extra, '\0', wrqu->data.length);
BtReq.opCodeVer = 1;
BtReq.OpCode = 0;
BtReq.paraLength = 0;
mptbt_BtControlProcess(padapter, &BtReq);
rtw_msleep_os(100);
RTW_INFO("FirmwareDownloadBT ready = 0x%x 0x%x", pMptCtx->mptOutBuf[4], pMptCtx->mptOutBuf[5]);
if ((pMptCtx->mptOutBuf[4] == 0x00) && (pMptCtx->mptOutBuf[5] == 0x00)) {
if (padapter->mppriv.bTxBufCkFail == _TRUE)
sprintf(extra, "check TxBuf Fail.\n");
else
sprintf(extra, "download FW Fail.\n");
} else {
sprintf(extra, "download FW OK.\n");
goto exit;
}
goto exit;
}
if (strncmp(extra, "dlfw", 4) == 0) {
pHalData->LastHMEBoxNum = 0;
padapter->bBTFWReady = _FALSE;
rtw_write8(padapter, 0xa3, 0x05);
BTStatus = rtw_read8(padapter, 0xa0);
RTW_INFO("%s: btwmap before read 0xa0 BT Status =0x%x\n", __func__, BTStatus);
if (BTStatus != 0x04) {
sprintf(extra, "BT Status not Active DLFW FAIL\n");
goto exit;
}
tempval = rtw_read8(padapter, 0x6B);
tempval |= BIT7;
rtw_write8(padapter, 0x6B, tempval);
/* Attention!! Between 0x6A[14] and 0x6A[15] setting need 100us delay*/
/* So don't write 0x6A[14]=1 and 0x6A[15]=0 together!*/
rtw_usleep_os(100);
/* disable BT power cut*/
/* 0x6A[14] = 0*/
tempval = rtw_read8(padapter, 0x6B);
tempval &= ~BIT6;
rtw_write8(padapter, 0x6B, tempval);
rtw_usleep_os(100);
MPT_PwrCtlDM(padapter, 0);
rtw_write32(padapter, 0xcc, (rtw_read32(padapter, 0xcc) | 0x00000004));
rtw_write32(padapter, 0x6b, (rtw_read32(padapter, 0x6b) & 0xFFFFFFEF));
rtw_msleep_os(600);
rtw_write32(padapter, 0x6b, (rtw_read32(padapter, 0x6b) | 0x00000010));
rtw_write32(padapter, 0xcc, (rtw_read32(padapter, 0xcc) & 0xFFFFFFFB));
rtw_msleep_os(1200);
#if defined(CONFIG_PLATFORM_SPRD) && (MP_DRIVER == 1)
/* Pull up BT reset pin.*/
RTW_INFO("%s: pull up BT reset pin when bt start mp test\n", __func__);
rtw_wifi_gpio_wlan_ctrl(WLAN_BT_PWDN_ON);
#endif
RTW_INFO(" FirmwareDownload!\n");
#if defined(CONFIG_RTL8723B)
status = rtl8723b_FirmwareDownload(padapter, _FALSE);
#endif
RTW_INFO("Wait for FirmwareDownloadBT fw boot!\n");
rtw_msleep_os(1000);
#ifdef CONFIG_BT_COEXIST
rtw_btcoex_HaltNotify(padapter);
RTW_INFO("SetBT btcoex HaltNotify !\n");
/*hal_btcoex1ant_SetAntPath(padapter);*/
rtw_btcoex_SetManualControl(padapter, _TRUE);
#endif
_rtw_memset(extra, '\0', wrqu->data.length);
BtReq.opCodeVer = 1;
BtReq.OpCode = 0;
BtReq.paraLength = 0;
mptbt_BtControlProcess(padapter, &BtReq);
rtw_msleep_os(200);
RTW_INFO("FirmwareDownloadBT ready = 0x%x 0x%x", pMptCtx->mptOutBuf[4], pMptCtx->mptOutBuf[5]);
if ((pMptCtx->mptOutBuf[4] == 0x00) && (pMptCtx->mptOutBuf[5] == 0x00)) {
if (padapter->mppriv.bTxBufCkFail == _TRUE)
sprintf(extra, "check TxBuf Fail.\n");
else
sprintf(extra, "download FW Fail.\n");
} else {
#ifdef CONFIG_BT_COEXIST
rtw_btcoex_SwitchBtTRxMask(padapter);
#endif
rtw_msleep_os(200);
sprintf(extra, "download FW OK.\n");
goto exit;
}
goto exit;
}
if (strncmp(extra, "down", 4) == 0) {
RTW_INFO("SetBT down for to hal_init !\n");
#ifdef CONFIG_BT_COEXIST
rtw_btcoex_SetManualControl(padapter, _FALSE);
rtw_btcoex_Initialize(padapter);
#endif
pHalFunc->read_adapter_info(padapter);
pHalFunc->hal_deinit(padapter);
pHalFunc->hal_init(padapter);
rtw_pm_set_ips(padapter, IPS_NONE);
LeaveAllPowerSaveMode(padapter);
MPT_PwrCtlDM(padapter, 0);
rtw_write32(padapter, 0xcc, (rtw_read32(padapter, 0xcc) | 0x00000004));
rtw_write32(padapter, 0x6b, (rtw_read32(padapter, 0x6b) & 0xFFFFFFEF));
rtw_msleep_os(600);
/*rtw_write32(padapter, 0x6a, (rtw_read32(padapter, 0x6a)& 0xFFFFFFFE));*/
rtw_write32(padapter, 0x6b, (rtw_read32(padapter, 0x6b) | 0x00000010));
rtw_write32(padapter, 0xcc, (rtw_read32(padapter, 0xcc) & 0xFFFFFFFB));
rtw_msleep_os(1200);
goto exit;
}
if (strncmp(extra, "disable", 7) == 0) {
RTW_INFO("SetBT disable !\n");
rtw_write32(padapter, 0x6a, (rtw_read32(padapter, 0x6a) & 0xFFFFFFFB));
rtw_msleep_os(500);
goto exit;
}
if (strncmp(extra, "enable", 6) == 0) {
RTW_INFO("SetBT enable !\n");
rtw_write32(padapter, 0x6a, (rtw_read32(padapter, 0x6a) | 0x00000004));
rtw_msleep_os(500);
goto exit;
}
if (strncmp(extra, "h2c", 3) == 0) {
RTW_INFO("SetBT h2c !\n");
padapter->bBTFWReady = _TRUE;
rtw_hal_fill_h2c_cmd(padapter, 0x63, 1, u1H2CBtMpOperParm);
goto exit;
}
if (strncmp(extra, "2ant", 4) == 0) {
RTW_INFO("Set BT 2ant use!\n");
phy_set_mac_reg(padapter, 0x67, BIT5, 0x1);
rtw_write32(padapter, 0x948, 0000);
goto exit;
}
if (ready != 0 && testmode != 0 && trxparam != 0 && setgen != 0 && getgen != 0 && testctrl != 0 && testbt != 0 && readtherm != 0 && setbtmac != 0)
return -EFAULT;
if (testbt == 0) {
BtReq.opCodeVer = 1;
BtReq.OpCode = 6;
BtReq.paraLength = cnts / 2;
goto todo;
}
if (ready == 0) {
BtReq.opCodeVer = 1;
BtReq.OpCode = 0;
BtReq.paraLength = 0;
goto todo;
}
pch = extra;
i = 0;
while ((token = strsep(&pch, ",")) != NULL) {
if (i > 1)
break;
tmp[i] = token;
i++;
}
if ((tmp[0] != NULL) && (tmp[1] != NULL)) {
cnts = strlen(tmp[1]);
if (cnts < 1)
return -EFAULT;
RTW_INFO("%s: cnts=%d\n", __func__, cnts);
RTW_INFO("%s: data=%s\n", __func__, tmp[1]);
for (jj = 0, kk = 0; jj < cnts; jj++, kk += 2) {
BtReq.pParamStart[jj] = key_2char2num(tmp[1][kk], tmp[1][kk + 1]);
/* RTW_INFO("BtReq.pParamStart[%d]=0x%02x\n", jj, BtReq.pParamStart[jj]);*/
}
} else
return -EFAULT;
if (testmode == 0) {
BtReq.opCodeVer = 1;
BtReq.OpCode = 1;
BtReq.paraLength = 1;
}
if (trxparam == 0) {
BtReq.opCodeVer = 1;
BtReq.OpCode = 2;
BtReq.paraLength = cnts / 2;
}
if (setgen == 0) {
RTW_INFO("%s: BT_SET_GENERAL\n", __func__);
BtReq.opCodeVer = 1;
BtReq.OpCode = 3;/*BT_SET_GENERAL 3*/
BtReq.paraLength = cnts / 2;
}
if (getgen == 0) {
RTW_INFO("%s: BT_GET_GENERAL\n", __func__);
BtReq.opCodeVer = 1;
BtReq.OpCode = 4;/*BT_GET_GENERAL 4*/
BtReq.paraLength = cnts / 2;
}
if (readtherm == 0) {
RTW_INFO("%s: BT_GET_GENERAL\n", __func__);
BtReq.opCodeVer = 1;
BtReq.OpCode = 4;/*BT_GET_GENERAL 4*/
BtReq.paraLength = cnts / 2;
}
if (testctrl == 0) {
RTW_INFO("%s: BT_TEST_CTRL\n", __func__);
BtReq.opCodeVer = 1;
BtReq.OpCode = 5;/*BT_TEST_CTRL 5*/
BtReq.paraLength = cnts / 2;
}
RTW_INFO("%s: Req opCodeVer=%d OpCode=%d paraLength=%d\n",
__func__, BtReq.opCodeVer, BtReq.OpCode, BtReq.paraLength);
if (BtReq.paraLength < 1)
goto todo;
for (i = 0; i < BtReq.paraLength; i++) {
RTW_INFO("%s: BtReq.pParamStart[%d] = 0x%02x\n",
__func__, i, BtReq.pParamStart[i]);
}
todo:
_rtw_memset(extra, '\0', wrqu->data.length);
if (padapter->bBTFWReady == _FALSE) {
sprintf(extra, "BTFWReady = FALSE.\n");
goto exit;
}
mptbt_BtControlProcess(padapter, &BtReq);
if (readtherm == 0) {
sprintf(extra, "BT thermal=");
for (i = 4; i < pMptCtx->mptOutLen; i++) {
if ((pMptCtx->mptOutBuf[i] == 0x00) && (pMptCtx->mptOutBuf[i + 1] == 0x00))
goto exit;
sprintf(extra, "%s %d ", extra, (pMptCtx->mptOutBuf[i] & 0x1f));
}
} else {
for (i = 4; i < pMptCtx->mptOutLen; i++)
sprintf(extra, "%s 0x%x ", extra, pMptCtx->mptOutBuf[i]);
}
exit:
wrqu->data.length = strlen(extra) + 1;
RTW_INFO("-%s: output len=%d data=%s\n", __func__, wrqu->data.length, extra);
return status;
}
#endif /*#ifdef CONFIG_RTL8723B*/
#endif #endif

4
os_dep/mlme_linux.c
View file

@ -595,7 +595,7 @@ static int mgnt_xmit_entry(struct sk_buff *skb, struct net_device *pnetdev)
struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev); struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev);
_adapter *padapter = (_adapter *)phostapdpriv->padapter; _adapter *padapter = (_adapter *)phostapdpriv->padapter;
/* RTW_INFO("%s\n", __FUNCTION__); */ /* RTW_INFO("%s\n", __func__); */
return rtw_hal_hostap_mgnt_xmit_entry(padapter, skb); return rtw_hal_hostap_mgnt_xmit_entry(padapter, skb);
} }
@ -621,7 +621,7 @@ static int mgnt_netdev_close(struct net_device *pnetdev)
{ {
struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev); struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev);
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
usb_kill_anchored_urbs(&phostapdpriv->anchored); usb_kill_anchored_urbs(&phostapdpriv->anchored);

34
os_dep/os_intfs.c
View file

@ -2737,7 +2737,7 @@ void netdev_br_init(struct net_device *netdev)
memcpy(adapter->br_mac, br_netdev->dev_addr, ETH_ALEN); memcpy(adapter->br_mac, br_netdev->dev_addr, ETH_ALEN);
dev_put(br_netdev); dev_put(br_netdev);
} else } else
printk("%s()-%d: dev_get_by_name(%s) failed!", __FUNCTION__, __LINE__, CONFIG_BR_EXT_BRNAME); printk("%s()-%d: dev_get_by_name(%s) failed!", __func__, __LINE__, CONFIG_BR_EXT_BRNAME);
} }
adapter->ethBrExtInfo.addPPPoETag = 1; adapter->ethBrExtInfo.addPPPoETag = 1;
@ -2928,7 +2928,7 @@ static int ips_netdrv_open(_adapter *padapter)
padapter->net_closed = _FALSE; padapter->net_closed = _FALSE;
RTW_INFO("===> %s.........\n", __FUNCTION__); RTW_INFO("===> %s.........\n", __func__);
rtw_clr_drv_stopped(padapter); rtw_clr_drv_stopped(padapter);
@ -3003,7 +3003,7 @@ void rtw_ips_dev_unload(_adapter *padapter)
#ifdef DBG_CONFIG_ERROR_DETECT #ifdef DBG_CONFIG_ERROR_DETECT
struct sreset_priv *psrtpriv = &pHalData->srestpriv; struct sreset_priv *psrtpriv = &pHalData->srestpriv;
#endif/* #ifdef DBG_CONFIG_ERROR_DETECT */ #endif/* #ifdef DBG_CONFIG_ERROR_DETECT */
RTW_INFO("====> %s...\n", __FUNCTION__); RTW_INFO("====> %s...\n", __func__);
#if defined(CONFIG_SWLPS_IN_IPS) || defined(CONFIG_FWLPS_IN_IPS) #if defined(CONFIG_SWLPS_IN_IPS) || defined(CONFIG_FWLPS_IN_IPS)
@ -3445,8 +3445,8 @@ int rtw_gw_addr_query(_adapter *padapter)
pmlmepriv->gw_ip[2] = (gw_addr & 0xff0000) >> 16; pmlmepriv->gw_ip[2] = (gw_addr & 0xff0000) >> 16;
pmlmepriv->gw_ip[3] = (gw_addr & 0xff000000) >> 24; pmlmepriv->gw_ip[3] = (gw_addr & 0xff000000) >> 24;
_rtw_memcpy(pmlmepriv->gw_mac_addr, gw_mac, 6); _rtw_memcpy(pmlmepriv->gw_mac_addr, gw_mac, 6);
RTW_INFO("%s Gateway Mac:\t" MAC_FMT "\n", __FUNCTION__, MAC_ARG(pmlmepriv->gw_mac_addr)); RTW_INFO("%s Gateway Mac:\t" MAC_FMT "\n", __func__, MAC_ARG(pmlmepriv->gw_mac_addr));
RTW_INFO("%s Gateway IP:\t" IP_FMT "\n", __FUNCTION__, IP_ARG(pmlmepriv->gw_ip)); RTW_INFO("%s Gateway IP:\t" IP_FMT "\n", __func__, IP_ARG(pmlmepriv->gw_ip));
} else } else
RTW_INFO("Get Gateway IP/MAC fail!\n"); RTW_INFO("Get Gateway IP/MAC fail!\n");
@ -3505,7 +3505,7 @@ void rtw_dev_unload(_adapter *padapter)
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
if (pwrctl->bSupportRemoteWakeup == _TRUE && if (pwrctl->bSupportRemoteWakeup == _TRUE &&
pwrctl->wowlan_mode == _TRUE) pwrctl->wowlan_mode == _TRUE)
RTW_INFO("%s bSupportRemoteWakeup==_TRUE do not run rtw_hal_deinit()\n", __FUNCTION__); RTW_INFO("%s bSupportRemoteWakeup==_TRUE do not run rtw_hal_deinit()\n", __func__);
else else
#endif #endif
{ {
@ -3519,7 +3519,7 @@ void rtw_dev_unload(_adapter *padapter)
RTW_INFO("<== "FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter)); RTW_INFO("<== "FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
} else { } else {
RTW_INFO("%s: bup==_FALSE\n", __FUNCTION__); RTW_INFO("%s: bup==_FALSE\n", __func__);
} }
rtw_cancel_all_timer(padapter); rtw_cancel_all_timer(padapter);
} }
@ -3545,7 +3545,7 @@ int rtw_suspend_free_assoc_resource(_adapter *padapter)
) )
#endif /* CONFIG_P2P */ #endif /* CONFIG_P2P */
) { ) {
RTW_INFO("%s %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n", __FUNCTION__, RTW_INFO("%s %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n", __func__,
pmlmepriv->cur_network.network.Ssid.Ssid, pmlmepriv->cur_network.network.Ssid.Ssid,
MAC_ARG(pmlmepriv->cur_network.network.MacAddress), MAC_ARG(pmlmepriv->cur_network.network.MacAddress),
pmlmepriv->cur_network.network.Ssid.SsidLength, pmlmepriv->cur_network.network.Ssid.SsidLength,
@ -3580,7 +3580,7 @@ int rtw_suspend_free_assoc_resource(_adapter *padapter)
} }
if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) { if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) {
RTW_INFO("%s: fw_under_linking\n", __FUNCTION__); RTW_INFO("%s: fw_under_linking\n", __func__);
rtw_indicate_disconnect(padapter, 0, _FALSE); rtw_indicate_disconnect(padapter, 0, _FALSE);
} }
@ -3664,7 +3664,7 @@ int rtw_suspend_wow(_adapter *padapter)
if (rtw_chk_roam_flags(padapter, RTW_ROAM_ON_RESUME)) { if (rtw_chk_roam_flags(padapter, RTW_ROAM_ON_RESUME)) {
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) if (check_fwstate(pmlmepriv, WIFI_STATION_STATE)
&& check_fwstate(pmlmepriv, _FW_LINKED)) { && check_fwstate(pmlmepriv, _FW_LINKED)) {
RTW_INFO("%s %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n", __FUNCTION__, RTW_INFO("%s %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n", __func__,
pmlmepriv->cur_network.network.Ssid.Ssid, pmlmepriv->cur_network.network.Ssid.Ssid,
MAC_ARG(pmlmepriv->cur_network.network.MacAddress), MAC_ARG(pmlmepriv->cur_network.network.MacAddress),
pmlmepriv->cur_network.network.Ssid.SsidLength, pmlmepriv->cur_network.network.Ssid.SsidLength,
@ -3717,7 +3717,7 @@ int rtw_suspend_wow(_adapter *padapter)
#endif /* #ifdef CONFIG_LPS */ #endif /* #ifdef CONFIG_LPS */
} else } else
RTW_INFO("%s: ### ERROR ### wowlan_mode=%d\n", __FUNCTION__, pwrpriv->wowlan_mode); RTW_INFO("%s: ### ERROR ### wowlan_mode=%d\n", __func__, pwrpriv->wowlan_mode);
RTW_INFO("<== "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter)); RTW_INFO("<== "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter));
return ret; return ret;
} }
@ -3846,7 +3846,7 @@ static int rtw_suspend_normal(_adapter *padapter)
if ((rtw_hal_check_ips_status(padapter) == _TRUE) if ((rtw_hal_check_ips_status(padapter) == _TRUE)
|| (adapter_to_pwrctl(padapter)->rf_pwrstate == rf_off)) || (adapter_to_pwrctl(padapter)->rf_pwrstate == rf_off))
RTW_INFO("%s: ### ERROR #### driver in IPS ####ERROR###!!!\n", __FUNCTION__); RTW_INFO("%s: ### ERROR #### driver in IPS ####ERROR###!!!\n", __func__);
#ifdef CONFIG_CONCURRENT_MODE #ifdef CONFIG_CONCURRENT_MODE
@ -3878,7 +3878,7 @@ int rtw_suspend_common(_adapter *padapter)
u32 start_time = rtw_get_current_time(); u32 start_time = rtw_get_current_time();
RTW_INFO(" suspend start\n"); RTW_INFO(" suspend start\n");
RTW_INFO("==> %s (%s:%d)\n", __FUNCTION__, current->comm, current->pid); RTW_INFO("==> %s (%s:%d)\n", __func__, current->comm, current->pid);
pdbgpriv->dbg_suspend_cnt++; pdbgpriv->dbg_suspend_cnt++;
@ -3944,7 +3944,7 @@ int rtw_suspend_common(_adapter *padapter)
rtw_get_passing_time_ms(start_time)); rtw_get_passing_time_ms(start_time));
exit: exit:
RTW_INFO("<=== %s return %d.............. in %dms\n", __FUNCTION__ RTW_INFO("<=== %s return %d.............. in %dms\n", __func__
, ret, rtw_get_passing_time_ms(start_time)); , ret, rtw_get_passing_time_ms(start_time));
return ret; return ret;
@ -4040,7 +4040,7 @@ int rtw_resume_process_wow(_adapter *padapter)
rtw_netif_wake_queue(pnetdev); rtw_netif_wake_queue(pnetdev);
} else } else
RTW_INFO("%s: ### ERROR ### wowlan_mode=%d\n", __FUNCTION__, pwrpriv->wowlan_mode); RTW_INFO("%s: ### ERROR ### wowlan_mode=%d\n", __func__, pwrpriv->wowlan_mode);
if (padapter->pid[1] != 0) { if (padapter->pid[1] != 0) {
RTW_INFO("pid[1]:%d\n", padapter->pid[1]); RTW_INFO("pid[1]:%d\n", padapter->pid[1]);
@ -4345,7 +4345,7 @@ int rtw_resume_common(_adapter *padapter)
return 0; return 0;
RTW_INFO("resume start\n"); RTW_INFO("resume start\n");
RTW_INFO("==> %s (%s:%d)\n", __FUNCTION__, current->comm, current->pid); RTW_INFO("==> %s (%s:%d)\n", __func__, current->comm, current->pid);
if (rtw_mi_check_status(padapter, WIFI_AP_STATE) == _FALSE) { if (rtw_mi_check_status(padapter, WIFI_AP_STATE) == _FALSE) {
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
@ -4369,7 +4369,7 @@ int rtw_resume_common(_adapter *padapter)
pwrpriv->wowlan_in_resume = _FALSE; pwrpriv->wowlan_in_resume = _FALSE;
#endif #endif
} }
RTW_INFO("%s:%d in %d ms\n", __FUNCTION__ , ret, RTW_INFO("%s:%d in %d ms\n", __func__ , ret,
rtw_get_passing_time_ms(start_time)); rtw_get_passing_time_ms(start_time));

60
os_dep/osdep_service.c
View file

@ -392,7 +392,7 @@ inline u8 *dbg_rtw_vmalloc(u32 sz, const enum mstat_f flags, const char *func, c
u8 *p; u8 *p;
if (match_mstat_sniff_rules(flags, sz)) if (match_mstat_sniff_rules(flags, sz))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __func__, (sz));
p = _rtw_vmalloc((sz)); p = _rtw_vmalloc((sz));
@ -410,7 +410,7 @@ inline u8 *dbg_rtw_zvmalloc(u32 sz, const enum mstat_f flags, const char *func,
u8 *p; u8 *p;
if (match_mstat_sniff_rules(flags, sz)) if (match_mstat_sniff_rules(flags, sz))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __func__, (sz));
p = _rtw_zvmalloc((sz)); p = _rtw_zvmalloc((sz));
@ -427,7 +427,7 @@ inline void dbg_rtw_vmfree(u8 *pbuf, u32 sz, const enum mstat_f flags, const cha
{ {
if (match_mstat_sniff_rules(flags, sz)) if (match_mstat_sniff_rules(flags, sz))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __func__, (sz));
_rtw_vmfree((pbuf), (sz)); _rtw_vmfree((pbuf), (sz));
@ -443,7 +443,7 @@ inline u8 *dbg_rtw_malloc(u32 sz, const enum mstat_f flags, const char *func, co
u8 *p; u8 *p;
if (match_mstat_sniff_rules(flags, sz)) if (match_mstat_sniff_rules(flags, sz))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __func__, (sz));
p = _rtw_malloc((sz)); p = _rtw_malloc((sz));
@ -461,7 +461,7 @@ inline u8 *dbg_rtw_zmalloc(u32 sz, const enum mstat_f flags, const char *func, c
u8 *p; u8 *p;
if (match_mstat_sniff_rules(flags, sz)) if (match_mstat_sniff_rules(flags, sz))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __func__, (sz));
p = _rtw_zmalloc((sz)); p = _rtw_zmalloc((sz));
@ -477,7 +477,7 @@ inline u8 *dbg_rtw_zmalloc(u32 sz, const enum mstat_f flags, const char *func, c
inline void dbg_rtw_mfree(u8 *pbuf, u32 sz, const enum mstat_f flags, const char *func, const int line) inline void dbg_rtw_mfree(u8 *pbuf, u32 sz, const enum mstat_f flags, const char *func, const int line)
{ {
if (match_mstat_sniff_rules(flags, sz)) if (match_mstat_sniff_rules(flags, sz))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __func__, (sz));
_rtw_mfree((pbuf), (sz)); _rtw_mfree((pbuf), (sz));
@ -499,7 +499,7 @@ inline struct sk_buff *dbg_rtw_skb_alloc(unsigned int size, const enum mstat_f f
truesize = skb->truesize; truesize = skb->truesize;
if (!skb || truesize < size || match_mstat_sniff_rules(flags, truesize)) if (!skb || truesize < size || match_mstat_sniff_rules(flags, truesize))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d), skb:%p, truesize=%u\n", func, line, __FUNCTION__, size, skb, truesize); RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d), skb:%p, truesize=%u\n", func, line, __func__, size, skb, truesize);
rtw_mstat_update( rtw_mstat_update(
flags flags
@ -515,7 +515,7 @@ inline void dbg_rtw_skb_free(struct sk_buff *skb, const enum mstat_f flags, cons
unsigned int truesize = skb->truesize; unsigned int truesize = skb->truesize;
if (match_mstat_sniff_rules(flags, truesize)) if (match_mstat_sniff_rules(flags, truesize))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __FUNCTION__, truesize); RTW_INFO("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __func__, truesize);
_rtw_skb_free(skb); _rtw_skb_free(skb);
@ -537,7 +537,7 @@ inline struct sk_buff *dbg_rtw_skb_copy(const struct sk_buff *skb, const enum ms
cp_truesize = skb_cp->truesize; cp_truesize = skb_cp->truesize;
if (!skb_cp || cp_truesize < truesize || match_mstat_sniff_rules(flags, cp_truesize)) if (!skb_cp || cp_truesize < truesize || match_mstat_sniff_rules(flags, cp_truesize))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%u), skb_cp:%p, cp_truesize=%u\n", func, line, __FUNCTION__, truesize, skb_cp, cp_truesize); RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%u), skb_cp:%p, cp_truesize=%u\n", func, line, __func__, truesize, skb_cp, cp_truesize);
rtw_mstat_update( rtw_mstat_update(
flags flags
@ -559,7 +559,7 @@ inline struct sk_buff *dbg_rtw_skb_clone(struct sk_buff *skb, const enum mstat_f
cl_truesize = skb_cl->truesize; cl_truesize = skb_cl->truesize;
if (!skb_cl || cl_truesize < truesize || match_mstat_sniff_rules(flags, cl_truesize)) if (!skb_cl || cl_truesize < truesize || match_mstat_sniff_rules(flags, cl_truesize))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%u), skb_cl:%p, cl_truesize=%u\n", func, line, __FUNCTION__, truesize, skb_cl, cl_truesize); RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%u), skb_cl:%p, cl_truesize=%u\n", func, line, __func__, truesize, skb_cl, cl_truesize);
rtw_mstat_update( rtw_mstat_update(
flags flags
@ -576,7 +576,7 @@ inline int dbg_rtw_netif_rx(_nic_hdl ndev, struct sk_buff *skb, const enum mstat
unsigned int truesize = skb->truesize; unsigned int truesize = skb->truesize;
if (match_mstat_sniff_rules(flags, truesize)) if (match_mstat_sniff_rules(flags, truesize))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __FUNCTION__, truesize); RTW_INFO("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __func__, truesize);
ret = _rtw_netif_rx(ndev, skb); ret = _rtw_netif_rx(ndev, skb);
@ -596,7 +596,7 @@ inline int dbg_rtw_netif_receive_skb(_nic_hdl ndev, struct sk_buff *skb, const e
unsigned int truesize = skb->truesize; unsigned int truesize = skb->truesize;
if (match_mstat_sniff_rules(flags, truesize)) if (match_mstat_sniff_rules(flags, truesize))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __FUNCTION__, truesize); RTW_INFO("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __func__, truesize);
ret = _rtw_netif_receive_skb(ndev, skb); ret = _rtw_netif_receive_skb(ndev, skb);
@ -616,7 +616,7 @@ inline gro_result_t dbg_rtw_napi_gro_receive(struct napi_struct *napi, struct sk
unsigned int truesize = skb->truesize; unsigned int truesize = skb->truesize;
if (match_mstat_sniff_rules(flags, truesize)) if (match_mstat_sniff_rules(flags, truesize))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __FUNCTION__, truesize); RTW_INFO("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __func__, truesize);
ret = _rtw_napi_gro_receive(napi, skb); ret = _rtw_napi_gro_receive(napi, skb);
@ -645,7 +645,7 @@ inline void *dbg_rtw_usb_buffer_alloc(struct usb_device *dev, size_t size, dma_a
void *p; void *p;
if (match_mstat_sniff_rules(flags, size)) if (match_mstat_sniff_rules(flags, size))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%zu)\n", func, line, __FUNCTION__, size); RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%zu)\n", func, line, __func__, size);
p = _rtw_usb_buffer_alloc(dev, size, dma); p = _rtw_usb_buffer_alloc(dev, size, dma);
@ -662,7 +662,7 @@ inline void dbg_rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *a
{ {
if (match_mstat_sniff_rules(flags, size)) if (match_mstat_sniff_rules(flags, size))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%zu)\n", func, line, __FUNCTION__, size); RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%zu)\n", func, line, __func__, size);
_rtw_usb_buffer_free(dev, size, addr, dma); _rtw_usb_buffer_free(dev, size, addr, dma);
@ -682,7 +682,7 @@ void *rtw_malloc2d(int h, int w, size_t size)
void **a = (void **) rtw_zmalloc(h * sizeof(void *) + h * w * size); void **a = (void **) rtw_zmalloc(h * sizeof(void *) + h * w * size);
if (a == NULL) { if (a == NULL) {
RTW_INFO("%s: alloc memory fail!\n", __FUNCTION__); RTW_INFO("%s: alloc memory fail!\n", __func__);
return NULL; return NULL;
} }
@ -907,13 +907,13 @@ void rtw_usleep_os(int us)
#ifdef DBG_DELAY_OS #ifdef DBG_DELAY_OS
void _rtw_mdelay_os(int ms, const char *func, const int line) void _rtw_mdelay_os(int ms, const char *func, const int line)
{ {
RTW_INFO("%s:%d %s(%d)\n", func, line, __FUNCTION__, ms); RTW_INFO("%s:%d %s(%d)\n", func, line, __func__, ms);
mdelay((unsigned long)ms); mdelay((unsigned long)ms);
} }
void _rtw_udelay_os(int us, const char *func, const int line) void _rtw_udelay_os(int us, const char *func, const int line)
{ {
RTW_INFO("%s:%d %s(%d)\n", func, line, __FUNCTION__, us); RTW_INFO("%s:%d %s(%d)\n", func, line, __func__, us);
udelay((unsigned long)us); udelay((unsigned long)us);
} }
@ -1015,7 +1015,7 @@ inline void rtw_lock_suspend(void)
#endif #endif
#if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER) #if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER)
/* RTW_INFO("####%s: suspend_lock_count:%d####\n", __FUNCTION__, rtw_suspend_lock.stat.count); */ /* RTW_INFO("####%s: suspend_lock_count:%d####\n", __func__, rtw_suspend_lock.stat.count); */
#endif #endif
} }
@ -1028,7 +1028,7 @@ inline void rtw_unlock_suspend(void)
#endif #endif
#if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER) #if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER)
/* RTW_INFO("####%s: suspend_lock_count:%d####\n", __FUNCTION__, rtw_suspend_lock.stat.count); */ /* RTW_INFO("####%s: suspend_lock_count:%d####\n", __func__, rtw_suspend_lock.stat.count); */
#endif #endif
} }
@ -1041,7 +1041,7 @@ inline void rtw_resume_lock_suspend(void)
#endif #endif
#if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER) #if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER)
/* RTW_INFO("####%s: suspend_lock_count:%d####\n", __FUNCTION__, rtw_suspend_lock.stat.count); */ /* RTW_INFO("####%s: suspend_lock_count:%d####\n", __func__, rtw_suspend_lock.stat.count); */
#endif #endif
} }
@ -1054,7 +1054,7 @@ inline void rtw_resume_unlock_suspend(void)
#endif #endif
#if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER) #if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER)
/* RTW_INFO("####%s: suspend_lock_count:%d####\n", __FUNCTION__, rtw_suspend_lock.stat.count); */ /* RTW_INFO("####%s: suspend_lock_count:%d####\n", __func__, rtw_suspend_lock.stat.count); */
#endif #endif
} }
@ -1297,7 +1297,7 @@ static int retriveFromFile(const char *path, u8 *buf, u32 sz)
if (path && buf) { if (path && buf) {
ret = openFile(&fp, path, O_RDONLY, 0); ret = openFile(&fp, path, O_RDONLY, 0);
if (0 == ret) { if (0 == ret) {
RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp); RTW_INFO("%s openFile path:%s fp=%p\n", __func__, path , fp);
oldfs = get_fs(); oldfs = get_fs();
set_fs(get_ds()); set_fs(get_ds());
@ -1305,12 +1305,12 @@ static int retriveFromFile(const char *path, u8 *buf, u32 sz)
set_fs(oldfs); set_fs(oldfs);
closeFile(fp); closeFile(fp);
RTW_INFO("%s readFile, ret:%d\n", __FUNCTION__, ret); RTW_INFO("%s readFile, ret:%d\n", __func__, ret);
} else } else
RTW_INFO("%s openFile path:%s Fail, ret:%d\n", __FUNCTION__, path, ret); RTW_INFO("%s openFile path:%s Fail, ret:%d\n", __func__, path, ret);
} else { } else {
RTW_INFO("%s NULL pointer\n", __FUNCTION__); RTW_INFO("%s NULL pointer\n", __func__);
ret = -EINVAL; ret = -EINVAL;
} }
return ret; return ret;
@ -1332,7 +1332,7 @@ static int storeToFile(const char *path, u8 *buf, u32 sz)
if (path && buf) { if (path && buf) {
ret = openFile(&fp, path, O_CREAT | O_WRONLY, 0666); ret = openFile(&fp, path, O_CREAT | O_WRONLY, 0666);
if (0 == ret) { if (0 == ret) {
RTW_INFO("%s openFile path:%s fp=%p\n", __FUNCTION__, path , fp); RTW_INFO("%s openFile path:%s fp=%p\n", __func__, path , fp);
oldfs = get_fs(); oldfs = get_fs();
set_fs(get_ds()); set_fs(get_ds());
@ -1340,12 +1340,12 @@ static int storeToFile(const char *path, u8 *buf, u32 sz)
set_fs(oldfs); set_fs(oldfs);
closeFile(fp); closeFile(fp);
RTW_INFO("%s writeFile, ret:%d\n", __FUNCTION__, ret); RTW_INFO("%s writeFile, ret:%d\n", __func__, ret);
} else } else
RTW_INFO("%s openFile path:%s Fail, ret:%d\n", __FUNCTION__, path, ret); RTW_INFO("%s openFile path:%s Fail, ret:%d\n", __func__, path, ret);
} else { } else {
RTW_INFO("%s NULL pointer\n", __FUNCTION__); RTW_INFO("%s NULL pointer\n", __func__);
ret = -EINVAL; ret = -EINVAL;
} }
return ret; return ret;

8
os_dep/recv_linux.c
View file

@ -117,7 +117,7 @@ int rtw_os_alloc_recvframe(_adapter *padapter, union recv_frame *precvframe, u8
res = _FAIL; res = _FAIL;
#else #else
if ((pattrib->mfrag == 1) && (pattrib->frag_num == 0)) { if ((pattrib->mfrag == 1) && (pattrib->frag_num == 0)) {
RTW_INFO("%s: alloc_skb fail , drop frag frame\n", __FUNCTION__); RTW_INFO("%s: alloc_skb fail , drop frag frame\n", __func__);
/* rtw_free_recvframe(precvframe, pfree_recv_queue); */ /* rtw_free_recvframe(precvframe, pfree_recv_queue); */
res = _FAIL; res = _FAIL;
goto exit_rtw_os_recv_resource_alloc; goto exit_rtw_os_recv_resource_alloc;
@ -134,7 +134,7 @@ int rtw_os_alloc_recvframe(_adapter *padapter, union recv_frame *precvframe, u8
precvframe->u.hdr.rx_head = precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pdata; precvframe->u.hdr.rx_head = precvframe->u.hdr.rx_data = precvframe->u.hdr.rx_tail = pdata;
precvframe->u.hdr.rx_end = pdata + alloc_sz; precvframe->u.hdr.rx_end = pdata + alloc_sz;
} else { } else {
RTW_INFO("%s: rtw_skb_clone fail\n", __FUNCTION__); RTW_INFO("%s: rtw_skb_clone fail\n", __func__);
/* rtw_free_recvframe(precvframe, pfree_recv_queue); */ /* rtw_free_recvframe(precvframe, pfree_recv_queue); */
/*exit_rtw_os_recv_resource_alloc;*/ /*exit_rtw_os_recv_resource_alloc;*/
res = _FAIL; res = _FAIL;
@ -299,7 +299,7 @@ _pkt *rtw_os_alloc_msdu_pkt(union recv_frame *prframe, u16 nSubframe_Length, u8
sub_skb->len = nSubframe_Length; sub_skb->len = nSubframe_Length;
skb_set_tail_pointer(sub_skb, nSubframe_Length); skb_set_tail_pointer(sub_skb, nSubframe_Length);
} else { } else {
RTW_INFO("%s(): rtw_skb_clone() Fail!!!\n", __FUNCTION__); RTW_INFO("%s(): rtw_skb_clone() Fail!!!\n", __func__);
return NULL; return NULL;
} }
} }
@ -715,7 +715,7 @@ int rtw_recv_indicatepkt(_adapter *padapter, union recv_frame *precv_frame)
#ifdef CONFIG_WAPI_SUPPORT #ifdef CONFIG_WAPI_SUPPORT
if (rtw_wapi_check_for_drop(padapter, precv_frame)) { if (rtw_wapi_check_for_drop(padapter, precv_frame)) {
WAPI_TRACE(WAPI_ERR, "%s(): Rx Reorder Drop case!!\n", __FUNCTION__); WAPI_TRACE(WAPI_ERR, "%s(): Rx Reorder Drop case!!\n", __func__);
goto _recv_indicatepkt_drop; goto _recv_indicatepkt_drop;
} }
#endif #endif

48
os_dep/rtw_android.c
View file

@ -248,7 +248,7 @@ static int rtw_android_pno_setup(struct net_device *net, char *command, int tota
} }
str_ptr++; str_ptr++;
pno_repeat = simple_strtoul(str_ptr, &str_ptr, 16); pno_repeat = simple_strtoul(str_ptr, &str_ptr, 16);
RTW_INFO("%s :got pno_repeat=%d\n", __FUNCTION__, pno_repeat); RTW_INFO("%s :got pno_repeat=%d\n", __func__, pno_repeat);
if (str_ptr[0] != PNO_TLV_FREQ_EXPO_MAX) { if (str_ptr[0] != PNO_TLV_FREQ_EXPO_MAX) {
RTW_INFO("%s FREQ_EXPO_MAX corrupted field size\n", RTW_INFO("%s FREQ_EXPO_MAX corrupted field size\n",
__func__); __func__);
@ -261,7 +261,7 @@ static int rtw_android_pno_setup(struct net_device *net, char *command, int tota
} }
} }
} else { } else {
RTW_INFO("%s get wrong TLV command\n", __FUNCTION__); RTW_INFO("%s get wrong TLV command\n", __func__);
goto exit_proc; goto exit_proc;
} }
@ -621,13 +621,13 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
/*RTW_INFO("%s priv_cmd.buf=%p priv_cmd.total_len=%d priv_cmd.used_len=%d\n",__func__,priv_cmd.buf,priv_cmd.total_len,priv_cmd.used_len);*/ /*RTW_INFO("%s priv_cmd.buf=%p priv_cmd.total_len=%d priv_cmd.used_len=%d\n",__func__,priv_cmd.buf,priv_cmd.total_len,priv_cmd.used_len);*/
command = rtw_zmalloc(priv_cmd.total_len); command = rtw_zmalloc(priv_cmd.total_len);
if (!command) { if (!command) {
RTW_INFO("%s: failed to allocate memory\n", __FUNCTION__); RTW_INFO("%s: failed to allocate memory\n", __func__);
ret = -ENOMEM; ret = -ENOMEM;
goto exit; goto exit;
} }
if (!access_ok(VERIFY_READ, priv_cmd.buf, priv_cmd.total_len)) { if (!access_ok(VERIFY_READ, priv_cmd.buf, priv_cmd.total_len)) {
RTW_INFO("%s: failed to access memory\n", __FUNCTION__); RTW_INFO("%s: failed to access memory\n", __func__);
ret = -EFAULT; ret = -EFAULT;
goto exit; goto exit;
} }
@ -637,7 +637,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
} }
RTW_INFO("%s: Android private cmd \"%s\" on %s\n" RTW_INFO("%s: Android private cmd \"%s\" on %s\n"
, __FUNCTION__, command, ifr->ifr_name); , __func__, command, ifr->ifr_name);
cmd_num = rtw_android_cmdstr_to_num(command); cmd_num = rtw_android_cmdstr_to_num(command);
@ -651,7 +651,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
if (!g_wifi_on) { if (!g_wifi_on) {
RTW_INFO("%s: Ignore private cmd \"%s\" - iface %s is down\n" RTW_INFO("%s: Ignore private cmd \"%s\" - iface %s is down\n"
, __FUNCTION__, command, ifr->ifr_name); , __func__, command, ifr->ifr_name);
ret = 0; ret = 0;
goto exit; goto exit;
} }
@ -905,13 +905,13 @@ response:
if ((bytes_written == 0) && (priv_cmd.total_len > 0)) if ((bytes_written == 0) && (priv_cmd.total_len > 0))
command[0] = '\0'; command[0] = '\0';
if (bytes_written >= priv_cmd.total_len) { if (bytes_written >= priv_cmd.total_len) {
RTW_INFO("%s: bytes_written = %d\n", __FUNCTION__, bytes_written); RTW_INFO("%s: bytes_written = %d\n", __func__, bytes_written);
bytes_written = priv_cmd.total_len; bytes_written = priv_cmd.total_len;
} else } else
bytes_written++; bytes_written++;
priv_cmd.used_len = bytes_written; priv_cmd.used_len = bytes_written;
if (copy_to_user((void __user *)priv_cmd.buf, command, bytes_written)) { if (copy_to_user((void __user *)priv_cmd.buf, command, bytes_written)) {
RTW_INFO("%s: failed to copy data to user buffer\n", __FUNCTION__); RTW_INFO("%s: failed to copy data to user buffer\n", __func__);
ret = -EFAULT; ret = -EFAULT;
} }
} else } else
@ -946,7 +946,7 @@ int rtw_android_wifictrl_func_add(void)
ret = wifi_add_dev(); ret = wifi_add_dev();
if (ret) { if (ret) {
RTW_INFO("%s: platform_driver_register failed\n", __FUNCTION__); RTW_INFO("%s: platform_driver_register failed\n", __func__);
return ret; return ret;
} }
g_wifidev_registered = 1; g_wifidev_registered = 1;
@ -954,7 +954,7 @@ int rtw_android_wifictrl_func_add(void)
/* Waiting callback after platform_driver_register is done or exit with error */ /* Waiting callback after platform_driver_register is done or exit with error */
if (down_timeout(&wifi_control_sem, msecs_to_jiffies(1000)) != 0) { if (down_timeout(&wifi_control_sem, msecs_to_jiffies(1000)) != 0) {
ret = -EINVAL; ret = -EINVAL;
RTW_INFO("%s: platform_driver_register timeout\n", __FUNCTION__); RTW_INFO("%s: platform_driver_register timeout\n", __func__);
} }
return ret; return ret;
@ -1000,7 +1000,7 @@ int wifi_get_irq_number(unsigned long *irq_flags_ptr)
int wifi_set_power(int on, unsigned long msec) int wifi_set_power(int on, unsigned long msec)
{ {
RTW_INFO("%s = %d\n", __FUNCTION__, on); RTW_INFO("%s = %d\n", __func__, on);
if (wifi_control_data && wifi_control_data->set_power) if (wifi_control_data && wifi_control_data->set_power)
wifi_control_data->set_power(on); wifi_control_data->set_power(on);
if (msec) if (msec)
@ -1011,7 +1011,7 @@ int wifi_set_power(int on, unsigned long msec)
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35))
int wifi_get_mac_addr(unsigned char *buf) int wifi_get_mac_addr(unsigned char *buf)
{ {
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
if (!buf) if (!buf)
return -EINVAL; return -EINVAL;
if (wifi_control_data && wifi_control_data->get_mac_addr) if (wifi_control_data && wifi_control_data->get_mac_addr)
@ -1023,7 +1023,7 @@ int wifi_get_mac_addr(unsigned char *buf)
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) || defined(COMPAT_KERNEL_RELEASE) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) || defined(COMPAT_KERNEL_RELEASE)
void *wifi_get_country_code(char *ccode) void *wifi_get_country_code(char *ccode)
{ {
RTW_INFO("%s\n", __FUNCTION__); RTW_INFO("%s\n", __func__);
if (!ccode) if (!ccode)
return NULL; return NULL;
if (wifi_control_data && wifi_control_data->get_country_code) if (wifi_control_data && wifi_control_data->get_country_code)
@ -1034,7 +1034,7 @@ void *wifi_get_country_code(char *ccode)
static int wifi_set_carddetect(int on) static int wifi_set_carddetect(int on)
{ {
RTW_INFO("%s = %d\n", __FUNCTION__, on); RTW_INFO("%s = %d\n", __func__, on);
if (wifi_control_data && wifi_control_data->set_carddetect) if (wifi_control_data && wifi_control_data->set_carddetect)
wifi_control_data->set_carddetect(on); wifi_control_data->set_carddetect(on);
return 0; return 0;
@ -1046,7 +1046,7 @@ static int wifi_probe(struct platform_device *pdev)
(struct wifi_platform_data *)(pdev->dev.platform_data); (struct wifi_platform_data *)(pdev->dev.platform_data);
int wifi_wake_gpio = 0; int wifi_wake_gpio = 0;
RTW_INFO("## %s\n", __FUNCTION__); RTW_INFO("## %s\n", __func__);
wifi_irqres = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "bcmdhd_wlan_irq"); wifi_irqres = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "bcmdhd_wlan_irq");
if (wifi_irqres == NULL) if (wifi_irqres == NULL)
@ -1091,7 +1091,7 @@ static void shutdown_card(void)
u8 tmp8, cnt = 0; u8 tmp8, cnt = 0;
if (NULL == g_test_adapter) { if (NULL == g_test_adapter) {
RTW_INFO("%s: padapter==NULL\n", __FUNCTION__); RTW_INFO("%s: padapter==NULL\n", __func__);
return; return;
} }
@ -1154,7 +1154,7 @@ static int wifi_remove(struct platform_device *pdev)
struct wifi_platform_data *wifi_ctrl = struct wifi_platform_data *wifi_ctrl =
(struct wifi_platform_data *)(pdev->dev.platform_data); (struct wifi_platform_data *)(pdev->dev.platform_data);
RTW_INFO("## %s\n", __FUNCTION__); RTW_INFO("## %s\n", __func__);
wifi_control_data = wifi_ctrl; wifi_control_data = wifi_ctrl;
wifi_set_power(0, 0); /* Power Off */ wifi_set_power(0, 0); /* Power Off */
@ -1171,7 +1171,7 @@ static void wifi_shutdown(struct platform_device *pdev)
(struct wifi_platform_data *)(pdev->dev.platform_data); (struct wifi_platform_data *)(pdev->dev.platform_data);
RTW_INFO("## %s\n", __FUNCTION__); RTW_INFO("## %s\n", __func__);
wifi_control_data = wifi_ctrl; wifi_control_data = wifi_ctrl;
@ -1183,7 +1183,7 @@ static void wifi_shutdown(struct platform_device *pdev)
static int wifi_suspend(struct platform_device *pdev, pm_message_t state) static int wifi_suspend(struct platform_device *pdev, pm_message_t state)
{ {
RTW_INFO("##> %s\n", __FUNCTION__); RTW_INFO("##> %s\n", __func__);
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY) #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY)
bcmsdh_oob_intr_set(0); bcmsdh_oob_intr_set(0);
#endif #endif
@ -1192,7 +1192,7 @@ static int wifi_suspend(struct platform_device *pdev, pm_message_t state)
static int wifi_resume(struct platform_device *pdev) static int wifi_resume(struct platform_device *pdev)
{ {
RTW_INFO("##> %s\n", __FUNCTION__); RTW_INFO("##> %s\n", __func__);
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY) #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY)
if (dhd_os_check_if_up(bcmsdh_get_drvdata())) if (dhd_os_check_if_up(bcmsdh_get_drvdata()))
bcmsdh_oob_intr_set(1); bcmsdh_oob_intr_set(1);
@ -1245,21 +1245,21 @@ static void wifi_del_dev(void)
int wifi_configure_gpio(void) int wifi_configure_gpio(void)
{ {
if (gpio_request(oob_gpio, "oob_irq")) { if (gpio_request(oob_gpio, "oob_irq")) {
RTW_INFO("## %s Cannot request GPIO\n", __FUNCTION__); RTW_INFO("## %s Cannot request GPIO\n", __func__);
return -1; return -1;
} }
gpio_export(oob_gpio, 0); gpio_export(oob_gpio, 0);
if (gpio_direction_input(oob_gpio)) { if (gpio_direction_input(oob_gpio)) {
RTW_INFO("## %s Cannot set GPIO direction input\n", __FUNCTION__); RTW_INFO("## %s Cannot set GPIO direction input\n", __func__);
return -1; return -1;
} }
oob_irq = gpio_to_irq(oob_gpio); oob_irq = gpio_to_irq(oob_gpio);
if (oob_irq < 0) { if (oob_irq < 0) {
RTW_INFO("## %s Cannot convert GPIO to IRQ\n", __FUNCTION__); RTW_INFO("## %s Cannot convert GPIO to IRQ\n", __func__);
return -1; return -1;
} }
RTW_INFO("## %s OOB_IRQ=%d\n", __FUNCTION__, oob_irq); RTW_INFO("## %s OOB_IRQ=%d\n", __func__, oob_irq);
return 0; return 0;
} }

16
os_dep/rtw_cfgvendor.c
View file

@ -60,7 +60,7 @@ struct sk_buff *dbg_rtw_cfg80211_vendor_event_alloc(struct wiphy *wiphy, struct
truesize = skb->truesize; truesize = skb->truesize;
if (!skb || truesize < len || match_mstat_sniff_rules(flags, truesize)) if (!skb || truesize < len || match_mstat_sniff_rules(flags, truesize))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d), skb:%p, truesize=%u\n", func, line, __FUNCTION__, len, skb, truesize); RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d), skb:%p, truesize=%u\n", func, line, __func__, len, skb, truesize);
rtw_mstat_update( rtw_mstat_update(
flags flags
@ -77,7 +77,7 @@ void dbg_rtw_cfg80211_vendor_event(struct sk_buff *skb, gfp_t gfp
unsigned int truesize = skb->truesize; unsigned int truesize = skb->truesize;
if (match_mstat_sniff_rules(flags, truesize)) if (match_mstat_sniff_rules(flags, truesize))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __FUNCTION__, truesize); RTW_INFO("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __func__, truesize);
cfg80211_vendor_event(skb, gfp); cfg80211_vendor_event(skb, gfp);
@ -100,7 +100,7 @@ struct sk_buff *dbg_rtw_cfg80211_vendor_cmd_alloc_reply_skb(struct wiphy *wiphy,
truesize = skb->truesize; truesize = skb->truesize;
if (!skb || truesize < len || match_mstat_sniff_rules(flags, truesize)) if (!skb || truesize < len || match_mstat_sniff_rules(flags, truesize))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d), skb:%p, truesize=%u\n", func, line, __FUNCTION__, len, skb, truesize); RTW_INFO("DBG_MEM_ALLOC %s:%d %s(%d), skb:%p, truesize=%u\n", func, line, __func__, len, skb, truesize);
rtw_mstat_update( rtw_mstat_update(
flags flags
@ -118,7 +118,7 @@ int dbg_rtw_cfg80211_vendor_cmd_reply(struct sk_buff *skb
int ret; int ret;
if (match_mstat_sniff_rules(flags, truesize)) if (match_mstat_sniff_rules(flags, truesize))
RTW_INFO("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __FUNCTION__, truesize); RTW_INFO("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __func__, truesize);
ret = cfg80211_vendor_cmd_reply(skb); ret = cfg80211_vendor_cmd_reply(skb);
@ -132,16 +132,16 @@ int dbg_rtw_cfg80211_vendor_cmd_reply(struct sk_buff *skb
} }
#define rtw_cfg80211_vendor_event_alloc(wiphy, wdev, len, event_id, gfp) \ #define rtw_cfg80211_vendor_event_alloc(wiphy, wdev, len, event_id, gfp) \
dbg_rtw_cfg80211_vendor_event_alloc(wiphy, wdev, len, event_id, gfp, MSTAT_FUNC_CFG_VENDOR | MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) dbg_rtw_cfg80211_vendor_event_alloc(wiphy, wdev, len, event_id, gfp, MSTAT_FUNC_CFG_VENDOR | MSTAT_TYPE_SKB, __func__, __LINE__)
#define rtw_cfg80211_vendor_event(skb, gfp) \ #define rtw_cfg80211_vendor_event(skb, gfp) \
dbg_rtw_cfg80211_vendor_event(skb, gfp, MSTAT_FUNC_CFG_VENDOR | MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) dbg_rtw_cfg80211_vendor_event(skb, gfp, MSTAT_FUNC_CFG_VENDOR | MSTAT_TYPE_SKB, __func__, __LINE__)
#define rtw_cfg80211_vendor_cmd_alloc_reply_skb(wiphy, len) \ #define rtw_cfg80211_vendor_cmd_alloc_reply_skb(wiphy, len) \
dbg_rtw_cfg80211_vendor_cmd_alloc_reply_skb(wiphy, len, MSTAT_FUNC_CFG_VENDOR | MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) dbg_rtw_cfg80211_vendor_cmd_alloc_reply_skb(wiphy, len, MSTAT_FUNC_CFG_VENDOR | MSTAT_TYPE_SKB, __func__, __LINE__)
#define rtw_cfg80211_vendor_cmd_reply(skb) \ #define rtw_cfg80211_vendor_cmd_reply(skb) \
dbg_rtw_cfg80211_vendor_cmd_reply(skb, MSTAT_FUNC_CFG_VENDOR | MSTAT_TYPE_SKB, __FUNCTION__, __LINE__) dbg_rtw_cfg80211_vendor_cmd_reply(skb, MSTAT_FUNC_CFG_VENDOR | MSTAT_TYPE_SKB, __func__, __LINE__)
#else #else
static struct sk_buff *rtw_cfg80211_vendor_event_alloc( static struct sk_buff *rtw_cfg80211_vendor_event_alloc(

14
os_dep/rtw_proc.c
View file

@ -1822,11 +1822,11 @@ static int btreg_parse_str(char const *input, u8 *type, u16 *addr, u16 *val)
num = sscanf(input, "%s %x %x", str, &a, &v); num = sscanf(input, "%s %x %x", str, &a, &v);
if (num < 2) { if (num < 2) {
RTW_INFO("%s: INVALID input!(%s)\n", __FUNCTION__, input); RTW_INFO("%s: INVALID input!(%s)\n", __func__, input);
return -EINVAL; return -EINVAL;
} }
if ((num < 3) && val) { if ((num < 3) && val) {
RTW_INFO("%s: INVALID input!(%s)\n", __FUNCTION__, input); RTW_INFO("%s: INVALID input!(%s)\n", __func__, input);
return -EINVAL; return -EINVAL;
} }
@ -1842,7 +1842,7 @@ static int btreg_parse_str(char const *input, u8 *type, u16 *addr, u16 *val)
} }
} }
if (i == n) { if (i == n) {
RTW_INFO("%s: unknown type(%s)!\n", __FUNCTION__, str); RTW_INFO("%s: unknown type(%s)!\n", __func__, str);
return -EINVAL; return -EINVAL;
} }
@ -1851,7 +1851,7 @@ static int btreg_parse_str(char const *input, u8 *type, u16 *addr, u16 *val)
/* RF */ /* RF */
if (a & 0xFFFFFF80) { if (a & 0xFFFFFF80) {
RTW_INFO("%s: INVALID address(0x%X) for type %s(%d)!\n", RTW_INFO("%s: INVALID address(0x%X) for type %s(%d)!\n",
__FUNCTION__, a, btreg_type[t], t); __func__, a, btreg_type[t], t);
return -EINVAL; return -EINVAL;
} }
break; break;
@ -1859,7 +1859,7 @@ static int btreg_parse_str(char const *input, u8 *type, u16 *addr, u16 *val)
/* Modem */ /* Modem */
if (a & 0xFFFFFE00) { if (a & 0xFFFFFE00) {
RTW_INFO("%s: INVALID address(0x%X) for type %s(%d)!\n", RTW_INFO("%s: INVALID address(0x%X) for type %s(%d)!\n",
__FUNCTION__, a, btreg_type[t], t); __func__, a, btreg_type[t], t);
return -EINVAL; return -EINVAL;
} }
break; break;
@ -1867,7 +1867,7 @@ static int btreg_parse_str(char const *input, u8 *type, u16 *addr, u16 *val)
/* Others(Bluewize, Vendor, LE) */ /* Others(Bluewize, Vendor, LE) */
if (a & 0xFFFFF000) { if (a & 0xFFFFF000) {
RTW_INFO("%s: INVALID address(0x%X) for type %s(%d)!\n", RTW_INFO("%s: INVALID address(0x%X) for type %s(%d)!\n",
__FUNCTION__, a, btreg_type[t], t); __func__, a, btreg_type[t], t);
return -EINVAL; return -EINVAL;
} }
break; break;
@ -1875,7 +1875,7 @@ static int btreg_parse_str(char const *input, u8 *type, u16 *addr, u16 *val)
if (val) { if (val) {
if (v & 0xFFFF0000) { if (v & 0xFFFF0000) {
RTW_INFO("%s: INVALID value(0x%x)!\n", __FUNCTION__, v); RTW_INFO("%s: INVALID value(0x%x)!\n", __func__, v);
return -EINVAL; return -EINVAL;
} }
*val = (u16)v; *val = (u16)v;

115
os_dep/usb_intf.c
View file

@ -62,7 +62,7 @@ static void rtw_dev_shutdown(struct device *dev)
struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(adapter); struct pwrctrl_priv *pwrctl = adapter_to_pwrctl(adapter);
#ifdef CONFIG_WOWLAN #ifdef CONFIG_WOWLAN
if (pwrctl->wowlan_mode == _TRUE) if (pwrctl->wowlan_mode == _TRUE)
RTW_INFO("%s wowlan_mode ==_TRUE do not run rtw_hal_deinit()\n", __FUNCTION__); RTW_INFO("%s wowlan_mode ==_TRUE do not run rtw_hal_deinit()\n", __func__);
else else
#endif #endif
{ {
@ -280,55 +280,8 @@ static void rtw_decide_chip_type_by_usb_info(struct dvobj_priv *pdvobjpriv, cons
{ {
pdvobjpriv->chip_type = pdid->driver_info; pdvobjpriv->chip_type = pdid->driver_info;
#ifdef CONFIG_RTL8188E
if (pdvobjpriv->chip_type == RTL8188E) if (pdvobjpriv->chip_type == RTL8188E)
rtl8188eu_set_hw_type(pdvobjpriv); rtl8188eu_set_hw_type(pdvobjpriv);
#endif
#if defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A)
if (pdvobjpriv->chip_type == RTL8812 || pdvobjpriv->chip_type == RTL8821)
rtl8812au_set_hw_type(pdvobjpriv);
#endif
#ifdef CONFIG_RTL8192E
if (pdvobjpriv->chip_type == RTL8192E)
rtl8192eu_set_hw_type(pdvobjpriv);
#endif
#ifdef CONFIG_RTL8723B
if (pdvobjpriv->chip_type == RTL8723B)
rtl8723bu_set_hw_type(pdvobjpriv);
#endif
#ifdef CONFIG_RTL8814A
if (pdvobjpriv->chip_type == RTL8814A)
rtl8814au_set_hw_type(pdvobjpriv);
#endif /* CONFIG_RTL8814A */
#ifdef CONFIG_RTL8188F
if (pdvobjpriv->chip_type == RTL8188F)
rtl8188fu_set_hw_type(pdvobjpriv);
#endif
#ifdef CONFIG_RTL8703B
if (pdvobjpriv->chip_type == RTL8703B)
rtl8703bu_set_hw_type(pdvobjpriv);
#endif /* CONFIG_RTL8703B */
#ifdef CONFIG_RTL8822B
if (pdvobjpriv->chip_type == RTL8822B)
rtl8822bu_set_hw_type(pdvobjpriv);
#endif /* CONFIG_RTL8822B */
#ifdef CONFIG_RTL8723D
if (pdvobjpriv->chip_type == RTL8723D)
rtl8723du_set_hw_type(pdvobjpriv);
#endif /* CONFIG_RTL8723D */
#ifdef CONFIG_RTL8821C
if (pdvobjpriv->chip_type == RTL8821C)
rtl8821cu_set_hw_type(pdvobjpriv);
#endif /* CONFIG_RTL8821C */
} }
static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf, const struct usb_device_id *pdid) static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf, const struct usb_device_id *pdid)
@ -515,56 +468,8 @@ u8 rtw_set_hal_ops(_adapter *padapter)
if (rtw_hal_data_init(padapter) == _FAIL) if (rtw_hal_data_init(padapter) == _FAIL)
return _FAIL; return _FAIL;
#ifdef CONFIG_RTL8188E
if (rtw_get_chip_type(padapter) == RTL8188E) if (rtw_get_chip_type(padapter) == RTL8188E)
rtl8188eu_set_hal_ops(padapter); rtl8188eu_set_hal_ops(padapter);
#endif
#if defined(CONFIG_RTL8812A) || defined(CONFIG_RTL8821A)
if (rtw_get_chip_type(padapter) == RTL8812 || rtw_get_chip_type(padapter) == RTL8821)
rtl8812au_set_hal_ops(padapter);
#endif
#ifdef CONFIG_RTL8192E
if (rtw_get_chip_type(padapter) == RTL8192E)
rtl8192eu_set_hal_ops(padapter);
#endif
#ifdef CONFIG_RTL8723B
if (rtw_get_chip_type(padapter) == RTL8723B)
rtl8723bu_set_hal_ops(padapter);
#endif
#ifdef CONFIG_RTL8814A
if (rtw_get_chip_type(padapter) == RTL8814A)
rtl8814au_set_hal_ops(padapter);
#endif /* CONFIG_RTL8814A */
#ifdef CONFIG_RTL8188F
if (rtw_get_chip_type(padapter) == RTL8188F)
rtl8188fu_set_hal_ops(padapter);
#endif
#ifdef CONFIG_RTL8703B
if (rtw_get_chip_type(padapter) == RTL8703B)
rtl8703bu_set_hal_ops(padapter);
#endif /* CONFIG_RTL8703B */
#ifdef CONFIG_RTL8822B
if (rtw_get_chip_type(padapter) == RTL8822B)
rtl8822bu_set_hal_ops(padapter);
#endif /* CONFIG_RTL8822B */
#ifdef CONFIG_RTL8723D
if (rtw_get_chip_type(padapter) == RTL8723D)
rtl8723du_set_hal_ops(padapter);
#endif /* CONFIG_RTL8723D */
#ifdef CONFIG_RTL8821C
if (rtw_get_chip_type(padapter) == RTL8821C) {
if (rtl8821cu_set_hal_ops(padapter) == _FAIL)
return _FAIL;
}
#endif
if (_FAIL == rtw_hal_ops_check(padapter)) if (_FAIL == rtw_hal_ops_check(padapter))
return _FAIL; return _FAIL;
@ -633,7 +538,7 @@ static void process_spec_devid(const struct usb_device_id *pdid)
if ((pdid->idVendor == vid) && (pdid->idProduct == pid) && (flags & SPEC_DEV_ID_ASSIGN_IFNAME)) { if ((pdid->idVendor == vid) && (pdid->idProduct == pid) && (flags & SPEC_DEV_ID_ASSIGN_IFNAME)) {
extern char *ifname; extern char *ifname;
strncpy(ifname, "wlan10", 6); strncpy(ifname, "wlan10", 6);
/* RTW_INFO("%s()-%d: ifname=%s, vid=%04X, pid=%04X\n", __FUNCTION__, __LINE__, ifname, vid, pid); */ /* RTW_INFO("%s()-%d: ifname=%s, vid=%04X, pid=%04X\n", __func__, __LINE__, ifname, vid, pid); */
} }
#endif /* RTK_DMP_PLATFORM */ #endif /* RTK_DMP_PLATFORM */
@ -708,7 +613,7 @@ int rtw_hw_suspend(_adapter *padapter)
return 0; return 0;
error_exit: error_exit:
RTW_INFO("%s, failed\n", __FUNCTION__); RTW_INFO("%s, failed\n", __func__);
return -1; return -1;
} }
@ -743,7 +648,7 @@ int rtw_hw_resume(_adapter *padapter)
return 0; return 0;
error_exit: error_exit:
RTW_INFO("%s, Open net dev failed\n", __FUNCTION__); RTW_INFO("%s, Open net dev failed\n", __func__);
return -1; return -1;
} }
#endif #endif
@ -763,7 +668,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
padapter = dvobj_get_primary_adapter(dvobj); padapter = dvobj_get_primary_adapter(dvobj);
if (pwrpriv->bInSuspend == _TRUE) { if (pwrpriv->bInSuspend == _TRUE) {
RTW_INFO("%s bInSuspend = %d\n", __FUNCTION__, pwrpriv->bInSuspend); RTW_INFO("%s bInSuspend = %d\n", __func__, pwrpriv->bInSuspend);
pdbgpriv->dbg_suspend_error_cnt++; pdbgpriv->dbg_suspend_error_cnt++;
goto exit; goto exit;
} }
@ -799,7 +704,7 @@ static int rtw_resume_process(_adapter *padapter)
if (pwrpriv->bInSuspend == _FALSE) { if (pwrpriv->bInSuspend == _FALSE) {
pdbgpriv->dbg_resume_error_cnt++; pdbgpriv->dbg_resume_error_cnt++;
RTW_INFO("%s bInSuspend = %d\n", __FUNCTION__, pwrpriv->bInSuspend); RTW_INFO("%s bInSuspend = %d\n", __func__, pwrpriv->bInSuspend);
return -1; return -1;
} }
@ -876,7 +781,7 @@ static int rtw_resume(struct usb_interface *pusb_intf)
padapter = dvobj_get_primary_adapter(dvobj); padapter = dvobj_get_primary_adapter(dvobj);
pmlmeext = &padapter->mlmeextpriv; pmlmeext = &padapter->mlmeextpriv;
RTW_INFO("==> %s (%s:%d)\n", __FUNCTION__, current->comm, current->pid); RTW_INFO("==> %s (%s:%d)\n", __func__, current->comm, current->pid);
pdbgpriv->dbg_resume_cnt++; pdbgpriv->dbg_resume_cnt++;
if (pwrpriv->bInternalAutoSuspend) if (pwrpriv->bInternalAutoSuspend)
@ -903,7 +808,7 @@ static int rtw_resume(struct usb_interface *pusb_intf)
} }
pmlmeext->last_scan_time = rtw_get_current_time(); pmlmeext->last_scan_time = rtw_get_current_time();
RTW_INFO("<======== %s return %d\n", __FUNCTION__, ret); RTW_INFO("<======== %s return %d\n", __func__, ret);
return ret; return ret;
} }
@ -1137,9 +1042,9 @@ static _adapter *rtw_usb_primary_adapter_init(struct dvobj_priv *dvobj,
/* usb_autopm_get_interface(adapter_to_dvobj(padapter)->pusbintf ); */ /* init pm_usage_cnt ,let it start from 1 */ /* usb_autopm_get_interface(adapter_to_dvobj(padapter)->pusbintf ); */ /* init pm_usage_cnt ,let it start from 1 */
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 32))
RTW_INFO("%s...pm_usage_cnt(%d).....\n", __FUNCTION__, atomic_read(&(dvobj->pusbintf->pm_usage_cnt))); RTW_INFO("%s...pm_usage_cnt(%d).....\n", __func__, atomic_read(&(dvobj->pusbintf->pm_usage_cnt)));
#else #else
RTW_INFO("%s...pm_usage_cnt(%d).....\n", __FUNCTION__, dvobj->pusbintf->pm_usage_cnt); RTW_INFO("%s...pm_usage_cnt(%d).....\n", __func__, dvobj->pusbintf->pm_usage_cnt);
#endif #endif
} }
} }

10
os_dep/usb_ops_linux.c
View file

@ -47,7 +47,7 @@ int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u16 inde
u8 tmp_buf[MAX_USB_IO_CTL_SIZE]; u8 tmp_buf[MAX_USB_IO_CTL_SIZE];
#endif #endif
/* RTW_INFO("%s %s:%d\n",__FUNCTION__, current->comm, current->pid); */ /* RTW_INFO("%s %s:%d\n",__func__, current->comm, current->pid); */
if (RTW_CANNOT_IO(padapter)) { if (RTW_CANNOT_IO(padapter)) {
status = -EPERM; status = -EPERM;
@ -55,7 +55,7 @@ int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u16 inde
} }
if (len > MAX_VENDOR_REQ_CMD_SIZE) { if (len > MAX_VENDOR_REQ_CMD_SIZE) {
RTW_INFO("[%s] Buffer len error ,vendor request failed\n", __FUNCTION__); RTW_INFO("[%s] Buffer len error ,vendor request failed\n", __func__);
status = -EINVAL; status = -EINVAL;
goto exit; goto exit;
} }
@ -83,7 +83,7 @@ int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u16 inde
#endif #endif
if (pIo_buf == NULL) { if (pIo_buf == NULL) {
RTW_INFO("[%s] pIo_buf == NULL\n", __FUNCTION__); RTW_INFO("[%s] pIo_buf == NULL\n", __func__);
status = -ENOMEM; status = -ENOMEM;
goto release_mutex; goto release_mutex;
} }
@ -729,7 +729,7 @@ void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
if ((purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)) { if ((purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)) {
RTW_INFO("%s()-%d: urb->actual_length:%u, MAX_RECVBUF_SZ:%u, RXDESC_SIZE:%u\n" RTW_INFO("%s()-%d: urb->actual_length:%u, MAX_RECVBUF_SZ:%u, RXDESC_SIZE:%u\n"
, __FUNCTION__, __LINE__, purb->actual_length, MAX_RECVBUF_SZ, RXDESC_SIZE); , __func__, __LINE__, purb->actual_length, MAX_RECVBUF_SZ, RXDESC_SIZE);
rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
} else { } else {
rtw_reset_continual_io_error(adapter_to_dvobj(padapter)); rtw_reset_continual_io_error(adapter_to_dvobj(padapter));
@ -884,7 +884,7 @@ void usb_read_port_complete(struct urb *purb, struct pt_regs *regs)
if ((purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)) { if ((purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)) {
RTW_INFO("%s()-%d: urb->actual_length:%u, MAX_RECVBUF_SZ:%u, RXDESC_SIZE:%u\n" RTW_INFO("%s()-%d: urb->actual_length:%u, MAX_RECVBUF_SZ:%u, RXDESC_SIZE:%u\n"
, __FUNCTION__, __LINE__, purb->actual_length, MAX_RECVBUF_SZ, RXDESC_SIZE); , __func__, __LINE__, purb->actual_length, MAX_RECVBUF_SZ, RXDESC_SIZE);
rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf);
} else { } else {
rtw_reset_continual_io_error(adapter_to_dvobj(padapter)); rtw_reset_continual_io_error(adapter_to_dvobj(padapter));

12
os_dep/xmit_linux.c
View file

@ -94,11 +94,11 @@ void rtw_set_tx_chksum_offload(_pkt *pkt, struct pkt_attrib *pattrib)
udp->check = 0; udp->check = 0;
#endif #endif
} else { } else {
RTW_INFO("%s-%d TCP CSUM offload Error!!\n", __FUNCTION__, __LINE__); RTW_INFO("%s-%d TCP CSUM offload Error!!\n", __func__, __LINE__);
WARN_ON(1); /* we need a WARN() */ WARN_ON(1); /* we need a WARN() */
} }
} else { /* IP fragmentation case */ } else { /* IP fragmentation case */
RTW_INFO("%s-%d nr_frags != 0, using skb_checksum_help(skb);!!\n", __FUNCTION__, __LINE__); RTW_INFO("%s-%d nr_frags != 0, using skb_checksum_help(skb);!!\n", __func__, __LINE__);
skb_checksum_help(skb); skb_checksum_help(skb);
} }
} }
@ -421,13 +421,13 @@ int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb)
res = rtw_xmit(padapter, &newskb); res = rtw_xmit(padapter, &newskb);
if (res < 0) { if (res < 0) {
DBG_COUNTER(padapter->tx_logs.os_tx_m2u_entry_err_xmit); DBG_COUNTER(padapter->tx_logs.os_tx_m2u_entry_err_xmit);
RTW_INFO("%s()-%d: rtw_xmit() return error! res=%d\n", __FUNCTION__, __LINE__, res); RTW_INFO("%s()-%d: rtw_xmit() return error! res=%d\n", __func__, __LINE__, res);
pxmitpriv->tx_drop++; pxmitpriv->tx_drop++;
rtw_skb_free(newskb); rtw_skb_free(newskb);
} }
} else { } else {
DBG_COUNTER(padapter->tx_logs.os_tx_m2u_entry_err_skb); DBG_COUNTER(padapter->tx_logs.os_tx_m2u_entry_err_skb);
RTW_INFO("%s-%d: rtw_skb_copy() failed!\n", __FUNCTION__, __LINE__); RTW_INFO("%s-%d: rtw_skb_copy() failed!\n", __func__, __LINE__);
pxmitpriv->tx_drop++; pxmitpriv->tx_drop++;
/* rtw_skb_free(skb); */ /* rtw_skb_free(skb); */
return _FALSE; /* Caller shall tx this multicast frame via normal way. */ return _FALSE; /* Caller shall tx this multicast frame via normal way. */
@ -462,7 +462,7 @@ int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev)
if (rtw_if_up(padapter) == _FALSE) { if (rtw_if_up(padapter) == _FALSE) {
DBG_COUNTER(padapter->tx_logs.os_tx_err_up); DBG_COUNTER(padapter->tx_logs.os_tx_err_up);
#ifdef DBG_TX_DROP_FRAME #ifdef DBG_TX_DROP_FRAME
RTW_INFO("DBG_TX_DROP_FRAME %s if_up fail\n", __FUNCTION__); RTW_INFO("DBG_TX_DROP_FRAME %s if_up fail\n", __func__);
#endif #endif
goto drop_packet; goto drop_packet;
} }
@ -495,7 +495,7 @@ int _rtw_xmit_entry(_pkt *pkt, _nic_hdl pnetdev)
res = rtw_xmit(padapter, &pkt); res = rtw_xmit(padapter, &pkt);
if (res < 0) { if (res < 0) {
#ifdef DBG_TX_DROP_FRAME #ifdef DBG_TX_DROP_FRAME
RTW_INFO("DBG_TX_DROP_FRAME %s rtw_xmit fail\n", __FUNCTION__); RTW_INFO("DBG_TX_DROP_FRAME %s rtw_xmit fail\n", __func__);
#endif #endif
goto drop_packet; goto drop_packet;
} }