diff --git a/core/rtw_ap.c b/core/rtw_ap.c index 2a2ca9c..6866107 100644 --- a/core/rtw_ap.c +++ b/core/rtw_ap.c @@ -91,7 +91,7 @@ static void update_BCNTIM(_adapter *padapter) WLAN_BSSID_EX *pnetwork_mlmeext = &(pmlmeinfo->network); unsigned char *pie = pnetwork_mlmeext->IEs; - //DBG_871X("%s\n", __FUNCTION__); + //DBG_871X("%s\n", __func__); //update TIM IE //if (pstapriv->tim_bitmap) @@ -776,7 +776,7 @@ void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level) tx_ra_bitmap |= ((raid<<28)&0xf0000000); DBG_871X("%s=> mac_id:%d , raid:%d , bitmap=0x%x, arg=0x%x\n", - __FUNCTION__ , psta->mac_id, raid ,tx_ra_bitmap, arg); + __func__ , psta->mac_id, raid ,tx_ra_bitmap, arg); //bitmap[0:27] = tx_rate_bitmap //bitmap[28:31]= Rate Adaptive id @@ -926,7 +926,7 @@ void update_sta_info_apmode(_adapter *padapter, struct sta_info *psta) //psta->mac_id = psta->aid+4; psta->mac_id = psta->aid+1; - DBG_871X("%s\n",__FUNCTION__); + DBG_871X("%s\n",__func__); //ap mode rtw_hal_set_odm_var(padapter,HAL_ODM_STA_INFO,psta,_TRUE); @@ -1008,7 +1008,7 @@ static void update_hw_ht_param(_adapter *padapter) struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); //handle A-MPDU parameter field @@ -1036,7 +1036,7 @@ static void update_hw_ht_param(_adapter *padapter) { pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; }*/ - DBG_871X("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__FUNCTION__); + DBG_871X("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__func__); } // @@ -1065,7 +1065,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf) struct wifidirect_info *pwdinfo = &(padapter->wdinfo); #endif //CONFIG_P2P - //DBG_871X("%s\n", __FUNCTION__); + //DBG_871X("%s\n", __func__); bcn_interval = (u16)pnetwork->Configuration.BeaconPeriod; cur_channel = pnetwork->Configuration.DSConfig; @@ -1376,7 +1376,7 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len) /* ht_capab, ht_oper */ /* WPS IE */ - DBG_871X("%s, len=%d\n", __FUNCTION__, len); + DBG_871X("%s, len=%d\n", __func__, len); if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) return _FAIL; @@ -1882,7 +1882,7 @@ int rtw_acl_remove_sta(_adapter *padapter, u8 *addr) static void update_bcn_fixed_ie(_adapter *padapter) { - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); } @@ -1895,7 +1895,7 @@ static void update_bcn_erpinfo_ie(_adapter *padapter) unsigned char *p, *ie = pnetwork->IEs; u32 len = 0; - DBG_871X("%s, ERP_enable=%d\n", __FUNCTION__, pmlmeinfo->ERP_enable); + DBG_871X("%s, ERP_enable=%d\n", __func__, pmlmeinfo->ERP_enable); if (!pmlmeinfo->ERP_enable) return; @@ -1923,31 +1923,31 @@ static void update_bcn_erpinfo_ie(_adapter *padapter) static void update_bcn_htcap_ie(_adapter *padapter) { - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); } static void update_bcn_htinfo_ie(_adapter *padapter) { - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); } static void update_bcn_rsn_ie(_adapter *padapter) { - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); } static void update_bcn_wpa_ie(_adapter *padapter) { - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); } static void update_bcn_wmm_ie(_adapter *padapter) { - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); } @@ -1963,7 +1963,7 @@ static void update_bcn_wps_ie(_adapter *padapter) u32 ielen = pnetwork->IELength; - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); pwps_ie = rtw_get_wps_ie(ie+_FIXED_IE_LENGTH_, ielen-_FIXED_IE_LENGTH_, NULL, &wps_ielen); @@ -2014,7 +2014,7 @@ static void update_bcn_p2p_ie(_adapter *padapter) static void update_bcn_vendor_spec_ie(_adapter *padapter, u8*oui) { - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); if (_rtw_memcmp(RTW_WPA_OUI, oui, 4)) { @@ -2047,7 +2047,7 @@ void update_beacon(_adapter *padapter, u8 ie_id, u8 *oui, u8 tx) struct mlme_ext_priv *pmlmeext; //struct mlme_ext_info *pmlmeinfo; - //DBG_871X("%s\n", __FUNCTION__); + //DBG_871X("%s\n", __func__); if (!padapter) return; @@ -2157,7 +2157,7 @@ static int rtw_ht_operation_update(_adapter *padapter) // return 0; DBG_871X("%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) && pmlmepriv->num_sta_ht_no_gf) { @@ -2208,7 +2208,7 @@ static int rtw_ht_operation_update(_adapter *padapter) } DBG_871X("%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; @@ -2411,7 +2411,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta) } DBG_871X("%s STA " MAC_FMT " - no " "greenfield, num of non-gf stations %d\n", - __FUNCTION__, MAC_ARG(psta->hwaddr), + __func__, MAC_ARG(psta->hwaddr), pmlmepriv->num_sta_ht_no_gf); } @@ -2422,7 +2422,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta) } DBG_871X("%s STA " MAC_FMT " - 20 MHz HT, " "num of 20MHz HT STAs %d\n", - __FUNCTION__, MAC_ARG(psta->hwaddr), + __func__, MAC_ARG(psta->hwaddr), pmlmepriv->num_sta_ht_20mhz); } @@ -2436,7 +2436,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta) if (pmlmepriv->htpriv.ht_option == _TRUE) { DBG_871X("%s STA " MAC_FMT " - no HT, num of non-HT stations %d\n", - __FUNCTION__, MAC_ARG(psta->hwaddr), + __func__, MAC_ARG(psta->hwaddr), pmlmepriv->num_sta_no_ht); } } diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index 4388118..fe739b5 100644 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -332,7 +332,7 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj) || pcmdpriv->cmdthd_running== _FALSE //com_thread not running ) { - //DBG_871X("%s:%s: drop cmdcode:%u, hw_init_completed:%u, cmdthd_running:%u\n", caller_func, __FUNCTION__, + //DBG_871X("%s:%s: drop cmdcode:%u, hw_init_completed:%u, cmdthd_running:%u\n", caller_func, __func__, // cmd_obj->cmdcode, // pcmdpriv->padapter->hw_init_completed, // pcmdpriv->cmdthd_running @@ -455,7 +455,7 @@ _func_enter_; if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved == _TRUE)) { DBG_871X("%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n", - __FUNCTION__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__); + __func__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__); break; } @@ -463,7 +463,7 @@ _func_enter_; if (rtw_register_cmd_alive(padapter) != _SUCCESS) { RT_TRACE(_module_hal_xmit_c_, _drv_notice_, - ("%s: wait to leave LPS_LCLK\n", __FUNCTION__)); + ("%s: wait to leave LPS_LCLK\n", __func__)); continue; } #endif @@ -472,7 +472,7 @@ _next: if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE)) { DBG_871X("%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n", - __FUNCTION__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__); + __func__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__); break; } @@ -533,7 +533,7 @@ post_process: } else { - RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("%s: cmdcode=0x%x callback not defined!\n", __FUNCTION__, pcmd->cmdcode)); + RT_TRACE(_module_rtl871x_cmd_c_,_drv_err_,("%s: cmdcode=0x%x callback not defined!\n", __func__, pcmd->cmdcode)); rtw_free_cmd_obj(pcmd); } @@ -551,7 +551,7 @@ post_process: if (pcmd==NULL) break; - //DBG_871X("%s: leaving... drop cmdcode:%u\n", __FUNCTION__, pcmd->cmdcode); + //DBG_871X("%s: leaving... drop cmdcode:%u\n", __func__, pcmd->cmdcode); rtw_free_cmd_obj(pcmd); }while (1); @@ -724,7 +724,7 @@ _func_enter_; rtw_free_network_queue(padapter, _FALSE); - RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("%s: flush network queue\n", __FUNCTION__)); + RT_TRACE(_module_rtl871x_cmd_c_, _drv_info_, ("%s: flush network queue\n", __func__)); init_h2fwcmd_w_parm_no_rsp(ph2c, psurveyPara, GEN_CMD_CODE(_SiteSurvey)); diff --git a/core/rtw_efuse.c b/core/rtw_efuse.c index 9ce33be..114877b 100644 --- a/core/rtw_efuse.c +++ b/core/rtw_efuse.c @@ -867,9 +867,9 @@ u8 rtw_BT_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data) if (word_en != 0xF) { - DBG_871X("%s: offset=%#X\n", __FUNCTION__, offset); - DBG_871X("%s: word_en=%#X\n", __FUNCTION__, word_en); - DBG_871X("%s: data=", __FUNCTION__); + DBG_871X("%s: offset=%#X\n", __func__, offset); + DBG_871X("%s: word_en=%#X\n", __func__, word_en); + DBG_871X("%s: data=", __func__); for (i=0; i 0) { - RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie length mismatch, %u too much", __FUNCTION__, left)); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie length mismatch, %u too much", __func__, left)); return _FAIL; } @@ -644,7 +644,7 @@ int rtw_parse_wpa_ie(u8* wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis if (count == 0 || left < count * WPA_SELECTOR_LEN) { RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie count botch (pairwise), " - "count %u left %u", __FUNCTION__, count, left)); + "count %u left %u", __func__, count, left)); return _FAIL; } @@ -659,7 +659,7 @@ int rtw_parse_wpa_ie(u8* wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis } else if (left == 1) { - RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie too short (for key mgmt)", __FUNCTION__)); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie too short (for key mgmt)", __func__)); return _FAIL; } @@ -667,7 +667,7 @@ int rtw_parse_wpa_ie(u8* wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis if (left >= 6) { pos += 2; if (_rtw_memcmp(pos, SUITE_1X, 4) == 1) { - RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("%s : there has 802.1x auth\n", __FUNCTION__)); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("%s : there has 802.1x auth\n", __func__)); *is_8021x = 1; } } @@ -708,7 +708,7 @@ int rtw_parse_wpa2_ie(u8* rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi left -= RSN_SELECTOR_LEN; } else if (left > 0) { - RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie length mismatch, %u too much", __FUNCTION__, left)); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie length mismatch, %u too much", __func__, left)); return _FAIL; } @@ -722,7 +722,7 @@ int rtw_parse_wpa2_ie(u8* rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi if (count == 0 || left < count * RSN_SELECTOR_LEN) { RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie count botch (pairwise), " - "count %u left %u", __FUNCTION__, count, left)); + "count %u left %u", __func__, count, left)); return _FAIL; } @@ -737,7 +737,7 @@ int rtw_parse_wpa2_ie(u8* rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi } else if (left == 1) { - RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie too short (for key mgmt)", __FUNCTION__)); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s: ie too short (for key mgmt)", __func__)); return _FAIL; } @@ -746,7 +746,7 @@ int rtw_parse_wpa2_ie(u8* rsn_ie, int rsn_ie_len, int *group_cipher, int *pairwi if (left >= 6) { pos += 2; if (_rtw_memcmp(pos, SUITE_1X, 4) == 1) { - RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("%s (): there has 802.1x auth\n", __FUNCTION__)); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("%s (): there has 802.1x auth\n", __func__)); *is_8021x = 1; } } @@ -972,7 +972,7 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id ,u8 *buf_att u16 attr_data_len = RTW_GET_BE16(attr_ptr + 2); u16 attr_len = attr_data_len + 4; - //DBG_871X("%s attr_ptr:%p, id:%u, length:%u\n", __FUNCTION__, attr_ptr, attr_id, attr_data_len); + //DBG_871X("%s attr_ptr:%p, id:%u, length:%u\n", __func__, attr_ptr, attr_id, attr_data_len); if ( attr_id == target_attr_id ) { target_attr_ptr = attr_ptr; @@ -1339,7 +1339,7 @@ void dump_ies(u8 *buf, u32 buf_len) { id = *pos; len = *(pos+1); - DBG_871X("%s ID:%u, LEN:%u\n", __FUNCTION__, id, len); + DBG_871X("%s ID:%u, LEN:%u\n", __func__, id, len); #ifdef CONFIG_P2P dump_p2p_ie(pos, len); #endif @@ -1366,7 +1366,7 @@ void dump_wps_ie(u8 *ie, u32 ie_len) { id = RTW_GET_BE16(pos); len = RTW_GET_BE16(pos + 2); - DBG_871X("%s ID:0x%04x, LEN:%u\n", __FUNCTION__, id, len); + DBG_871X("%s ID:0x%04x, LEN:%u\n", __func__, id, len); pos+=(4+len); } @@ -1390,7 +1390,7 @@ void dump_p2p_ie(u8 *ie, u32 ie_len) { id = *pos; len = RTW_GET_LE16(pos+1); - DBG_871X("%s ID:%u, LEN:%u\n", __FUNCTION__, id, len); + DBG_871X("%s ID:%u, LEN:%u\n", __func__, id, len); pos+=(3+len); } @@ -1487,7 +1487,7 @@ u8 *rtw_get_p2p_attr(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id ,u8 *buf_attr u16 attr_data_len = RTW_GET_LE16(attr_ptr + 1); u16 attr_len = attr_data_len + 3; - //DBG_871X("%s attr_ptr:%p, id:%u, length:%u\n", __FUNCTION__, attr_ptr, attr_id, attr_data_len); + //DBG_871X("%s attr_ptr:%p, id:%u, length:%u\n", __func__, attr_ptr, attr_id, attr_data_len); if ( attr_id == target_attr_id ) { target_attr_ptr = attr_ptr; diff --git a/core/rtw_ioctl_set.c b/core/rtw_ioctl_set.c index d76033f..32375f4 100644 --- a/core/rtw_ioctl_set.c +++ b/core/rtw_ioctl_set.c @@ -1446,7 +1446,7 @@ int rtw_set_country(_adapter *adapter, const char *country_code) else if (0 == strcmp(country_code, "CN")) channel_plan = RT_CHANNEL_DOMAIN_CHINA; else - DBG_871X("%s unknown country_code:%s\n", __FUNCTION__, country_code); + DBG_871X("%s unknown country_code:%s\n", __func__, country_code); return rtw_set_channel_plan(adapter, channel_plan); } diff --git a/core/rtw_iol.c b/core/rtw_iol.c index 78932dc..56b1c46 100644 --- a/core/rtw_iol.c +++ b/core/rtw_iol.c @@ -31,13 +31,13 @@ struct xmit_frame *rtw_IOL_accquire_xmit_frame(ADAPTER *adapter) #if 1 if ((xmit_frame = rtw_alloc_xmitframe(pxmitpriv)) == NULL) { - DBG_871X("%s rtw_alloc_xmitframe return null\n", __FUNCTION__); + DBG_871X("%s rtw_alloc_xmitframe return null\n", __func__); goto exit; } if ((xmitbuf = rtw_alloc_xmitbuf(pxmitpriv)) == NULL) { - DBG_871X("%s rtw_alloc_xmitbuf return null\n", __FUNCTION__); + DBG_871X("%s rtw_alloc_xmitbuf return null\n", __func__); rtw_free_xmitframe(pxmitpriv, xmit_frame); xmit_frame=NULL; goto exit; @@ -57,7 +57,7 @@ struct xmit_frame *rtw_IOL_accquire_xmit_frame(ADAPTER *adapter) #else if ((xmit_frame = alloc_mgtxmitframe(pxmitpriv)) == NULL) { - DBG_871X("%s alloc_mgtxmitframe return null\n", __FUNCTION__); + DBG_871X("%s alloc_mgtxmitframe return null\n", __func__); } else { pattrib = &xmit_frame->attrib; @@ -83,7 +83,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 if (ori_len + cmd_len + 8 > MAX_XMITBUF_SZ) { - DBG_871X("%s %u is large than MAX_XMITBUF_SZ:%u, can't accommodate new cmds\n", __FUNCTION__ + DBG_871X("%s %u is large than MAX_XMITBUF_SZ:%u, can't accommodate new cmds\n", __func__ , ori_len + cmd_len + 8, MAX_XMITBUF_SZ); return _FAIL; } @@ -92,7 +92,7 @@ int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len pattrib->pktlen += cmd_len; pattrib->last_txcmdsz += cmd_len; - //DBG_871X("%s ori:%u + cmd_len:%u = %u\n", __FUNCTION__, ori_len, cmd_len, buf_offset+pattrib->pktlen); + //DBG_871X("%s ori:%u + cmd_len:%u = %u\n", __func__, ori_len, cmd_len, buf_offset+pattrib->pktlen); return _SUCCESS; } @@ -149,7 +149,7 @@ int _rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, u8 cmd.mask = cpu_to_le32(mask); } - //DBG_871X("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FUNCTION__, addr,value,mask); + //DBG_871X("%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); @@ -170,7 +170,7 @@ int _rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, u cmd.mask = cpu_to_le32(mask); } - //DBG_871X("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FUNCTION__, addr,value,mask); + //DBG_871X("%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); @@ -227,7 +227,7 @@ int rtw_IOL_append_DELAY_US_cmd(struct xmit_frame *xmit_frame, u16 us) //RTW_PUT_LE16((u8*)&cmd.address, us); cmd.address = cpu_to_le16(us); - //DBG_871X("%s %u\n", __FUNCTION__, us); + //DBG_871X("%s %u\n", __func__, us); return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 4); } @@ -238,7 +238,7 @@ int rtw_IOL_append_DELAY_MS_cmd(struct xmit_frame *xmit_frame, u16 ms) //RTW_PUT_LE16((u8*)&cmd.address, ms); cmd.address = cpu_to_le16(ms); - //DBG_871X("%s %u\n", __FUNCTION__, ms); + //DBG_871X("%s %u\n", __func__, ms); return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 4); } int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame) @@ -255,7 +255,7 @@ u8 rtw_IOL_cmd_boundary_handle(struct xmit_frame *pxmit_frame) rtw_IOL_append_END_cmd(pxmit_frame); pxmit_frame->attrib.pktlen = ((((pxmit_frame->attrib.pktlen+32)/256)+1)*256 ); - //printk("==> %s, pktlen(%d)\n",__FUNCTION__,pxmit_frame->attrib.pktlen); + //printk("==> %s, pktlen(%d)\n",__func__,pxmit_frame->attrib.pktlen); pxmit_frame->attrib.last_txcmdsz = pxmit_frame->attrib.pktlen; is_cmd_bndy = _TRUE; } @@ -267,7 +267,7 @@ void rtw_IOL_cmd_buf_dump(ADAPTER *Adapter,int buf_len,u8 *pbuf) int i; int j=1; - printk("###### %s ######\n",__FUNCTION__); + printk("###### %s ######\n",__func__); for (i=0;i< buf_len;i++){ printk("%02x-",*(pbuf+i)); @@ -351,7 +351,7 @@ int rtw_IOL_append_DELAY_US_cmd(struct xmit_frame *xmit_frame, u16 us) RTW_PUT_BE32((u8*)&cmd.value, (u32)us); - //DBG_871X("%s %u\n", __FUNCTION__, us); + //DBG_871X("%s %u\n", __func__, us); return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8); } @@ -362,7 +362,7 @@ int rtw_IOL_append_DELAY_MS_cmd(struct xmit_frame *xmit_frame, u16 ms) RTW_PUT_BE32((u8*)&cmd.value, (u32)ms); - //DBG_871X("%s %u\n", __FUNCTION__, ms); + //DBG_871X("%s %u\n", __func__, ms); return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 8); } diff --git a/core/rtw_led.c b/core/rtw_led.c index 0d5024f..6183040 100644 --- a/core/rtw_led.c +++ b/core/rtw_led.c @@ -30,11 +30,11 @@ void BlinkTimerCallback(void *data) PLED_871x pLed = (PLED_871x)data; _adapter *padapter = pLed->padapter; - //DBG_871X("%s\n", __FUNCTION__); + //DBG_871X("%s\n", __func__); if ( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE)) { - //DBG_871X("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __FUNCTION__, padapter->bSurpriseRemoved, padapter->bDriverStopped); + //DBG_871X("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __func__, padapter->bSurpriseRemoved, padapter->bDriverStopped); return; } @@ -2302,11 +2302,11 @@ void BlinkHandler(PLED_871x pLed) _adapter *padapter = pLed->padapter; struct led_priv *ledpriv = &(padapter->ledpriv); - //DBG_871X("%s (%s:%d)\n",__FUNCTION__, current->comm, current->pid); + //DBG_871X("%s (%s:%d)\n",__func__, current->comm, current->pid); if ( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE)) { - //DBG_871X("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __FUNCTION__, padapter->bSurpriseRemoved, padapter->bDriverStopped); + //DBG_871X("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __func__, padapter->bSurpriseRemoved, padapter->bDriverStopped); return; } diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index 194a45e..31ff824 100644 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -726,7 +726,7 @@ _func_enter_; #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1 if (strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) { DBG_871X("%s %s("MAC_FMT", ch%u) ss_ori:%3u, sq_ori:%3u, rssi_ori:%3ld, ss_smp:%3u, sq_smp:%3u, rssi_smp:%3ld\n" - , __FUNCTION__ + , __func__ , src->Ssid.Ssid, MAC_ARG(src->MacAddress), src->Configuration.DSConfig ,ss_ori, sq_ori, rssi_ori ,ss_smp, sq_smp, rssi_smp @@ -769,7 +769,7 @@ _func_enter_; #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1 if (strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) { DBG_871X("%s %s("MAC_FMT"), SignalStrength:%u, SignalQuality:%u, RawRSSI:%ld\n" - , __FUNCTION__ + , __func__ , dst->Ssid.Ssid, MAC_ARG(dst->MacAddress), dst->PhyInfo.SignalStrength, dst->PhyInfo.SignalQuality, dst->Rssi); } #endif @@ -1604,7 +1604,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl if (psta) //update ptarget_sta { - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); psta->aid = pnetwork->join_res; #ifdef CONFIG_CONCURRENT_MODE @@ -1659,7 +1659,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl preorder_ctrl->enable = _FALSE; preorder_ctrl->indicate_seq = 0xffff; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __func__, __LINE__, preorder_ctrl->indicate_seq); #endif preorder_ctrl->wend_b= 0xffff; @@ -1677,7 +1677,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl preorder_ctrl->enable = _FALSE; preorder_ctrl->indicate_seq = 0xffff; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __func__, __LINE__, preorder_ctrl->indicate_seq); #endif preorder_ctrl->wend_b= 0xffff; @@ -1702,7 +1702,7 @@ static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network * struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct wlan_network *cur_network = &(pmlmepriv->cur_network); - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\nfw_state:%x, BSSID:"MAC_FMT"\n" ,get_fwstate(pmlmepriv), MAC_ARG(pnetwork->network.MacAddress))); @@ -1727,7 +1727,7 @@ static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network * #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1 DBG_871X("%s signal_strength:%3u, rssi:%3d, signal_qual:%3u" "\n" - , __FUNCTION__ + , __func__ , padapter->recvpriv.signal_strength , padapter->recvpriv.rssi , padapter->recvpriv.signal_qual @@ -2151,7 +2151,7 @@ _func_enter_; psta->qos_option = 0; psta->mac_id = (uint)pstassoc->cam_id; //psta->aid = (uint)pstassoc->cam_id; - DBG_871X("%s\n",__FUNCTION__); + DBG_871X("%s\n",__func__); //for ad-hoc mode rtw_hal_set_odm_var(adapter,HAL_ODM_STA_INFO,psta,_TRUE); @@ -2391,7 +2391,7 @@ _func_enter_; #endif - DBG_871X("%s, fw_state=%x\n", __FUNCTION__, get_fwstate(pmlmepriv)); + DBG_871X("%s, fw_state=%x\n", __func__, get_fwstate(pmlmepriv)); if (adapter->bDriverStopped ||adapter->bSurpriseRemoved) return; @@ -2404,14 +2404,14 @@ _func_enter_; while (1) { pmlmepriv->to_roaming--; if (pmlmepriv->to_roaming!=0) { //try another , - DBG_871X("%s try another roaming\n", __FUNCTION__); + DBG_871X("%s try another roaming\n", __func__); if ( _SUCCESS!=(do_join_r=rtw_do_join(adapter)) ) { - DBG_871X("%s roaming do_join return %d\n", __FUNCTION__ ,do_join_r); + DBG_871X("%s roaming do_join return %d\n", __func__ ,do_join_r); continue; } break; } else { - DBG_871X("%s We've try roaming but fail\n", __FUNCTION__); + DBG_871X("%s We've try roaming but fail\n", __func__); rtw_indicate_disconnect(adapter); break; } @@ -2473,13 +2473,13 @@ static void rtw_auto_scan_handler(_adapter *padapter) /* if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) { - DBG_871X("exit %s when _FW_UNDER_SURVEY|_FW_UNDER_LINKING ->\n", __FUNCTION__); + DBG_871X("exit %s when _FW_UNDER_SURVEY|_FW_UNDER_LINKING ->\n", __func__); return; } if (pmlmepriv->sitesurveyctrl.traffic_busy == _TRUE) { - DBG_871X("%s exit cause traffic_busy(%x)\n",__FUNCTION__, pmlmepriv->sitesurveyctrl.traffic_busy); + DBG_871X("%s exit cause traffic_busy(%x)\n",__func__, pmlmepriv->sitesurveyctrl.traffic_busy); return; } */ @@ -2490,13 +2490,13 @@ static void rtw_auto_scan_handler(_adapter *padapter) if ((check_buddy_fwstate(padapter, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) || (padapter->pbuddy_adapter->mlmepriv.LinkDetectInfo.bBusyTraffic == _TRUE)) { - DBG_871X("%s, but buddy_intf is under scanning or linking or BusyTraffic\n", __FUNCTION__); + DBG_871X("%s, but buddy_intf is under scanning or linking or BusyTraffic\n", __func__); return; } } #endif - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); rtw_set_802_11_bssid_list_scan(padapter, NULL, 0); @@ -2797,7 +2797,7 @@ _func_enter_; pnetwork = LIST_CONTAINOR(pmlmepriv->pscanned, struct wlan_network, list); if (pnetwork==NULL){ - RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s return _FAIL:(pnetwork==NULL)\n", __FUNCTION__)); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("%s return _FAIL:(pnetwork==NULL)\n", __func__)); ret = _FAIL; goto exit; } @@ -2813,14 +2813,14 @@ _func_enter_; } if (candidate == NULL) { - DBG_871X("%s: return _FAIL(candidate == NULL)\n", __FUNCTION__); + DBG_871X("%s: return _FAIL(candidate == NULL)\n", __func__); #ifdef CONFIG_WOWLAN _clr_fwstate_(pmlmepriv, _FW_LINKED|_FW_UNDER_LINKING); #endif ret = _FAIL; goto exit; } else { - DBG_871X("%s: candidate: %s("MAC_FMT", ch:%u)\n", __FUNCTION__, + DBG_871X("%s: candidate: %s("MAC_FMT", ch:%u)\n", __func__, candidate->network.Ssid.Ssid, MAC_ARG(candidate->network.MacAddress), candidate->network.Configuration.DSConfig); } @@ -2829,12 +2829,12 @@ _func_enter_; // check for situation of _FW_LINKED if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) { - DBG_871X("%s: _FW_LINKED while ask_for_joinbss!!!\n", __FUNCTION__); + DBG_871X("%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 (is_same_network(&pmlmepriv->cur_network.network, &candidate->network)) { - DBG_871X("%s: _FW_LINKED and is same network, it needn't join again\n", __FUNCTION__); + DBG_871X("%s: _FW_LINKED and is same network, it needn't join again\n", __func__); rtw_indicate_connect(adapter);//rtw_indicate_connect again @@ -3587,7 +3587,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_MAX_RECVBUF_SZ, &max_recvbuf_sz); //if (max_recvbuf_sz-rx_packet_offset>(8191-256)) { - // DBG_871X("%s IEEE80211_HT_CAP_MAX_AMSDU is set\n", __FUNCTION__); + // DBG_871X("%s IEEE80211_HT_CAP_MAX_AMSDU is set\n", __func__); // ht_capie.cap_info = ht_capie.cap_info |IEEE80211_HT_CAP_MAX_AMSDU; //} } @@ -3770,7 +3770,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len) { pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; }*/ - DBG_871X("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__FUNCTION__); + DBG_871X("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__func__); } // @@ -3794,7 +3794,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len) preorder_ctrl->enable = _FALSE; preorder_ctrl->indicate_seq = 0xffff; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __func__, __LINE__, preorder_ctrl->indicate_seq); #endif preorder_ctrl->wend_b= 0xffff; @@ -3812,7 +3812,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len) preorder_ctrl->enable = _FALSE; preorder_ctrl->indicate_seq = 0xffff; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __func__, __LINE__, preorder_ctrl->indicate_seq); #endif preorder_ctrl->wend_b= 0xffff; @@ -3909,7 +3909,7 @@ void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network) if (0< pmlmepriv->to_roaming) { continue; } else { - DBG_871X("%s(%d) -to roaming fail, indicate_disconnect\n", __FUNCTION__,__LINE__); + DBG_871X("%s(%d) -to roaming fail, indicate_disconnect\n", __func__,__LINE__); rtw_indicate_disconnect(padapter); break; } diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index 0485f62..ad884c1 100644 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -517,7 +517,7 @@ static u8 init_channel_set(_adapter* padapter, u8 ChannelPlan, RT_CHANNEL_INFO * channel_set[chanset_size].ScanType = SCAN_PASSIVE; else channel_set[chanset_size].ScanType = SCAN_ACTIVE; - DBG_871X("%s(): channel_set[%d].ChannelNum = %d\n", __FUNCTION__, chanset_size, channel_set[chanset_size].ChannelNum); + DBG_871X("%s(): channel_set[%d].ChannelNum = %d\n", __func__, chanset_size, channel_set[chanset_size].ChannelNum); chanset_size++; } #endif /* CONFIG_DFS */ @@ -964,7 +964,7 @@ unsigned int OnProbeRsp(_adapter *padapter, union recv_frame *precv_frame) { if ( _TRUE == pwdinfo->nego_req_info.benable ) { - DBG_871X( "[%s] P2P State is GONEGO ING!\n", __FUNCTION__ ); + DBG_871X( "[%s] P2P State is GONEGO ING!\n", __func__ ); if ( _rtw_memcmp( pwdinfo->nego_req_info.peerDevAddr, GetAddr2Ptr(pframe), ETH_ALEN ) ) { pwdinfo->nego_req_info.benable = _FALSE; @@ -976,7 +976,7 @@ unsigned int OnProbeRsp(_adapter *padapter, union recv_frame *precv_frame) { if ( _TRUE == pwdinfo->invitereq_info.benable ) { - DBG_871X( "[%s] P2P_STATE_TX_INVITE_REQ!\n", __FUNCTION__ ); + DBG_871X( "[%s] P2P_STATE_TX_INVITE_REQ!\n", __func__ ); if ( _rtw_memcmp( pwdinfo->invitereq_info.peer_macaddr, GetAddr2Ptr(pframe), ETH_ALEN ) ) { pwdinfo->invitereq_info.benable = _FALSE; @@ -1441,7 +1441,7 @@ unsigned int OnAuthClient(_adapter *padapter, union recv_frame *precv_frame) u8 *pframe = precv_frame->u.hdr.rx_data; uint pkt_len = precv_frame->u.hdr.len; - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); //check A1 matches or not if (!_rtw_memcmp(myid(&(padapter->eeprompriv)), get_da(pframe), ETH_ALEN)) @@ -1612,7 +1612,7 @@ unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame) pos = pframe + (IEEE80211_3ADDR_LEN + ie_offset); - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); // check if this stat has been successfully authenticated/assocated if (!((pstat->state) & WIFI_FW_AUTH_SUCCESS)) @@ -2011,12 +2011,12 @@ unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame) u8 attr_content[ 10 ] = { 0x00 }; u32 attr_contentlen = 0; - DBG_8192C( "[%s] WFD IE Found!!\n", __FUNCTION__ ); + DBG_8192C( "[%s] WFD IE Found!!\n", __func__ ); rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen); if ( attr_contentlen ) { pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 ); - DBG_8192C( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); + DBG_8192C( "[%s] Peer PORT NUM = %d\n", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); } } #endif @@ -2181,7 +2181,7 @@ unsigned int OnAssocRsp(_adapter *padapter, union recv_frame *precv_frame) uint pkt_len = precv_frame->u.hdr.len; PNDIS_802_11_VARIABLE_IEs pWapiIE = NULL; - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); //check A1 matches or not if (!_rtw_memcmp(myid(&(padapter->eeprompriv)), get_da(pframe), ETH_ALEN)) @@ -2230,7 +2230,7 @@ unsigned int OnAssocRsp(_adapter *padapter, union recv_frame *precv_frame) #if defined(CONFIG_P2P) && defined(CONFIG_WFD) else if ( _rtw_memcmp(pIE->data, WFD_OUI, 4)) //WFD { - DBG_871X( "[%s] Found WFD IE\n", __FUNCTION__ ); + DBG_871X( "[%s] Found WFD IE\n", __func__ ); WFD_info_handler( padapter, pIE ); } #endif @@ -2307,7 +2307,7 @@ unsigned int OnDeAuth(_adapter *padapter, union recv_frame *precv_frame) reason = le16_to_cpu(*(unsigned short *)(pframe + WLAN_HDR_A3_LEN)); - DBG_871X("%s Reason code(%d)\n", __FUNCTION__,reason); + DBG_871X("%s Reason code(%d)\n", __func__,reason); #ifdef CONFIG_AP_MODE if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) @@ -2382,7 +2382,7 @@ unsigned int OnDisassoc(_adapter *padapter, union recv_frame *precv_frame) reason = le16_to_cpu(*(unsigned short *)(pframe + WLAN_HDR_A3_LEN)); - DBG_871X("%s Reason code(%d)\n", __FUNCTION__,reason); + DBG_871X("%s Reason code(%d)\n", __func__,reason); #ifdef CONFIG_AP_MODE if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) @@ -2433,7 +2433,7 @@ unsigned int OnDisassoc(_adapter *padapter, union recv_frame *precv_frame) unsigned int OnAtim(_adapter *padapter, union recv_frame *precv_frame) { - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); return _SUCCESS; } @@ -2570,7 +2570,7 @@ unsigned int OnAction_back(_adapter *padapter, union recv_frame *precv_frame) if (!_rtw_memcmp(myid(&(padapter->eeprompriv)), get_da(pframe), ETH_ALEN)) return _SUCCESS; */ - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE) if (!(pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS)) @@ -2602,7 +2602,7 @@ unsigned int OnAction_back(_adapter *padapter, union recv_frame *precv_frame) } action = frame_body[1]; - DBG_871X("%s, action=%d\n", __FUNCTION__, action); + DBG_871X("%s, action=%d\n", __func__, action); switch (action) { case RTW_WLAN_ACTION_ADDBA_REQ: //ADDBA request @@ -2659,12 +2659,12 @@ unsigned int OnAction_back(_adapter *padapter, union recv_frame *precv_frame) preorder_ctrl->enable = _FALSE; preorder_ctrl->indicate_seq = 0xffff; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __func__, __LINE__, preorder_ctrl->indicate_seq); #endif } - DBG_871X("%s(): DELBA: %x(%x)\n", __FUNCTION__,pmlmeinfo->agg_enable_bitmap, reason_code); + DBG_871X("%s(): DELBA: %x(%x)\n", __func__,pmlmeinfo->agg_enable_bitmap, reason_code); //todo: how to notify the host while receiving DELETE BA break; @@ -2747,7 +2747,7 @@ void issue_p2p_GO_request(_adapter *padapter, u8* raddr) return; } - DBG_871X( "[%s] In\n", __FUNCTION__ ); + DBG_871X( "[%s] In\n", __func__ ); //update attribute pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); @@ -3195,7 +3195,7 @@ void issue_p2p_GO_response(_adapter *padapter, u8* raddr, u8* frame_body,uint le return; } - DBG_871X( "[%s] In, result = %d\n", __FUNCTION__, result ); + DBG_871X( "[%s] In, result = %d\n", __func__, result ); //update attribute pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); @@ -3670,7 +3670,7 @@ void issue_p2p_GO_confirm(_adapter *padapter, u8* raddr, u8 result) return; } - DBG_871X( "[%s] In\n", __FUNCTION__ ); + DBG_871X( "[%s] In\n", __func__ ); //update attribute pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); @@ -4512,7 +4512,7 @@ void issue_p2p_provision_request(_adapter *padapter, u8* pssid, u8 ussidlen, u8* return; } - DBG_871X( "[%s] In\n", __FUNCTION__ ); + DBG_871X( "[%s] In\n", __func__ ); //update attribute pattrib = &pmgntframe->attrib; update_mgntframe_attrib(padapter, pattrib); @@ -4599,17 +4599,17 @@ u8 is_matched_in_profilelist( u8* peermacaddr, struct profile_info* profileinfo { u8 i, match_result = 0; - DBG_871X( "[%s] peermac = %.2X %.2X %.2X %.2X %.2X %.2X\n", __FUNCTION__, + DBG_871X( "[%s] peermac = %.2X %.2X %.2X %.2X %.2X %.2X\n", __func__, peermacaddr[0], peermacaddr[1],peermacaddr[2],peermacaddr[3],peermacaddr[4],peermacaddr[5]); for ( i = 0; i < P2P_MAX_PERSISTENT_GROUP_NUM; i++, profileinfo++ ) { - DBG_871X( "[%s] profileinfo_mac = %.2X %.2X %.2X %.2X %.2X %.2X\n", __FUNCTION__, + DBG_871X( "[%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]); if ( _rtw_memcmp( peermacaddr, profileinfo->peermac, ETH_ALEN ) ) { match_result = 1; - DBG_871X( "[%s] Match!\n", __FUNCTION__ ); + DBG_871X( "[%s] Match!\n", __func__ ); break; } } @@ -4647,7 +4647,7 @@ void issue_probersp_p2p(_adapter *padapter, unsigned char *da) u8 zero_array_check[L2SDTA_SERVICE_VE_LEN] = { 0x00 }; #endif //CONFIG_INTEL_WIDI - //DBG_871X("%s\n", __FUNCTION__); + //DBG_871X("%s\n", __func__); if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) { @@ -5442,7 +5442,7 @@ unsigned int on_action_public_p2p(union recv_frame *precv_frame) { case P2P_GO_NEGO_REQ: { - DBG_871X( "[%s] Got GO Nego Req Frame\n", __FUNCTION__); + DBG_871X( "[%s] Got GO Nego Req Frame\n", __func__); _rtw_memset( &pwdinfo->groupid_info, 0x00, sizeof( struct group_id_info ) ); if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_REQ)) @@ -5457,7 +5457,7 @@ unsigned int on_action_public_p2p(union recv_frame *precv_frame) _cancel_timer_ex( &pwdinfo->restore_p2p_state_timer ); // Restore the previous p2p state rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo)); - DBG_871X( "[%s] Restore the previous p2p state to %d\n", __FUNCTION__, rtw_p2p_state(pwdinfo) ); + DBG_871X( "[%s] Restore the previous p2p state to %d\n", __func__, rtw_p2p_state(pwdinfo) ); } #ifdef CONFIG_CONCURRENT_MODE if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) @@ -5498,7 +5498,7 @@ unsigned int on_action_public_p2p(union recv_frame *precv_frame) } case P2P_GO_NEGO_RESP: { - DBG_871X( "[%s] Got GO Nego Resp Frame\n", __FUNCTION__); + DBG_871X( "[%s] Got GO Nego Resp Frame\n", __func__); if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING)) { @@ -5528,14 +5528,14 @@ unsigned int on_action_public_p2p(union recv_frame *precv_frame) } else { - DBG_871X( "[%s] Skipped GO Nego Resp Frame (p2p_state != P2P_STATE_GONEGO_ING)\n", __FUNCTION__); + DBG_871X( "[%s] Skipped GO Nego Resp Frame (p2p_state != P2P_STATE_GONEGO_ING)\n", __func__); } break; } case P2P_GO_NEGO_CONF: { - DBG_871X( "[%s] Got GO Nego Confirm Frame\n", __FUNCTION__); + DBG_871X( "[%s] Got GO Nego Confirm Frame\n", __func__); result = process_p2p_group_negotation_confirm( pwdinfo, frame_body, len); if ( P2P_STATUS_SUCCESS == result ) { @@ -5553,7 +5553,7 @@ unsigned int on_action_public_p2p(union recv_frame *precv_frame) // Added by Albert 2010/10/05 // Received the P2P Invite Request frame. - DBG_871X( "[%s] Got invite request frame!\n", __FUNCTION__ ); + DBG_871X( "[%s] Got invite request frame!\n", __func__ ); if ( (p2p_ie=rtw_get_p2p_ie( frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, NULL, &p2p_ielen)) ) { // Parse the necessary information from the P2P Invitation Request frame. @@ -5576,7 +5576,7 @@ unsigned int on_action_public_p2p(union recv_frame *precv_frame) if ( attr_contentlen ) { - DBG_871X( "[%s] GO's BSSID = %.2X %.2X %.2X %.2X %.2X %.2X\n", __FUNCTION__, + DBG_871X( "[%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[2], pwdinfo->p2p_peer_interface_addr[3], pwdinfo->p2p_peer_interface_addr[4], pwdinfo->p2p_peer_interface_addr[5] ); @@ -5648,7 +5648,7 @@ unsigned int on_action_public_p2p(union recv_frame *precv_frame) } else { - DBG_871X( "[%s] P2P Group ID Attribute NOT FOUND!\n", __FUNCTION__ ); + DBG_871X( "[%s] P2P Group ID Attribute NOT FOUND!\n", __func__ ); status_code = P2P_STATUS_FAIL_INFO_UNAVAILABLE; } } @@ -5682,18 +5682,18 @@ unsigned int on_action_public_p2p(union recv_frame *precv_frame) } else { - DBG_871X( "[%s] P2P Group ID Attribute NOT FOUND!\n", __FUNCTION__ ); + DBG_871X( "[%s] P2P Group ID Attribute NOT FOUND!\n", __func__ ); status_code = P2P_STATUS_FAIL_INFO_UNAVAILABLE; } } } else { - DBG_871X( "[%s] P2P Invitation Flags Attribute NOT FOUND!\n", __FUNCTION__ ); + DBG_871X( "[%s] P2P Invitation Flags Attribute NOT FOUND!\n", __func__ ); status_code = P2P_STATUS_FAIL_INFO_UNAVAILABLE; } - DBG_871X( "[%s] status_code = %d\n", __FUNCTION__, status_code ); + DBG_871X( "[%s] status_code = %d\n", __func__, status_code ); pwdinfo->inviteresp_info.token = frame_body[ 7 ]; issue_p2p_invitation_response( padapter, GetAddr2Ptr(pframe), pwdinfo->inviteresp_info.token, status_code ); @@ -5712,7 +5712,7 @@ unsigned int on_action_public_p2p(union recv_frame *precv_frame) u8 attr_content = 0x00; u32 attr_contentlen = 0; - DBG_871X( "[%s] Got invite response frame!\n", __FUNCTION__ ); + DBG_871X( "[%s] Got invite response frame!\n", __func__ ); _cancel_timer_ex( &pwdinfo->restore_p2p_state_timer ); if ( (p2p_ie=rtw_get_p2p_ie( frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - _PUBLIC_ACTION_IE_OFFSET_, NULL, &p2p_ielen)) ) { @@ -5720,7 +5720,7 @@ unsigned int on_action_public_p2p(union recv_frame *precv_frame) if ( attr_contentlen == 1 ) { - DBG_871X( "[%s] Status = %d\n", __FUNCTION__, attr_content ); + DBG_871X( "[%s] Status = %d\n", __func__, attr_content ); pwdinfo->invitereq_info.benable = _FALSE; if ( attr_content == P2P_STATUS_SUCCESS ) @@ -5772,7 +5772,7 @@ unsigned int on_action_public_p2p(union recv_frame *precv_frame) break; case P2P_PROVISION_DISC_REQ: - DBG_871X( "[%s] Got Provisioning Discovery Request Frame\n", __FUNCTION__ ); + DBG_871X( "[%s] Got Provisioning Discovery Request Frame\n", __func__ ); process_p2p_provdisc_req(pwdinfo, pframe, len); _rtw_memcpy(pwdinfo->rx_prov_disc_info.peerDevAddr, GetAddr2Ptr(pframe), ETH_ALEN); @@ -5795,7 +5795,7 @@ unsigned int on_action_public_p2p(union recv_frame *precv_frame) case P2P_PROVISION_DISC_RESP: // Commented by Albert 20110707 // Should we check the pwdinfo->tx_prov_disc_info.bsent flag here?? - DBG_871X( "[%s] Got Provisioning Discovery Response Frame\n", __FUNCTION__ ); + DBG_871X( "[%s] Got Provisioning Discovery Response Frame\n", __func__ ); // Commented by Albert 20110426 // 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 ); @@ -5902,7 +5902,7 @@ unsigned int OnAction_p2p(_adapter *padapter, union recv_frame *precv_frame) struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); //check RA matches or not if (!_rtw_memcmp(myid(&(padapter->eeprompriv)), GetAddr1Ptr(pframe), ETH_ALEN))//for if1, sta/ap mode @@ -6000,13 +6000,13 @@ struct xmit_frame *alloc_mgtxmitframe(struct xmit_priv *pxmitpriv) if ((pmgntframe = rtw_alloc_xmitframe(pxmitpriv)) == NULL) { - DBG_871X("%s, alloc xmitframe fail\n", __FUNCTION__); + DBG_871X("%s, alloc xmitframe fail\n", __func__); return NULL; } if ((pxmitbuf = rtw_alloc_xmitbuf_ext(pxmitpriv)) == NULL) { - DBG_871X("%s, alloc xmitbuf fail\n", __FUNCTION__); + DBG_871X("%s, alloc xmitbuf fail\n", __func__); rtw_free_xmitframe(pxmitpriv, pmgntframe); return NULL; } @@ -6035,7 +6035,7 @@ void update_mgnt_tx_rate(_adapter *padapter, u8 rate) struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); pmlmeext->tx_rate = rate; - DBG_871X("%s(): rate = %x\n",__FUNCTION__, rate); + DBG_871X("%s(): rate = %x\n",__func__, rate); } void update_mgntframe_attrib(_adapter *padapter, struct pkt_attrib *pattrib) @@ -6144,7 +6144,7 @@ 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); - //DBG_871X("%s hidden_ssid_mode:%u, ssid_ie:%p, ssid_len_ori:%d\n", __FUNCTION__, hidden_ssid_mode, ssid_ie, ssid_len_ori); + //DBG_871X("%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) { @@ -6196,11 +6196,11 @@ void issue_beacon(_adapter *padapter, int timeout_ms) #endif //CONFIG_P2P - //DBG_871X("%s\n", __FUNCTION__); + //DBG_871X("%s\n", __func__); if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) { - DBG_871X("%s, alloc mgnt frame fail\n", __FUNCTION__); + DBG_871X("%s, alloc mgnt frame fail\n", __func__); return; } #if defined (CONFIG_AP_MODE) && defined (CONFIG_NATIVEAP_MLME) @@ -6514,11 +6514,11 @@ void issue_probersp(_adapter *padapter, unsigned char *da, u8 is_valid_p2p_probe #endif //CONFIG_WFD #endif //CONFIG_P2P - //DBG_871X("%s\n", __FUNCTION__); + //DBG_871X("%s\n", __func__); if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) { - DBG_871X("%s, alloc mgnt frame fail\n", __FUNCTION__); + DBG_871X("%s, alloc mgnt frame fail\n", __func__); return; } @@ -6963,7 +6963,7 @@ void issue_auth(_adapter *padapter, struct sta_info *psta, unsigned short status val16 = cpu_to_le16(val16); use_shared_key = 1; } - //DBG_871X("%s auth_algo= %s auth_seq=%d\n",__FUNCTION__,(pmlmeinfo->auth_algo==0)?"OPEN":"SHARED",pmlmeinfo->auth_seq); + //DBG_871X("%s auth_algo= %s auth_seq=%d\n",__func__,(pmlmeinfo->auth_algo==0)?"OPEN":"SHARED",pmlmeinfo->auth_seq); //setting IV for auth seq #3 if ((pmlmeinfo->auth_seq == 3) && (pmlmeinfo->state & WIFI_FW_AUTH_STATE) && (use_shared_key==1)) @@ -7011,7 +7011,7 @@ void issue_auth(_adapter *padapter, struct sta_info *psta, unsigned short status pattrib->last_txcmdsz = pattrib->pktlen; rtw_wep_encrypt(padapter, (u8 *)pmgntframe); - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); dump_mgntframe(padapter, pmgntframe); return; @@ -7041,7 +7041,7 @@ void issue_asocrsp(_adapter *padapter, unsigned short status, struct sta_info *p #endif //CONFIG_P2P - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) { @@ -7320,7 +7320,7 @@ void issue_assocreq(_adapter *padapter) if (j == sta_bssrate_len) { // the rate is not supported by STA - DBG_871X("%s(): the rate[%d]=%02X is not supported by STA!\n",__FUNCTION__, i, pmlmeinfo->network.SupportedRates[i]); + DBG_871X("%s(): the rate[%d]=%02X is not supported by STA!\n",__func__, i, pmlmeinfo->network.SupportedRates[i]); } else { // the rate is supported by STA bssrate[index++] = pmlmeinfo->network.SupportedRates[i]; @@ -7696,7 +7696,7 @@ static int _issue_nulldata(_adapter *padapter, unsigned char *da, unsigned int p struct mlme_ext_priv *pmlmeext; struct mlme_ext_info *pmlmeinfo; - //DBG_871X("%s:%d\n", __FUNCTION__, power_mode); + //DBG_871X("%s:%d\n", __func__, power_mode); if (!padapter) goto exit; @@ -7827,7 +7827,7 @@ static int _issue_qos_nulldata(_adapter *padapter, unsigned char *da, u16 tid, i struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) { @@ -8159,7 +8159,7 @@ void issue_action_BA(_adapter *padapter, unsigned char *raddr, unsigned char act #endif #ifdef CONFIG_80211N_HT - DBG_871X("%s, category=%d, action=%d, status=%d\n", __FUNCTION__, category, action, status); + DBG_871X("%s, category=%d, action=%d, status=%d\n", __func__, category, action, status); if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) { @@ -8344,7 +8344,7 @@ static void issue_action_BSSCoexistPacket(_adapter *padapter) return; - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); category = RTW_WLAN_CATEGORY_PUBLIC; @@ -8493,7 +8493,7 @@ unsigned int send_delba(_adapter *padapter, u8 initiator, u8 *addr) if (psta==NULL) return _SUCCESS; - //DBG_871X("%s:%s\n", __FUNCTION__, (initiator==0)?"RX_DIR":"TX_DIR"); + //DBG_871X("%s:%s\n", __func__, (initiator==0)?"RX_DIR":"TX_DIR"); if (initiator==0) // recipient { @@ -8506,7 +8506,7 @@ unsigned int send_delba(_adapter *padapter, u8 initiator, u8 *addr) psta->recvreorder_ctrl[tid].enable = _FALSE; psta->recvreorder_ctrl[tid].indicate_seq = 0xffff; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __func__, __LINE__, psta->recvreorder_ctrl[tid].indicate_seq); #endif } @@ -8548,7 +8548,7 @@ unsigned int send_beacon(_adapter *padapter) #ifdef CONFIG_PCI_HCI - //DBG_871X("%s\n", __FUNCTION__); + //DBG_871X("%s\n", __func__); issue_beacon(padapter, 0); @@ -8577,7 +8577,7 @@ unsigned int send_beacon(_adapter *padapter) } if (_FALSE == bxmitok) { - DBG_871X("%s fail! %u ms\n", __FUNCTION__, rtw_get_passing_time_ms(start)); + DBG_871X("%s fail! %u ms\n", __func__, rtw_get_passing_time_ms(start)); return _FAIL; } else @@ -8585,9 +8585,9 @@ unsigned int send_beacon(_adapter *padapter) u32 passing_time = rtw_get_passing_time_ms(start); if (passing_time > 100 || issue > 3) - DBG_871X("%s success, issue:%d, poll:%d, %u ms\n", __FUNCTION__, issue, poll, rtw_get_passing_time_ms(start)); + DBG_871X("%s success, issue:%d, poll:%d, %u ms\n", __func__, issue, poll, rtw_get_passing_time_ms(start)); //else - // DBG_871X("%s success, issue:%d, poll:%d, %u ms\n", __FUNCTION__, issue, poll, rtw_get_passing_time_ms(start)); + // DBG_871X("%s success, issue:%d, poll:%d, %u ms\n", __func__, issue, poll, rtw_get_passing_time_ms(start)); return _SUCCESS; } @@ -8825,7 +8825,7 @@ void site_survey(_adapter *padapter) rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_MAX); } #ifdef CONFIG_DBG_P2P - DBG_871X( "[%s] find phase exchange cnt = %d\n", __FUNCTION__, pwdinfo->find_phase_state_exchange_cnt ); + DBG_871X( "[%s] find phase exchange cnt = %d\n", __func__, pwdinfo->find_phase_state_exchange_cnt ); #endif } @@ -9044,7 +9044,7 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSI { if (len > NDIS_802_11_LENGTH_SSID) { - DBG_871X("%s()-%d: IE too long (%d) for survey event\n", __FUNCTION__, __LINE__, len); + DBG_871X("%s()-%d: IE too long (%d) for survey event\n", __func__, __LINE__, len); return _FAIL; } _rtw_memcpy(bssid->Ssid.Ssid, (p + 2), *(p + 1)); @@ -9064,7 +9064,7 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSI { if (len > NDIS_802_11_LENGTH_RATES_EX) { - DBG_871X("%s()-%d: IE too long (%d) for survey event\n", __FUNCTION__, __LINE__, len); + DBG_871X("%s()-%d: IE too long (%d) for survey event\n", __func__, __LINE__, len); return _FAIL; } _rtw_memcpy(bssid->SupportedRates, (p + 2), len); @@ -9076,7 +9076,7 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSI { if (len > (NDIS_802_11_LENGTH_RATES_EX-i)) { - DBG_871X("%s()-%d: IE too long (%d) for survey event\n", __FUNCTION__, __LINE__, len); + DBG_871X("%s()-%d: IE too long (%d) for survey event\n", __func__, __LINE__, len); return _FAIL; } _rtw_memcpy(bssid->SupportedRates + i, (p + 2), len); @@ -9417,7 +9417,7 @@ unsigned int receive_disconnect(_adapter *padapter, unsigned char *MacAddr, unsi if (!(_rtw_memcmp(MacAddr, get_my_bssid(&pmlmeinfo->network), ETH_ALEN))) return _SUCCESS; - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); if ((pmlmeinfo->state&0x03) == WIFI_FW_STATION_STATE) { @@ -9477,7 +9477,7 @@ static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid) _rtw_memcpy(country, p, 3); p += 3; RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, - ("%s: 802.11d country=%s\n", __FUNCTION__, country)); + ("%s: 802.11d country=%s\n", __func__, country)); i = 0; while ((ie - p) >= 3) @@ -9694,7 +9694,7 @@ static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid) if (chplan_new[k].ChannelNum == channel) { RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("%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; break; } @@ -9720,7 +9720,7 @@ static void process_80211d(PADAPTER padapter, WLAN_BSSID_EX *bssid) chplan_new[i].ScanType = SCAN_ACTIVE; RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("%s: change channel %d scan type from passive to active\n", - __FUNCTION__, channel)); + __func__, channel)); } break; } @@ -10171,7 +10171,7 @@ exit_mlmeext_joinbss_event_callback: concurrent_chk_joinbss_done(padapter, join_res); #endif - DBG_871X("=>%s\n", __FUNCTION__); + DBG_871X("=>%s\n", __func__); } @@ -10181,7 +10181,7 @@ void mlmeext_sta_add_event_callback(_adapter *padapter, struct sta_info *psta) struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); u8 join_type; - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); if ((pmlmeinfo->state&0x03) == WIFI_FW_ADHOC_STATE) { @@ -10460,7 +10460,7 @@ void linked_status_chk(_adapter *padapter) if (tx_chk != _SUCCESS && pmlmeinfo->link_count++ == 0xf) { #ifdef DBG_EXPIRATION_CHK - DBG_871X("%s issue_nulldata 0\n", __FUNCTION__); + DBG_871X("%s issue_nulldata 0\n", __func__); #endif tx_chk = issue_nulldata(padapter, NULL, 0, 1, 0); } @@ -10578,7 +10578,7 @@ void survey_timer_hdl(_adapter *padapter) { rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_MAX); pmlmeext->sitesurvey_res.channel_idx = 3; - DBG_871X("%s idx:%d, cnt:%u\n", __FUNCTION__ + DBG_871X("%s idx:%d, cnt:%u\n", __func__ , pmlmeext->sitesurvey_res.channel_idx , pwdinfo->find_phase_state_exchange_cnt ); @@ -10587,7 +10587,7 @@ void survey_timer_hdl(_adapter *padapter) #endif { pmlmeext->sitesurvey_res.channel_idx = pmlmeext->sitesurvey_res.ch_num; - DBG_871X("%s idx:%d\n", __FUNCTION__ + DBG_871X("%s idx:%d\n", __func__ , pmlmeext->sitesurvey_res.channel_idx ); } @@ -11767,20 +11767,20 @@ static void dc_change_band(_adapter *padapter, WLAN_BSSID_EX *pnetwork) struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); u8 erpinfo=0x4; - //DBG_871X("%s\n", __FUNCTION__); + //DBG_871X("%s\n", __func__); if (pmlmeext->cur_channel >= 36) { network_type = WIRELESS_11A; total_rate_len = IEEE80211_NUM_OFDM_RATESLEN; - DBG_871X("%s(): change to 5G Band\n",__FUNCTION__); + DBG_871X("%s(): change to 5G Band\n",__func__); rtw_remove_bcn_ie(padapter, pnetwork, _ERPINFO_IE_); } else { network_type = WIRELESS_11BG; total_rate_len = IEEE80211_CCK_RATE_LEN+IEEE80211_NUM_OFDM_RATESLEN; - DBG_871X("%s(): change to 2.4G Band\n",__FUNCTION__); + DBG_871X("%s(): change to 2.4G Band\n",__func__); rtw_add_bcn_ie(padapter, pnetwork, _ERPINFO_IE_, &erpinfo, 1); } @@ -12762,7 +12762,7 @@ u8 tdls_hdl(_adapter *padapter, unsigned char *pbuf) } //_enter_critical_bh(&(ptdlsinfo->hdl_lock), &irqL); - DBG_871X("[%s] option:%d\n", __FUNCTION__, option); + DBG_871X("[%s] option:%d\n", __func__, option); switch (option){ case TDLS_WRCR: diff --git a/core/rtw_p2p.c b/core/rtw_p2p.c index 3778cb4..430a497 100644 --- a/core/rtw_p2p.c +++ b/core/rtw_p2p.c @@ -84,7 +84,7 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf) _adapter *padapter = pwdinfo->padapter; struct sta_priv *pstapriv = &padapter->stapriv; - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); pdata_attr = rtw_zmalloc(MAX_P2P_IE_LEN); @@ -189,7 +189,7 @@ static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da) u8 oui_subtype = P2P_GO_DISC_REQUEST; u8 dialogToken=0; - DBG_871X("[%s]\n", __FUNCTION__); + DBG_871X("[%s]\n", __func__); if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) { @@ -250,7 +250,7 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s u8 p2pie[8] = { 0x00 }; u32 p2pielen = 0; - DBG_871X("[%s]\n", __FUNCTION__); + DBG_871X("[%s]\n", __func__); if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) { @@ -434,7 +434,7 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 u8 noa_attr_content[32] = { 0x00 }; u32 p2pielen = 0; - DBG_871X("[%s]\n", __FUNCTION__); + DBG_871X("[%s]\n", __func__); if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) { @@ -2379,12 +2379,12 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l if ( !p2p_ie ) { - DBG_8192C( "[%s] P2P IE not Found!!\n", __FUNCTION__ ); + DBG_8192C( "[%s] P2P IE not Found!!\n", __func__ ); status_code = P2P_STATUS_FAIL_INVALID_PARAM; } else { - DBG_8192C( "[%s] P2P IE Found!!\n", __FUNCTION__ ); + DBG_8192C( "[%s] P2P IE Found!!\n", __func__ ); } while ( p2p_ie ) @@ -2392,7 +2392,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l //Check P2P Capability ATTR if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8*)&cap_attr, (uint*) &attr_contentlen) ) { - DBG_8192C( "[%s] Got P2P Capability Attr!!\n", __FUNCTION__ ); + DBG_8192C( "[%s] Got P2P Capability Attr!!\n", __func__ ); cap_attr = le16_to_cpu(cap_attr); psta->dev_cap = cap_attr&0xff; } @@ -2403,7 +2403,7 @@ u32 process_assoc_req_p2p_ie(struct wifidirect_info *pwdinfo, u8 *pframe, uint l //Check P2P Device Info ATTR if (rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_DEVICE_INFO, NULL, (uint*)&attr_contentlen)) { - DBG_8192C( "[%s] Got P2P DEVICE INFO Attr!!\n", __FUNCTION__ ); + DBG_8192C( "[%s] Got P2P DEVICE INFO Attr!!\n", __func__ ); pattr_content = pbuf = rtw_zmalloc(attr_contentlen); if (pattr_content) { @@ -2608,7 +2608,7 @@ u8 process_p2p_provdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint l issue_p2p_provision_resp( pwdinfo, GetAddr2Ptr(pframe), frame_body, uconfig_method); } } - DBG_871X( "[%s] config method = %s\n", __FUNCTION__, pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req ); + DBG_871X( "[%s] config method = %s\n", __func__, pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req ); return _TRUE; } @@ -2731,7 +2731,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe } else { - DBG_871X( "[%s] WPS IE not Found!!\n", __FUNCTION__ ); + DBG_871X( "[%s] WPS IE not Found!!\n", __func__ ); result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM; rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); return( result ); @@ -2751,7 +2751,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe if ( !p2p_ie ) { - DBG_871X( "[%s] P2P IE not Found!!\n", __FUNCTION__ ); + DBG_871X( "[%s] P2P IE not Found!!\n", __func__ ); result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM; rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); } @@ -2783,7 +2783,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) ) { - DBG_871X( "[%s] GO Intent = %d, tie = %d\n", __FUNCTION__, attr_content >> 1, attr_content & 0x01 ); + DBG_871X( "[%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. if ( pwdinfo->intent == ( pwdinfo->peer_intent >> 1 ) ) @@ -2840,7 +2840,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe if ( ch_num_inclusioned == 0) { - DBG_871X( "[%s] No common channel in channel list!\n", __FUNCTION__ ); + DBG_871X( "[%s] No common channel in channel list!\n", __func__ ); result = P2P_STATUS_FAIL_NO_COMMON_CH; rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); break; @@ -2854,7 +2854,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe #ifdef CONFIG_CONCURRENT_MODE if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) { - DBG_871X( "[%s] desired channel NOT Found!\n", __FUNCTION__ ); + DBG_871X( "[%s] desired channel NOT Found!\n", __func__ ); result = P2P_STATUS_FAIL_NO_COMMON_CH; rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); break; @@ -2877,13 +2877,13 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe * Change our operating channel as peer's for compatibility. */ pwdinfo->operating_channel = peer_operating_ch; - DBG_871X( "[%s] Change op ch to %02x as peer's\n", __FUNCTION__, pwdinfo->operating_channel); + DBG_871X( "[%s] Change op ch to %02x as peer's\n", __func__, pwdinfo->operating_channel); } else { // Take first channel of ch_list_inclusioned as operating channel pwdinfo->operating_channel = ch_list_inclusioned[0]; - DBG_871X( "[%s] Change op ch to %02x\n", __FUNCTION__, pwdinfo->operating_channel); + DBG_871X( "[%s] Change op ch to %02x\n", __func__, pwdinfo->operating_channel); } } @@ -2903,12 +2903,12 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe u8 attr_content[ 10 ] = { 0x00 }; u32 attr_contentlen = 0; - DBG_871X( "[%s] WFD IE Found!!\n", __FUNCTION__ ); + DBG_871X( "[%s] WFD IE Found!!\n", __func__ ); rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen); if ( attr_contentlen ) { pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 ); - DBG_871X( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); + DBG_871X( "[%s] Peer PORT NUM = %d\n", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); } } #endif // CONFIG_WFD @@ -2943,7 +2943,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram } else { - DBG_871X( "[%s] WPS IE not Found!!\n", __FUNCTION__ ); + DBG_871X( "[%s] WPS IE not Found!!\n", __func__ ); result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM; rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); } @@ -2986,7 +2986,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen); if ( attr_contentlen == 1 ) { - DBG_871X( "[%s] Status = %d\n", __FUNCTION__, attr_content ); + DBG_871X( "[%s] Status = %d\n", __func__, attr_content ); if ( attr_content == P2P_STATUS_SUCCESS ) { // Do nothing. @@ -3019,7 +3019,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram attr_contentlen = 0; if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen) ) { - DBG_871X( "[%s] GO Intent = %d, tie = %d\n", __FUNCTION__, attr_content >> 1, attr_content & 0x01 ); + DBG_871X( "[%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. if ( pwdinfo->intent == ( pwdinfo->peer_intent >> 1 ) ) @@ -3072,21 +3072,21 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram attr_contentlen = 0; if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen)) { - DBG_871X( "[%s] Peer's operating channel = %d\n", __FUNCTION__, operatingch_info[4] ); + DBG_871X( "[%s] Peer's operating channel = %d\n", __func__, operatingch_info[4] ); pwdinfo->peer_operating_ch = operatingch_info[4]; } // 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 ) ) { - DBG_871X( "[%s] channel list attribute found, len = %d\n", __FUNCTION__, pwdinfo->channel_list_attr_len ); + DBG_871X( "[%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); ch_num_inclusioned = rtw_p2p_ch_inclusion(&padapter->mlmeextpriv, peer_ch_list, peer_ch_num, ch_list_inclusioned); if ( ch_num_inclusioned == 0) { - DBG_871X( "[%s] No common channel in channel list!\n", __FUNCTION__ ); + DBG_871X( "[%s] No common channel in channel list!\n", __func__ ); result = P2P_STATUS_FAIL_NO_COMMON_CH; rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); break; @@ -3100,7 +3100,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram #ifdef CONFIG_CONCURRENT_MODE if ( check_buddy_fwstate(padapter, _FW_LINKED ) ) { - DBG_871X( "[%s] desired channel NOT Found!\n", __FUNCTION__ ); + DBG_871X( "[%s] desired channel NOT Found!\n", __func__ ); result = P2P_STATUS_FAIL_NO_COMMON_CH; rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); break; @@ -3123,13 +3123,13 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram * Change our operating channel as peer's for compatibility. */ pwdinfo->operating_channel = peer_operating_ch; - DBG_871X( "[%s] Change op ch to %02x as peer's\n", __FUNCTION__, pwdinfo->operating_channel); + DBG_871X( "[%s] Change op ch to %02x as peer's\n", __func__, pwdinfo->operating_channel); } else { // Take first channel of ch_list_inclusioned as operating channel pwdinfo->operating_channel = ch_list_inclusioned[0]; - DBG_871X( "[%s] Change op ch to %02x\n", __FUNCTION__, pwdinfo->operating_channel); + DBG_871X( "[%s] Change op ch to %02x\n", __func__, pwdinfo->operating_channel); } } @@ -3139,7 +3139,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram } else { - DBG_871X( "[%s] channel list attribute not found!\n", __FUNCTION__); + DBG_871X( "[%s] channel list attribute not found!\n", __func__); } // Try to get the group id information if peer is GO @@ -3165,12 +3165,12 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram u8 attr_content[ 10 ] = { 0x00 }; u32 attr_contentlen = 0; - DBG_8192C( "[%s] WFD IE Found!!\n", __FUNCTION__ ); + DBG_8192C( "[%s] WFD IE Found!!\n", __func__ ); rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen); if ( attr_contentlen ) { pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 ); - DBG_8192C( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); + DBG_8192C( "[%s] Peer PORT NUM = %d\n", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); } } #endif // CONFIG_WFD @@ -3200,7 +3200,7 @@ u8 process_p2p_group_negotation_confirm( struct wifidirect_info *pwdinfo, u8 *pf rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen); if ( attr_contentlen == 1 ) { - DBG_871X( "[%s] Status = %d\n", __FUNCTION__, attr_content ); + DBG_871X( "[%s] Status = %d\n", __func__, attr_content ); result = attr_content; if ( attr_content == P2P_STATUS_SUCCESS ) @@ -3255,7 +3255,7 @@ u8 process_p2p_group_negotation_confirm( struct wifidirect_info *pwdinfo, u8 *pf _rtw_memset( groupid, 0x00, 38 ); if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen) ) { - DBG_871X( "[%s] Ssid = %s, ssidlen = %zu\n", __FUNCTION__, &groupid[ETH_ALEN], strlen(&groupid[ETH_ALEN]) ); + DBG_871X( "[%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.ssid, &groupid[6], attr_contentlen - ETH_ALEN ); } @@ -3263,7 +3263,7 @@ u8 process_p2p_group_negotation_confirm( struct wifidirect_info *pwdinfo, u8 *pf attr_contentlen = 0; if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen) ) { - DBG_871X( "[%s] Peer's operating channel = %d\n", __FUNCTION__, operatingch_info[4] ); + DBG_871X( "[%s] Peer's operating channel = %d\n", __func__, operatingch_info[4] ); pwdinfo->peer_operating_ch = operatingch_info[4]; } @@ -3435,7 +3435,7 @@ _func_enter_; // 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 ) { - DBG_8192C( "[%s] P2P_STATE_IDLE, ext_listen_period = %d\n", __FUNCTION__, pwdinfo->ext_listen_period ); + DBG_8192C( "[%s] P2P_STATE_IDLE, ext_listen_period = %d\n", __func__, pwdinfo->ext_listen_period ); if ( pbuddy_mlmeext->cur_channel != pwdinfo->listen_channel ) { @@ -3458,7 +3458,7 @@ _func_enter_; rtw_p2p_chk_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_REQ) ) { // Now, the driver is in the listen state of P2P mode. - DBG_8192C( "[%s] P2P_STATE_IDLE, ext_listen_interval = %d\n", __FUNCTION__, pwdinfo->ext_listen_interval ); + DBG_8192C( "[%s] P2P_STATE_IDLE, ext_listen_interval = %d\n", __func__, pwdinfo->ext_listen_interval ); // 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 @@ -3576,7 +3576,7 @@ static void ro_ch_timer_process (void *FunctionContext) _adapter *adapter = (_adapter *)FunctionContext; struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(adapter->rtw_wdev); - //printk("%s\n", __FUNCTION__); + //printk("%s\n", __func__); #ifdef CONFIG_CONCURRENT_MODE ATOMIC_SET(&pwdev_priv->ro_ch_to, 1); @@ -4238,7 +4238,7 @@ _func_enter_; if (pwrpriv->smart_ps != 0) { pwrpriv->smart_ps = 0; - DBG_871X("%s(): Enter CTW, change SmartPS\n", __FUNCTION__); + DBG_871X("%s(): Enter CTW, change SmartPS\n", __func__); rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&(padapter->pwrctrlpriv.pwr_mode))); } } @@ -4324,7 +4324,7 @@ static void reset_ch_sitesurvey_timer_process (void *FunctionContext) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) return; - DBG_871X( "[%s] In\n", __FUNCTION__ ); + DBG_871X( "[%s] In\n", __func__ ); // Reset the operation channel information pwdinfo->rx_invitereq_info.operation_ch[0] = 0; pwdinfo->rx_invitereq_info.scan_op_ch_only = 0; @@ -4338,7 +4338,7 @@ static void reset_ch_sitesurvey_timer_process2 (void *FunctionContext) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) return; - DBG_871X( "[%s] In\n", __FUNCTION__ ); + DBG_871X( "[%s] In\n", __func__ ); // Reset the operation channel information pwdinfo->p2p_info.operation_ch[0] = 0; pwdinfo->p2p_info.scan_op_ch_only = 0; @@ -4394,7 +4394,7 @@ static void pre_tx_scan_timer_process (void *FunctionContext) } else { - DBG_8192C( "[%s] p2p_state is %d, ignore!!\n", __FUNCTION__, rtw_p2p_state(pwdinfo) ); + DBG_8192C( "[%s] p2p_state is %d, ignore!!\n", __func__, rtw_p2p_state(pwdinfo) ); } _exit_critical_bh(&pmlmepriv->lock, &irqL); @@ -4601,7 +4601,7 @@ void init_wifidirect_info( _adapter* padapter, enum P2P_ROLE role) rtw_p2p_findphase_ex_set(pwdinfo, P2P_FINDPHASE_EX_NONE); pwdinfo->listen_dwell = ( u8 ) (( rtw_get_current_time() % 3 ) + 1); - //DBG_8192C( "[%s] listen_dwell time is %d00ms\n", __FUNCTION__, pwdinfo->listen_dwell ); + //DBG_8192C( "[%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 ) ); pwdinfo->tx_prov_disc_info.wps_config_method_request = WPS_CM_NONE; diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c index 3b39133..ad59965 100644 --- a/core/rtw_pwrctrl.c +++ b/core/rtw_pwrctrl.c @@ -102,7 +102,7 @@ int ips_leave(_adapter * padapter) if ((_WEP40_ == psecuritypriv->dot11PrivacyAlgrthm) ||(_WEP104_ == psecuritypriv->dot11PrivacyAlgrthm)) { - DBG_871X("==>%s,channel(%d),processing(%x)\n",__FUNCTION__,padapter->mlmeextpriv.cur_channel,pwrpriv->bips_processing); + DBG_871X("==>%s,channel(%d),processing(%x)\n",__func__,padapter->mlmeextpriv.cur_channel,pwrpriv->bips_processing); set_channel_bwmode(padapter, padapter->mlmeextpriv.cur_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); for (keyid=0;keyid<4;keyid++){ if (pmlmepriv->key_mask & BIT(keyid)){ @@ -229,7 +229,7 @@ void rtw_ps_processor(_adapter*padapter) pwrpriv->ps_flag = _TRUE; rfpwrstate = RfOnOffDetect(padapter); - DBG_871X("@@@@- #1 %s==> rfstate:%s\n",__FUNCTION__,(rfpwrstate==rf_on)?"rf_on":"rf_off"); + DBG_871X("@@@@- #1 %s==> rfstate:%s\n",__func__,(rfpwrstate==rf_on)?"rf_on":"rf_off"); if (rfpwrstate!= pwrpriv->rf_pwrstate) { if (rfpwrstate == rf_off) @@ -248,7 +248,7 @@ void rtw_ps_processor(_adapter*padapter) #endif //CONFIG_AUTOSUSPEND { rfpwrstate = RfOnOffDetect(padapter); - DBG_871X("@@@@- #2 %s==> rfstate:%s\n",__FUNCTION__,(rfpwrstate==rf_on)?"rf_on":"rf_off"); + DBG_871X("@@@@- #2 %s==> rfstate:%s\n",__func__,(rfpwrstate==rf_on)?"rf_on":"rf_off"); if (rfpwrstate!= pwrpriv->rf_pwrstate) { @@ -283,7 +283,7 @@ void rtw_ps_processor(_adapter*padapter) if ((pwrpriv->rf_pwrstate == rf_on) && ((pwrpriv->pwr_state_check_cnts%4)==0)) { - DBG_871X("==>%s .fw_state(%x)\n",__FUNCTION__,get_fwstate(pmlmepriv)); + DBG_871X("==>%s .fw_state(%x)\n",__func__,get_fwstate(pmlmepriv)); #if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND) #else pwrpriv->change_rfpwrstate = rf_off; @@ -299,11 +299,11 @@ void rtw_ps_processor(_adapter*padapter) #if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND) if (_TRUE==pwrpriv->bInternalAutoSuspend) { - DBG_871X("<==%s .pwrpriv->bInternalAutoSuspend)(%x)\n",__FUNCTION__,pwrpriv->bInternalAutoSuspend); + DBG_871X("<==%s .pwrpriv->bInternalAutoSuspend)(%x)\n",__func__,pwrpriv->bInternalAutoSuspend); } else { pwrpriv->change_rfpwrstate = rf_off; padapter->bCardDisableWOHSM = _TRUE; - DBG_871X("<==%s .pwrpriv->bInternalAutoSuspend)(%x) call autosuspend_enter\n",__FUNCTION__,pwrpriv->bInternalAutoSuspend); + DBG_871X("<==%s .pwrpriv->bInternalAutoSuspend)(%x) call autosuspend_enter\n",__func__,pwrpriv->bInternalAutoSuspend); autosuspend_enter(padapter); } #else @@ -369,7 +369,7 @@ _func_enter_; #ifdef CONFIG_LPS_RPWM_TIMER if (pwrpriv->brpwmtimeout == _TRUE) { - DBG_871X("%s: RPWM timeout, force to set RPWM(0x%02X) again!\n", __FUNCTION__, pslv); + DBG_871X("%s: RPWM timeout, force to set RPWM(0x%02X) again!\n", __func__, pslv); } else #endif // CONFIG_LPS_RPWM_TIMER @@ -381,7 +381,7 @@ _func_enter_; ) { RT_TRACE(_module_rtl871x_pwrctrl_c_,_drv_err_, - ("%s: Already set rpwm[0x%02X], new=0x%02X!\n", __FUNCTION__, pwrpriv->rpwm, pslv)); + ("%s: Already set rpwm[0x%02X], new=0x%02X!\n", __func__, pwrpriv->rpwm, pslv)); return; } } @@ -391,7 +391,7 @@ _func_enter_; { RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, ("%s: SurpriseRemoved(%d) hw_init_completed(%d)\n", - __FUNCTION__, padapter->bSurpriseRemoved, padapter->hw_init_completed)); + __func__, padapter->bSurpriseRemoved, padapter->hw_init_completed)); pwrpriv->cpwm = PS_STATE_S4; @@ -401,11 +401,11 @@ _func_enter_; if (padapter->bDriverStopped == _TRUE) { RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, - ("%s: change power state(0x%02X) when DriverStopped\n", __FUNCTION__, pslv)); + ("%s: change power state(0x%02X) when DriverStopped\n", __func__, pslv)); if (pslv < PS_STATE_S2) { RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_err_, - ("%s: Reject to enter PS_STATE(0x%02X) lower than S2 when DriverStopped!!\n", __FUNCTION__, pslv)); + ("%s: Reject to enter PS_STATE(0x%02X) lower than S2 when DriverStopped!!\n", __func__, pslv)); return; } } @@ -502,7 +502,7 @@ _func_enter_; RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, ("%s: PowerMode=%d Smart_PS=%d\n", - __FUNCTION__, ps_mode, smart_ps)); + __func__, ps_mode, smart_ps)); if (ps_mode > PM_Card_Disable) { RT_TRACE(_module_rtl871x_pwrctrl_c_,_drv_err_,("ps_mode:%d error\n", ps_mode)); @@ -568,7 +568,7 @@ _func_enter_; #endif ) { - DBG_871X("%s: Enter 802.11 power save\n", __FUNCTION__); + DBG_871X("%s: Enter 802.11 power save\n", __func__); #ifdef CONFIG_TDLS _enter_critical_bh(&pstapriv->sta_hash_lock, &irqL); @@ -642,14 +642,14 @@ s32 LPS_RF_ON_check(PADAPTER padapter, u32 delay_ms) if (_TRUE == padapter->bSurpriseRemoved) { err = -2; - DBG_871X("%s: device surprise removed!!\n", __FUNCTION__); + DBG_871X("%s: device surprise removed!!\n", __func__); break; } if (rtw_get_passing_time_ms(start_time) > delay_ms) { err = -1; - DBG_871X("%s: Wait for FW LPS leave more than %u ms!!!\n", __FUNCTION__, delay_ms); + DBG_871X("%s: Wait for FW LPS leave more than %u ms!!!\n", __func__, delay_ms); break; } rtw_usleep_os(100); @@ -778,7 +778,7 @@ void LeaveAllPowerSaveMode(IN PADAPTER Adapter) _func_enter_; - //DBG_871X("%s.....\n",__FUNCTION__); + //DBG_871X("%s.....\n",__func__); if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) { //connect #ifdef CONFIG_LPS_LCLK @@ -939,7 +939,7 @@ static void cpwm_event_callback(struct work_struct *work) _adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv); struct reportpwrstate_parm report; - //DBG_871X("%s\n",__FUNCTION__); + //DBG_871X("%s\n",__func__); report.state = PS_STATE_S2; cpwm_int_hdl(adapter, &report); @@ -1229,7 +1229,7 @@ _func_enter_; { RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_notice_, ("%s: cpwm=0x%02x alives=0x%08x\n", - __FUNCTION__, pwrctrl->cpwm, pwrctrl->alives)); + __func__, pwrctrl->cpwm, pwrctrl->alives)); if ((pwrctrl->alives == 0) && (pwrctrl->cpwm > PS_STATE_S0)) @@ -1267,7 +1267,7 @@ _func_enter_; { RT_TRACE(_module_rtl871x_pwrctrl_c_, _drv_info_, ("%s: cpwm=0x%02x alives=0x%08x\n", - __FUNCTION__, pwrctrl->cpwm, pwrctrl->alives)); + __func__, pwrctrl->cpwm, pwrctrl->alives)); if ((pwrctrl->alives == 0) && (pwrctrl->cpwm > PS_STATE_S0)) @@ -1448,7 +1448,7 @@ static void resume_workitem_callback(struct work_struct *work) struct pwrctrl_priv *pwrpriv = container_of(work, struct pwrctrl_priv, resume_work); _adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv); - DBG_871X("%s\n",__FUNCTION__); + DBG_871X("%s\n",__func__); #if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) rtw_resume_process(adapter); @@ -1476,7 +1476,7 @@ extern int rtw_resume_process(_adapter *padapter); static void rtw_early_suspend(struct early_suspend *h) { struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); - DBG_871X("%s\n",__FUNCTION__); + DBG_871X("%s\n",__func__); //jeff: do nothing but set do_late_resume to false pwrpriv->do_late_resume = _FALSE; @@ -1487,7 +1487,7 @@ static void rtw_late_resume(struct early_suspend *h) struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); _adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv); - DBG_871X("%s\n",__FUNCTION__); + DBG_871X("%s\n",__func__); if (pwrpriv->do_late_resume) { #if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) rtw_resume_process(adapter); @@ -1498,7 +1498,7 @@ static void rtw_late_resume(struct early_suspend *h) void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv) { - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); //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; @@ -1511,7 +1511,7 @@ void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv) void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv) { - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); pwrpriv->do_late_resume = _FALSE; @@ -1530,7 +1530,7 @@ extern int rtw_resume_process(PADAPTER padapter); static void rtw_early_suspend(android_early_suspend_t *h) { struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); - DBG_871X("%s\n",__FUNCTION__); + DBG_871X("%s\n",__func__); //jeff: do nothing but set do_late_resume to false pwrpriv->do_late_resume = _FALSE; @@ -1541,7 +1541,7 @@ static void rtw_late_resume(android_early_suspend_t *h) struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); _adapter *adapter = container_of(pwrpriv, _adapter, pwrctrlpriv); - DBG_871X("%s\n",__FUNCTION__); + DBG_871X("%s\n",__func__); if (pwrpriv->do_late_resume) { #if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI) rtw_resume_process(adapter); @@ -1552,7 +1552,7 @@ static void rtw_late_resume(android_early_suspend_t *h) void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv) { - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); //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; @@ -1563,7 +1563,7 @@ void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv) void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv) { - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); pwrpriv->do_late_resume = _FALSE; @@ -1679,7 +1679,7 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller) } else if (padapter->registrypriv.usbss_enable) { - DBG_8192C("%s call autoresume_enter....\n",__FUNCTION__); + DBG_8192C("%s call autoresume_enter....\n",__func__); if (_FAIL == autoresume_enter(padapter)) { DBG_8192C("======> autoresume fail.............\n"); @@ -1692,7 +1692,7 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller) #endif { #ifdef CONFIG_IPS - DBG_8192C("%s call ips_leave....\n",__FUNCTION__); + DBG_8192C("%s call ips_leave....\n",__func__); if (_FAIL == ips_leave(padapter)) { DBG_8192C("======> ips_leave fail.............\n"); @@ -1759,12 +1759,12 @@ int rtw_pm_set_ips(_adapter *padapter, u8 mode) if ( mode == IPS_NORMAL || mode == IPS_LEVEL_2 ) { rtw_ips_mode_req(pwrctrlpriv, mode); - DBG_871X("%s %s\n", __FUNCTION__, mode == IPS_NORMAL?"IPS_NORMAL":"IPS_LEVEL_2"); + DBG_871X("%s %s\n", __func__, mode == IPS_NORMAL?"IPS_NORMAL":"IPS_LEVEL_2"); return 0; } else if (mode ==IPS_NONE){ rtw_ips_mode_req(pwrctrlpriv, mode); - DBG_871X("%s %s\n", __FUNCTION__, "IPS_NONE"); + DBG_871X("%s %s\n", __func__, "IPS_NONE"); if ((padapter->bSurpriseRemoved ==0)&&(_FAIL == rtw_pwr_wakeup(padapter)) ) return -EFAULT; } diff --git a/core/rtw_recv.c b/core/rtw_recv.c index 52ab217..30db0cb 100644 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -1369,7 +1369,7 @@ _func_enter_; RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" SA==myself\n")); #ifdef DBG_RX_DROP_FRAME DBG_871X("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 ret= _FAIL; goto exit; @@ -1398,7 +1398,7 @@ _func_enter_; RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("mybssid="MAC_FMT"\n", MAC_ARG(mybssid))); #ifdef DBG_RX_DROP_FRAME DBG_871X("DBG_RX_DROP_FRAME %s BSSID="MAC_FMT", mybssid="MAC_FMT"\n", - __FUNCTION__, MAC_ARG(pattrib->bssid), MAC_ARG(mybssid)); + __func__, MAC_ARG(pattrib->bssid), MAC_ARG(mybssid)); DBG_871X( "this adapter = %d, buddy adapter = %d\n", adapter->adapter_type, adapter->pbuddy_adapter->adapter_type ); #endif @@ -1420,7 +1420,7 @@ _func_enter_; if (*psta == NULL) { RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("ap2sta: can't get psta under STATION_MODE ; drop pkt\n")); #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s can't get psta under STATION_MODE ; drop pkt\n", __FUNCTION__); + DBG_871X("DBG_RX_DROP_FRAME %s can't get psta under STATION_MODE ; drop pkt\n", __func__); #endif ret= _FAIL; goto exit; @@ -1454,7 +1454,7 @@ _func_enter_; if (*psta == NULL) { RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("can't get psta under MP_MODE ; drop pkt\n")); #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s can't get psta under WIFI_MP_STATE ; drop pkt\n", __FUNCTION__); + DBG_871X("DBG_RX_DROP_FRAME %s can't get psta under WIFI_MP_STATE ; drop pkt\n", __func__); #endif ret= _FAIL; goto exit; @@ -1483,7 +1483,7 @@ _func_enter_; ret = _FAIL; #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s fw_state:0x%x\n", __FUNCTION__, get_fwstate(pmlmepriv)); + DBG_871X("DBG_RX_DROP_FRAME %s fw_state:0x%x\n", __func__, get_fwstate(pmlmepriv)); #endif } @@ -1751,7 +1751,7 @@ sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame) precv_frame = recvframe_chk_defrag(padapter, precv_frame); if (precv_frame == NULL) { - RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_,("%s: fragment packet\n",__FUNCTION__)); + RT_TRACE(_module_rtl871x_recv_c_, _drv_notice_,("%s: fragment packet\n",__func__)); return _SUCCESS; } @@ -1902,7 +1902,7 @@ _func_enter_; if (ret ==_FAIL){ #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s case:%d, res:%d\n", __FUNCTION__, pattrib->to_fr_ds, ret); + DBG_871X("DBG_RX_DROP_FRAME %s case:%d, res:%d\n", __func__, pattrib->to_fr_ds, ret); #endif goto exit; } else if (ret == RTW_RX_HANDLED) { @@ -2955,7 +2955,7 @@ int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe) #endif //0 if ( ((u32)(mtod(sub_m, caddr_t) + 14) % 4) != 0) - printf("%s()-%d: mtod(sub_m) = %p\n", __FUNCTION__, __LINE__, mtod(sub_m, caddr_t)); + printf("%s()-%d: mtod(sub_m) = %p\n", __func__, __LINE__, mtod(sub_m, caddr_t)); #ifdef CONFIG_RX_INDICATE_QUEUE IF_ENQUEUE(&precvpriv->rx_indicate_queue, sub_m); if (_IF_QLEN(&precvpriv->rx_indicate_queue) <= 1) { @@ -3284,7 +3284,7 @@ int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num) { preorder_ctrl->indicate_seq = seq_num; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d init IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d init IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__, preorder_ctrl->indicate_seq, seq_num); #endif @@ -3300,7 +3300,7 @@ int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num) //DbgPrint("CheckRxTsIndicateSeq(): Packet Drop! IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); #ifdef DBG_RX_DROP_FRAME - DBG_871X("%s IndicateSeq: %d > NewSeq: %d\n", __FUNCTION__, + DBG_871X("%s IndicateSeq: %d > NewSeq: %d\n", __func__, preorder_ctrl->indicate_seq, seq_num); #endif @@ -3317,7 +3317,7 @@ int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num) { preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d SN_EQUAL IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d SN_EQUAL IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__, preorder_ctrl->indicate_seq, seq_num); #endif } @@ -3333,7 +3333,7 @@ int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_num) preorder_ctrl->indicate_seq = 0xFFF - (wsize - (seq_num + 1)) + 1; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d SN_LESS(wend, seq_num) IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d SN_LESS(wend, seq_num) IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__, preorder_ctrl->indicate_seq, seq_num); #endif } @@ -3446,7 +3446,7 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre pattrib = &prframe->u.hdr.attrib; preorder_ctrl->indicate_seq = pattrib->seq_num; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__, preorder_ctrl->indicate_seq, pattrib->seq_num); #endif } @@ -3482,7 +3482,7 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre { preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__, preorder_ctrl->indicate_seq, pattrib->seq_num); #endif } @@ -3602,7 +3602,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe) } #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s pattrib->qos !=1\n", __FUNCTION__); + DBG_871X("DBG_RX_DROP_FRAME %s pattrib->qos !=1\n", __func__); #endif return _FAIL; @@ -3614,7 +3614,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe) //indicate this recv_frame preorder_ctrl->indicate_seq = pattrib->seq_num; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__, preorder_ctrl->indicate_seq, pattrib->seq_num); #endif @@ -3622,7 +3622,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe) preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__, preorder_ctrl->indicate_seq, pattrib->seq_num); #endif @@ -3642,7 +3642,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe) { preorder_ctrl->indicate_seq = pattrib->seq_num; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__, preorder_ctrl->indicate_seq, pattrib->seq_num); #endif @@ -3650,13 +3650,13 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe) preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__, preorder_ctrl->indicate_seq, pattrib->seq_num); #endif if (retval != _SUCCESS){ #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __FUNCTION__); + DBG_871X("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __func__); #endif } @@ -3684,7 +3684,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe) //return _FAIL; #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s check_indicate_seq fail\n", __FUNCTION__); + DBG_871X("DBG_RX_DROP_FRAME %s check_indicate_seq fail\n", __func__); #endif rtw_recv_indicatepkt(padapter, prframe); @@ -3702,7 +3702,7 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe) //_exit_critical_ex(&ppending_recvframe_queue->lock, &irql); //return _FAIL; #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s enqueue_reorder_recvframe fail\n", __FUNCTION__); + DBG_871X("DBG_RX_DROP_FRAME %s enqueue_reorder_recvframe fail\n", __func__); #endif goto _err_exit; } @@ -3798,7 +3798,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 { #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s recv_indicatepkt_reorder error!\n", __FUNCTION__); + DBG_871X("DBG_RX_DROP_FRAME %s recv_indicatepkt_reorder error!\n", __func__); #endif if ((padapter->bDriverStopped == _FALSE) && @@ -3817,7 +3817,7 @@ int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe) { RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("wlanhdr_to_ethhdr: drop pkt\n")); #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __FUNCTION__); + DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __func__); #endif return retval; } @@ -3911,7 +3911,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe) if (prframe == NULL) { RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("decryptor: drop pkt\n")); #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s decryptor: drop pkt\n", __FUNCTION__); + DBG_871X("DBG_RX_DROP_FRAME %s decryptor: drop pkt\n", __func__); #endif ret = _FAIL; goto _recv_data_drop; @@ -3950,7 +3950,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe) if (prframe==NULL) { RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvframe_chk_defrag: drop pkt\n")); #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s recvframe_chk_defrag: drop pkt\n", __FUNCTION__); + DBG_871X("DBG_RX_DROP_FRAME %s recvframe_chk_defrag: drop pkt\n", __func__); #endif goto _recv_data_drop; } @@ -3959,7 +3959,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe) if (prframe == NULL) { RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("portctrl: drop pkt\n")); #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n", __FUNCTION__); + DBG_871X("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n", __func__); #endif ret = _FAIL; goto _recv_data_drop; @@ -3983,7 +3983,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe) { RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recv_func: process_recv_indicatepkts fail!\n")); #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s process_recv_indicatepkts fail!\n", __FUNCTION__); + DBG_871X("DBG_RX_DROP_FRAME %s process_recv_indicatepkts fail!\n", __func__); #endif rtw_free_recvframe(orig_prframe, pfree_recv_queue);//free this recv_frame goto _recv_data_drop; @@ -3996,7 +3996,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe) { RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("wlanhdr_to_ethhdr: drop pkt\n")); #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr: drop pkt\n", __FUNCTION__); + DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr: drop pkt\n", __func__); #endif rtw_free_recvframe(orig_prframe, pfree_recv_queue);//free this recv_frame goto _recv_data_drop; @@ -4010,7 +4010,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe) if (ret != _SUCCESS) { #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s rtw_recv_indicatepkt fail!\n", __FUNCTION__); + DBG_871X("DBG_RX_DROP_FRAME %s rtw_recv_indicatepkt fail!\n", __func__); #endif goto _recv_data_drop; } @@ -4020,7 +4020,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe) RT_TRACE(_module_rtl871x_recv_c_, _drv_alert_, ("@@@@ recv_func: rtw_free_recvframe\n" )); RT_TRACE(_module_rtl871x_recv_c_, _drv_debug_, ("recv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved)); #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s ecv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", __FUNCTION__, + DBG_871X("DBG_RX_DROP_FRAME %s ecv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", __func__, padapter->bDriverStopped, padapter->bSurpriseRemoved); #endif ret = _FAIL; @@ -4035,7 +4035,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe) if (ret != _SUCCESS) { #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __FUNCTION__); + DBG_871X("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __func__); #endif rtw_free_recvframe(orig_prframe, pfree_recv_queue); goto _recv_data_drop; @@ -4044,7 +4044,7 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe) else { #ifdef DBG_RX_DROP_FRAME - DBG_871X("DBG_RX_DROP_FRAME %s what is this condition??\n", __FUNCTION__); + DBG_871X("DBG_RX_DROP_FRAME %s what is this condition??\n", __func__); #endif goto _recv_data_drop; } @@ -4203,7 +4203,7 @@ void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS){ DBG_871X("%s signal_strength:%3u, rssi:%3d, signal_qual:%3u" ", num_signal_strength:%u, num_signal_qual:%u" "\n" - , __FUNCTION__ + , __func__ , recvpriv->signal_strength , recvpriv->rssi , recvpriv->signal_qual diff --git a/core/rtw_security.c b/core/rtw_security.c index a8f23ac..7bfe2b6 100644 --- a/core/rtw_security.c +++ b/core/rtw_security.c @@ -795,7 +795,7 @@ _func_enter_; if (psecuritypriv->binstallGrpkey==_FALSE) { res=_FAIL; - DBG_8192C("%s:rx bc/mc packets,but didn't install group key!!!!!!!!!!\n",__FUNCTION__); + DBG_8192C("%s:rx bc/mc packets,but didn't install group key!!!!!!!!!!\n",__func__); goto exit; } //DBG_871X("rx bc/mc packets, to perform sw rtw_tkip_decrypt\n"); @@ -1576,7 +1576,7 @@ _func_enter_; ptdls_sta=rtw_get_stainfo(&padapter->stapriv ,&pattrib->dst[0] ); if ((ptdls_sta != NULL) && (ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE) ) { - DBG_871X("[%s] for tdls link\n", __FUNCTION__); + DBG_871X("[%s] for tdls link\n", __func__); prwskey=&ptdls_sta->tpk.tk[0]; } } @@ -1918,7 +1918,7 @@ _func_enter_; if (psecuritypriv->binstallGrpkey==_FALSE) { res=_FAIL; - DBG_8192C("%s:rx bc/mc packets,but didn't install group key!!!!!!!!!!\n",__FUNCTION__); + DBG_8192C("%s:rx bc/mc packets,but didn't install group key!!!!!!!!!!\n",__func__); goto exit; } prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey; @@ -2829,7 +2829,7 @@ int tdls_verify_mic(u8 *kck, u8 trans_seq, } //Invalid MIC - DBG_871X( "[%s] Invalid MIC\n", __FUNCTION__); + DBG_871X( "[%s] Invalid MIC\n", __func__); return 0; } diff --git a/core/rtw_sreset.c b/core/rtw_sreset.c index 45aa9cb..53ca39f 100644 --- a/core/rtw_sreset.c +++ b/core/rtw_sreset.c @@ -66,10 +66,10 @@ u8 sreset_get_wifi_status(_adapter *padapter) if (WIFI_STATUS_SUCCESS !=psrtpriv->Wifi_Error_Status) { - DBG_8192C("==>%s error_status(0x%x)\n",__FUNCTION__,psrtpriv->Wifi_Error_Status); + DBG_8192C("==>%s error_status(0x%x)\n",__func__,psrtpriv->Wifi_Error_Status); status = (psrtpriv->Wifi_Error_Status &( ~(USB_READ_PORT_FAIL|USB_WRITE_PORT_FAIL))); } - DBG_8192C("==> %s wifi_status(0x%x)\n",__FUNCTION__,status); + DBG_8192C("==> %s wifi_status(0x%x)\n",__func__,status); //status restore psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c index bdb1608..6890591 100644 --- a/core/rtw_sta_mgt.c +++ b/core/rtw_sta_mgt.c @@ -413,7 +413,7 @@ _func_enter_; preorder_ctrl->indicate_seq = 0xffff; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d\n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d\n", __func__, __LINE__, preorder_ctrl->indicate_seq); #endif preorder_ctrl->wend_b= 0xffff; diff --git a/core/rtw_tdls.c b/core/rtw_tdls.c index bfa929a..956095a 100644 --- a/core/rtw_tdls.c +++ b/core/rtw_tdls.c @@ -427,12 +427,12 @@ void rtw_tdls_process_wfd_ie(struct tdls_info *ptdlsinfo, u8 *ptr, u8 length) u32 attr_contentlen = 0; int i; - DBG_871X( "[%s] WFD IE Found!!\n", __FUNCTION__ ); + DBG_871X( "[%s] WFD IE Found!!\n", __func__ ); rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen); if ( attr_contentlen ) { ptdlsinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 ); - DBG_871X( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, ptdlsinfo->wfd_info->peer_rtsp_ctrlport ); + DBG_871X( "[%s] Peer PORT NUM = %d\n", __func__, ptdlsinfo->wfd_info->peer_rtsp_ctrlport ); } _rtw_memset( attr_content, 0x00, 10); @@ -441,7 +441,7 @@ void rtw_tdls_process_wfd_ie(struct tdls_info *ptdlsinfo, u8 *ptr, u8 length) if ( attr_contentlen ) { _rtw_memcpy(ptdlsinfo->wfd_info->peer_ip_address, ( attr_content + 1 ), 4); - DBG_871X( "[%s] Peer IP = %02u.%02u.%02u.%02u\n", __FUNCTION__, + DBG_871X( "[%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[2], ptdlsinfo->wfd_info->peer_ip_address[3] ); @@ -458,7 +458,7 @@ void issue_tunneled_probe_req(_adapter *padapter) struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); u8 baddr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - DBG_871X("[%s]\n", __FUNCTION__); + DBG_871X("[%s]\n", __func__); if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) { @@ -501,7 +501,7 @@ void issue_tunneled_probe_rsp(_adapter *padapter, union recv_frame *precv_frame) struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct rx_pkt_attrib *rx_pkt_pattrib = &precv_frame->u.hdr.attrib; - DBG_871X("[%s]\n", __FUNCTION__); + DBG_871X("[%s]\n", __func__); if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) { @@ -1345,7 +1345,7 @@ sint On_TDLS_Setup_Rsp(_adapter *adapter, union recv_frame *precv_frame) if (stat_code!=0) { - DBG_871X( "[%s] status_code = %d, free_tdls_sta\n", __FUNCTION__, stat_code ); + DBG_871X( "[%s] status_code = %d, free_tdls_sta\n", __func__, stat_code ); free_tdls_sta(adapter, ptdls_sta); return _FAIL; } @@ -1510,7 +1510,7 @@ sint On_TDLS_Setup_Cfm(_adapter *adapter, union recv_frame *precv_frame) _rtw_memcpy(&stat_code, ptr+2, 2); if (stat_code!=0){ - DBG_871X( "[%s] stat_code = %d\n, free_tdls_sta", __FUNCTION__, stat_code ); + DBG_871X( "[%s] stat_code = %d\n, free_tdls_sta", __func__, stat_code ); free_tdls_sta(adapter, ptdls_sta); return _FAIL; } @@ -2165,7 +2165,7 @@ void rtw_build_tdls_setup_rsp_ies(_adapter * padapter, struct xmit_frame * pxmit if (ptdls_sta == NULL ) { - DBG_871X("[%s] %d\n", __FUNCTION__, __LINE__); + DBG_871X("[%s] %d\n", __func__, __LINE__); return; } diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c index 36f09b6..41e3853 100644 --- a/core/rtw_wlan_util.c +++ b/core/rtw_wlan_util.c @@ -567,7 +567,7 @@ void set_channel_bwmode(_adapter *padapter, unsigned char channel, unsigned char if ( padapter->bNotifyChannelChange ) { - DBG_871X( "[%s] ch = %d, offset = %d, bwmode = %d\n", __FUNCTION__, channel, channel_offset, bwmode ); + DBG_871X( "[%s] ch = %d, offset = %d, bwmode = %d\n", __func__, channel, channel_offset, bwmode ); } if ((bwmode == HT_CHANNEL_WIDTH_20)||(channel_offset == HAL_PRIME_CHNL_OFFSET_DONT_CARE)) @@ -802,7 +802,7 @@ void write_cam(_adapter *padapter, u8 entry, u16 ctrl, u8 *mac, u8 *key) //cmd = CAM_POLLINIG | CAM_WRITE | (addr + j); //rtw_write32(padapter, RWCAM, cmd); - //DBG_871X("%s=> cam write: %x, %x\n",__FUNCTION__, cmd, val); + //DBG_871X("%s=> cam write: %x, %x\n",__func__, cmd, val); } @@ -927,18 +927,18 @@ int WFD_info_handler(_adapter *padapter, PNDIS_802_11_VARIABLE_IEs pIE) u8 attr_content[ 10 ] = { 0x00 }; u32 attr_contentlen = 0; - DBG_871X( "[%s] Found WFD IE\n", __FUNCTION__ ); + DBG_871X( "[%s] Found WFD IE\n", __func__ ); rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen); if ( attr_contentlen ) { pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 ); - DBG_8192C( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); + DBG_8192C( "[%s] Peer PORT NUM = %d\n", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); return( _TRUE ); } } else { - DBG_871X( "[%s] NO WFD IE\n", __FUNCTION__ ); + DBG_871X( "[%s] NO WFD IE\n", __func__ ); } return( _FAIL ); @@ -1321,7 +1321,7 @@ void HTOnAssocRsp(_adapter *padapter) struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable)) { @@ -1388,7 +1388,7 @@ void HTOnAssocRsp(_adapter *padapter) { pmlmeinfo->HT_caps.HT_cap_element.MCS_rate[i] &= MCS_rate_1R[i]; }*/ - DBG_871X("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__FUNCTION__); + DBG_871X("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__func__); } // @@ -2466,7 +2466,7 @@ void process_addba_req(_adapter *padapter, u8 *paddba_req, u8 *addr) #ifdef CONFIG_UPDATE_INDICATE_SEQ_WHILE_PROCESS_ADDBA_REQ preorder_ctrl->indicate_seq = start_seq; #ifdef DBG_RX_SEQ - DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, start_seq: %d\n", __FUNCTION__, __LINE__, + DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, start_seq: %d\n", __func__, __LINE__, preorder_ctrl->indicate_seq, start_seq); #endif #else @@ -2617,7 +2617,7 @@ int rtw_handle_dualmac(_adapter *adapter, bool init) /* For SMSP on 92DU-VC, driver do not probe another Interface. */ if (dvobj->NumInterfaces == 2 && dvobj->InterfaceNumber != 0 && adapter->registrypriv.mac_phy_mode == 1) { - DBG_871X("%s(): Do not init another USB Interface because SMSP\n",__FUNCTION__); + DBG_871X("%s(): Do not init another USB Interface because SMSP\n",__func__); status = _FAIL; goto exit; } @@ -2625,13 +2625,13 @@ int rtw_handle_dualmac(_adapter *adapter, bool init) if (pbuddy_padapter == NULL) { pbuddy_padapter = adapter; - DBG_871X("%s(): pbuddy_padapter == NULL, Set pbuddy_padapter\n",__FUNCTION__); + DBG_871X("%s(): pbuddy_padapter == NULL, Set pbuddy_padapter\n",__func__); } else { adapter->pbuddy_adapter = pbuddy_padapter; pbuddy_padapter->pbuddy_adapter = adapter; // clear global value pbuddy_padapter = NULL; - DBG_871X("%s(): pbuddy_padapter exist, Exchange Information\n",__FUNCTION__); + DBG_871X("%s(): pbuddy_padapter exist, Exchange Information\n",__func__); } #ifdef CONFIG_DUALMAC_CONCURRENT if (dvobj->InterfaceNumber == 0) { @@ -2639,13 +2639,13 @@ int rtw_handle_dualmac(_adapter *adapter, bool init) adapter->isprimary = _TRUE; adapter->adapter_type = PRIMARY_ADAPTER; adapter->iface_type = IFACE_PORT0; - DBG_871X("%s(): PRIMARY_ADAPTER\n",__FUNCTION__); + DBG_871X("%s(): PRIMARY_ADAPTER\n",__func__); } else { //set adapter_type/iface type adapter->isprimary = _FALSE; adapter->adapter_type = SECONDARY_ADAPTER; adapter->iface_type = IFACE_PORT1; - DBG_871X("%s(): SECONDARY_ADAPTER\n",__FUNCTION__); + DBG_871X("%s(): SECONDARY_ADAPTER\n",__func__); } #endif }else { diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index ea0130a..bc8b532 100644 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -724,7 +724,7 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr if (psta == NULL) { // if we cannot get psta => drrp the pkt RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:" MAC_FMT"\n", MAC_ARG(pattrib->ra))); #ifdef DBG_TX_DROP_FRAME - DBG_871X("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __FUNCTION__, MAC_ARG(pattrib->ra)); + DBG_871X("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __func__, MAC_ARG(pattrib->ra)); #endif res =_FAIL; goto exit; @@ -739,7 +739,7 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr if (psta) { pattrib->mac_id = psta->mac_id; - //DBG_8192C("%s ==> mac_id(%d)\n",__FUNCTION__,pattrib->mac_id ); + //DBG_8192C("%s ==> mac_id(%d)\n",__func__,pattrib->mac_id ); pattrib->psta = psta; } else @@ -747,7 +747,7 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr // if we cannot get psta => drop the pkt RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:" MAC_FMT "\n", MAC_ARG(pattrib->ra))); #ifdef DBG_TX_DROP_FRAME - DBG_871X("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __FUNCTION__, MAC_ARG(pattrib->ra)); + DBG_871X("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __func__, MAC_ARG(pattrib->ra)); #endif res = _FAIL; goto exit; @@ -791,7 +791,7 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr { RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\npsta->ieee8021x_blocked == _TRUE, pattrib->ether_type(%.4x) != 0x888e\n",pattrib->ether_type)); #ifdef DBG_TX_DROP_FRAME - DBG_871X("DBG_TX_DROP_FRAME %s psta->ieee8021x_blocked == _TRUE, pattrib->ether_type(%04x) != 0x888e\n", __FUNCTION__,pattrib->ether_type); + DBG_871X("DBG_TX_DROP_FRAME %s psta->ieee8021x_blocked == _TRUE, pattrib->ether_type(%04x) != 0x888e\n", __func__,pattrib->ether_type); #endif res = _FAIL; goto exit; @@ -843,7 +843,7 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr { RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("\npadapter->securitypriv.busetkipkey(%d)==_FAIL drop packet\n", padapter->securitypriv.busetkipkey)); #ifdef DBG_TX_DROP_FRAME - DBG_871X("DBG_TX_DROP_FRAME %s padapter->securitypriv.busetkipkey(%d)==_FAIL drop packet\n", __FUNCTION__, padapter->securitypriv.busetkipkey); + DBG_871X("DBG_TX_DROP_FRAME %s padapter->securitypriv.busetkipkey(%d)==_FAIL drop packet\n", __func__, padapter->securitypriv.busetkipkey); #endif res =_FAIL; goto exit; @@ -1668,7 +1668,7 @@ _func_enter_; return _FAIL; if (pxmitframe->buf_addr == NULL){ - DBG_8192C("==> %s buf_addr==NULL\n",__FUNCTION__); + DBG_8192C("==> %s buf_addr==NULL\n",__func__); return _FAIL; } @@ -1797,7 +1797,7 @@ _func_enter_; break; } else { - RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: There're still something in packet!\n", __FUNCTION__)); + RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("%s: There're still something in packet!\n", __func__)); } addr = (SIZE_PTR)(pframe); @@ -2795,7 +2795,7 @@ int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb) } 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)) @@ -2819,7 +2819,7 @@ int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb) } // 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 0; } @@ -2950,7 +2950,7 @@ s32 rtw_xmit(_adapter *padapter, _pkt **ppkt) if (pxmitframe == NULL) { RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit: no more pxmitframe\n")); //#ifdef DBG_TX_DROP_FRAME - DBG_871X("DBG_TX_DROP_FRAME %s no more pxmitframe\n", __FUNCTION__); + DBG_871X("DBG_TX_DROP_FRAME %s no more pxmitframe\n", __func__); //#endif return -1; } @@ -2992,7 +2992,7 @@ s32 rtw_xmit(_adapter *padapter, _pkt **ppkt) if (res == _FAIL) { RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit: update attrib fail\n")); #ifdef DBG_TX_DROP_FRAME - DBG_871X("DBG_TX_DROP_FRAME %s update attrib fail\n", __FUNCTION__); + DBG_871X("DBG_TX_DROP_FRAME %s update attrib fail\n", __func__); #endif rtw_free_xmitframe(pxmitpriv, pxmitframe); return -1; @@ -3701,7 +3701,7 @@ struct xmit_buf* dequeue_pending_xmitbuf_under_survey( } else { - DBG_871X("%s, !!!ERROR!!! For USB, TODO ITEM\n", __FUNCTION__); + DBG_871X("%s, !!!ERROR!!! For USB, TODO ITEM\n", __func__); } #else type = GetFrameSubType(pxmitbuf->pbuf + TXDESC_OFFSET); diff --git a/hal/Hal8188ERateAdaptive.c b/hal/Hal8188ERateAdaptive.c index 921c8f1..163ab51 100644 --- a/hal/Hal8188ERateAdaptive.c +++ b/hal/Hal8188ERateAdaptive.c @@ -697,7 +697,7 @@ ODM_RAInfo_Init( max_rate_idx = 0x03; } - //printk("%s ==>WirelessMode:0x%08x ,max_raid_idx:0x%02x\n ",__FUNCTION__,WirelessMode,max_rate_idx); + //printk("%s ==>WirelessMode:0x%08x ,max_raid_idx:0x%02x\n ",__func__,WirelessMode,max_rate_idx); ODM_RT_TRACE(pDM_Odm,ODM_COMP_RATE_ADAPTIVE, ODM_DBG_LOUD, ("ODM_RAInfo_Init(): WirelessMode:0x%08x ,max_raid_idx:0x%02x\n", WirelessMode,max_rate_idx)); diff --git a/hal/HalHWImg8188E_BB.c b/hal/HalHWImg8188E_BB.c index 1efafdd..c2a3355 100644 --- a/hal/HalHWImg8188E_BB.c +++ b/hal/HalHWImg8188E_BB.c @@ -295,11 +295,11 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E( } #ifdef CONFIG_IOL_IOREG_CFG if (biol){ - //printk("==> %s, pktlen = %d,bndy_cnt = %d\n",__FUNCTION__,pxmit_frame->attrib.pktlen+4+32,bndy_cnt); + //printk("==> %s, pktlen = %d,bndy_cnt = %d\n",__func__,pxmit_frame->attrib.pktlen+4+32,bndy_cnt); if (rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) { #ifdef CONFIG_IOL_IOREG_CFG_DBG - printk("~~~ %s Success !!!\n",__FUNCTION__); + printk("~~~ %s Success !!!\n",__func__); { //dump data from TX packet buffer rtw_IOL_cmd_tx_pkt_buf_dump(pDM_Odm->Adapter,pxmit_frame->attrib.pktlen+32); @@ -308,7 +308,7 @@ ODM_ReadAndConfig_AGC_TAB_1T_8188E( } else{ - printk("~~~ %s IOL_exec_cmds Failed !!!\n",__FUNCTION__); + printk("~~~ %s IOL_exec_cmds Failed !!!\n",__func__); #ifdef CONFIG_IOL_IOREG_CFG_DBG { //dump data from TX packet buffer @@ -689,16 +689,16 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E( } #ifdef CONFIG_IOL_IOREG_CFG if (biol){ - //printk("==> %s, pktlen = %d,bndy_cnt = %d\n",__FUNCTION__,pxmit_frame->attrib.pktlen+4+32,bndy_cnt); + //printk("==> %s, pktlen = %d,bndy_cnt = %d\n",__func__,pxmit_frame->attrib.pktlen+4+32,bndy_cnt); if (rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) { #ifdef CONFIG_IOL_IOREG_CFG_DBG - printk("~~~ %s IOL_exec_cmds Success !!!\n",__FUNCTION__); + printk("~~~ %s IOL_exec_cmds Success !!!\n",__func__); { u4Byte idx; u4Byte cdata; - printk(" %s data compare => array_len:%d\n",__FUNCTION__,cmpdata_idx); - printk("### %s data compared !!###\n",__FUNCTION__); + printk(" %s data compare => array_len:%d\n",__func__,cmpdata_idx); + printk("### %s data compared !!###\n",__func__); for (idx=0;idx< cmpdata_idx;idx++) { cdata = ODM_Read4Byte(pDM_Odm, cmpdata[idx].addr); @@ -708,7 +708,7 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E( rst = HAL_STATUS_FAILURE; } } - printk("### %s data compared !!###\n",__FUNCTION__); + printk("### %s data compared !!###\n",__func__); //if (rst == HAL_STATUS_FAILURE) {//dump data from TX packet buffer rtw_IOL_cmd_tx_pkt_buf_dump(pDM_Odm->Adapter,pxmit_frame->attrib.pktlen+32); @@ -720,7 +720,7 @@ ODM_ReadAndConfig_PHY_REG_1T_8188E( } else{ rst = HAL_STATUS_FAILURE; - printk("~~~ IOL Config %s Failed !!!\n",__FUNCTION__); + printk("~~~ IOL Config %s Failed !!!\n",__func__); #ifdef CONFIG_IOL_IOREG_CFG_DBG { //dump data from TX packet buffer diff --git a/hal/HalHWImg8188E_MAC.c b/hal/HalHWImg8188E_MAC.c index d7063c2..bf5bca5 100644 --- a/hal/HalHWImg8188E_MAC.c +++ b/hal/HalHWImg8188E_MAC.c @@ -276,7 +276,7 @@ ODM_ReadAndConfig_MAC_REG_8188E( #ifdef CONFIG_IOL_IOREG_CFG if (biol){ - //printk("==> %s, pktlen = %d,bndy_cnt = %d\n",__FUNCTION__,pxmit_frame->attrib.pktlen+4+32,bndy_cnt); + //printk("==> %s, pktlen = %d,bndy_cnt = %d\n",__func__,pxmit_frame->attrib.pktlen+4+32,bndy_cnt); if (rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) { diff --git a/hal/HalHWImg8188E_RF.c b/hal/HalHWImg8188E_RF.c index 5217e4c..68384e2 100644 --- a/hal/HalHWImg8188E_RF.c +++ b/hal/HalHWImg8188E_RF.c @@ -328,16 +328,16 @@ ODM_ReadAndConfig_RadioA_1T_8188E( } #ifdef CONFIG_IOL_IOREG_CFG if (biol){ - //printk("==> %s, pktlen = %d,bndy_cnt = %d\n",__FUNCTION__,pxmit_frame->attrib.pktlen+4+32,bndy_cnt); + //printk("==> %s, pktlen = %d,bndy_cnt = %d\n",__func__,pxmit_frame->attrib.pktlen+4+32,bndy_cnt); if (rtw_IOL_exec_cmds_sync(pDM_Odm->Adapter, pxmit_frame, 1000, bndy_cnt)) { #ifdef CONFIG_IOL_IOREG_CFG_DBG - printk("~~~ %s Success !!!\n",__FUNCTION__); + printk("~~~ %s Success !!!\n",__func__); { u4Byte idx; u4Byte cdata; - printk(" %s data compare => array_len:%d\n",__FUNCTION__,cmpdata_idx); - printk("### %s data compared !!###\n",__FUNCTION__); + printk(" %s data compare => array_len:%d\n",__func__,cmpdata_idx); + printk("### %s data compared !!###\n",__func__); for (idx=0;idx< cmpdata_idx;idx++) { cdata = ODM_GetRFReg(pDM_Odm, ODM_RF_PATH_A,cmpdata[idx].addr,bRFRegOffsetMask); @@ -347,7 +347,7 @@ ODM_ReadAndConfig_RadioA_1T_8188E( rst = HAL_STATUS_FAILURE; } } - printk("### %s data compared !!###\n",__FUNCTION__); + printk("### %s data compared !!###\n",__func__); //if (rst == HAL_STATUS_FAILURE) {//dump data from TX packet buffer rtw_IOL_cmd_tx_pkt_buf_dump(pDM_Odm->Adapter,pxmit_frame->attrib.pktlen+32); @@ -358,7 +358,7 @@ ODM_ReadAndConfig_RadioA_1T_8188E( } else{ rst = HAL_STATUS_FAILURE; - printk("~~~ IOL Config %s Failed !!!\n",__FUNCTION__); + printk("~~~ IOL Config %s Failed !!!\n",__func__); #ifdef CONFIG_IOL_IOREG_CFG_DBG { //dump data from TX packet buffer diff --git a/hal/hal_intf.c b/hal/hal_intf.c index e135612..1ad1b1f 100644 --- a/hal/hal_intf.c +++ b/hal/hal_intf.c @@ -213,7 +213,7 @@ void rtw_hal_enable_interrupt(_adapter *padapter) if (padapter->HalFunc.enable_interrupt) padapter->HalFunc.enable_interrupt(padapter); else - DBG_871X("%s: HalFunc.enable_interrupt is NULL!\n", __FUNCTION__); + DBG_871X("%s: HalFunc.enable_interrupt is NULL!\n", __func__); } void rtw_hal_disable_interrupt(_adapter *padapter) @@ -221,7 +221,7 @@ void rtw_hal_disable_interrupt(_adapter *padapter) if (padapter->HalFunc.disable_interrupt) padapter->HalFunc.disable_interrupt(padapter); else - DBG_871X("%s: HalFunc.disable_interrupt is NULL!\n", __FUNCTION__); + DBG_871X("%s: HalFunc.disable_interrupt is NULL!\n", __func__); } @@ -232,7 +232,7 @@ u32 rtw_hal_inirp_init(_adapter *padapter) if (padapter->HalFunc.inirp_init) rst = padapter->HalFunc.inirp_init(padapter); else - DBG_871X(" %s HalFunc.inirp_init is NULL!!!\n",__FUNCTION__); + DBG_871X(" %s HalFunc.inirp_init is NULL!!!\n",__func__); return rst; } diff --git a/hal/odm.c b/hal/odm.c index 19ecc76..b271bfb 100644 --- a/hal/odm.c +++ b/hal/odm.c @@ -2903,7 +2903,7 @@ u4Byte ODM_Get_Rate_Bitmap( } - //printk("%s ==> rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x\n",__FUNCTION__,rssi_level,WirelessMode,rate_bitmap); + //printk("%s ==> rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x\n",__func__,rssi_level,WirelessMode,rate_bitmap); ODM_RT_TRACE(pDM_Odm, ODM_COMP_RA_MASK, ODM_DBG_LOUD, (" ==> rssi_level:0x%02x, WirelessMode:0x%02x, rate_bitmap:0x%08x\n",rssi_level,WirelessMode,rate_bitmap)); return rate_bitmap; @@ -3095,7 +3095,7 @@ odm_RefreshRateAdaptiveMaskCE( return; } - //printk("==> %s\n",__FUNCTION__); + //printk("==> %s\n",__func__); for (i=0; ipODM_StaInfo[i]; @@ -3196,7 +3196,7 @@ ODM_RAStateCheck( RATRState = DM_RATR_STA_MIDDLE; else RATRState = DM_RATR_STA_LOW; - //printk("==>%s,RATRState:0x%02x ,RSSI:%d\n",__FUNCTION__,RATRState,RSSI); + //printk("==>%s,RATRState:0x%02x ,RSSI:%d\n",__func__,RATRState,RSSI); if ( *pRATRState!=RATRState || bForceUpdate) { @@ -3585,7 +3585,7 @@ odm_DynamicTxPower_92C( if (Adapter->proximity.proxim_on== _TRUE){ struct proximity_priv *prox_priv=Adapter->proximity.proximity_priv; // Intel set fixed tx power - printk("\n %s Adapter->proximity.proxim_on=%d prox_priv->proxim_modeinfo->power_output=%d\n",__FUNCTION__,Adapter->proximity.proxim_on,prox_priv->proxim_modeinfo->power_output); + printk("\n %s Adapter->proximity.proxim_on=%d prox_priv->proxim_modeinfo->power_output=%d\n",__func__,Adapter->proximity.proxim_on,prox_priv->proxim_modeinfo->power_output); if (prox_priv!=NULL){ if (prox_priv->proxim_modeinfo->power_output> 0) { @@ -4292,7 +4292,7 @@ IN PADAPTER pAdapter #if (RTL8192D_SUPPORT==1) FindMinimumRSSI_Dmsp(pAdapter); #endif - //DBG_8192C("%s=>MinUndecoratedPWDBForDM(%d)\n",__FUNCTION__,pdmpriv->MinUndecoratedPWDBForDM); + //DBG_8192C("%s=>MinUndecoratedPWDBForDM(%d)\n",__func__,pdmpriv->MinUndecoratedPWDBForDM); //ODM_RT_TRACE(pDM_Odm,COMP_DIG, DBG_LOUD, ("MinUndecoratedPWDBForDM =%d\n",pHalData->MinUndecoratedPWDBForDM)); } #endif @@ -4389,7 +4389,7 @@ odm_RSSIMonitorCheckCE( tmpEntryMaxPWDB = psta->rssi_stat.UndecoratedSmoothedPWDB; if (psta->rssi_stat.UndecoratedSmoothedPWDB != (-1)){ - //printk("%s==> mac_id(%d),rssi(%d)\n",__FUNCTION__,psta->mac_id,psta->rssi_stat.UndecoratedSmoothedPWDB); + //printk("%s==> mac_id(%d),rssi(%d)\n",__func__,psta->mac_id,psta->rssi_stat.UndecoratedSmoothedPWDB); #if (RTL8192D_SUPPORT==1) PWDB_rssi[sta_cnt++] = (psta->mac_id | (psta->rssi_stat.UndecoratedSmoothedPWDB<<16) | ((Adapter->stapriv.asoc_sta_count+1) << 8)); #else @@ -4405,7 +4405,7 @@ odm_RSSIMonitorCheckCE( _exit_critical_bh(&pstapriv->sta_hash_lock, &irqL); #endif - //printk("%s==> sta_cnt(%d)\n",__FUNCTION__,sta_cnt); + //printk("%s==> sta_cnt(%d)\n",__func__,sta_cnt); for (i=0; i< sta_cnt; i++) { @@ -4453,7 +4453,7 @@ odm_RSSIMonitorCheckCE( if (pHalData->fw_ractrl == _TRUE) { u32 param = (u32)(pdmpriv->UndecoratedSmoothedPWDB<<16); - printk("%s==> rssi(%d)\n",__FUNCTION__,pdmpriv->UndecoratedSmoothedPWDB); + printk("%s==> rssi(%d)\n",__func__,pdmpriv->UndecoratedSmoothedPWDB); param |= 0;//macid=0 for sta mode; rtl8192c_set_rssi_cmd(Adapter, (u8*)¶m); @@ -7736,7 +7736,7 @@ odm_IotEngine( } #if ((DM_ODM_SUPPORT_TYPE==ODM_ADSL)||((DM_ODM_SUPPORT_TYPE==ODM_AP)&&(defined WMM_VIBE_PRI))) if (priv->pshare->iot_mode_VO_exist) { - //printk("[%s %d] BE_pkt_count=%d\n", __FUNCTION__, __LINE__, priv->pshare->phw->BE_pkt_count); + //printk("[%s %d] BE_pkt_count=%d\n", __func__, __LINE__, priv->pshare->phw->BE_pkt_count); if (!priv->pshare->iot_mode_BE_exist && (priv->pshare->phw->BE_pkt_count > 250)) { priv->pshare->iot_mode_BE_exist++; switch_turbo++; diff --git a/hal/odm_RTL8188E.c b/hal/odm_RTL8188E.c index d95285b..2f082bc 100644 --- a/hal/odm_RTL8188E.c +++ b/hal/odm_RTL8188E.c @@ -749,12 +749,12 @@ ODM_AntennaDiversity_88E( } if (pDM_Odm->Adapter->registrypriv.force_ant==1){ ODM_UpdateRxIdleAnt_88E(pDM_Odm, MAIN_ANT); - printk("%s fixed antenna in Main ant\n",__FUNCTION__); + printk("%s fixed antenna in Main ant\n",__func__); return; } else if (pDM_Odm->Adapter->registrypriv.force_ant==2){ ODM_UpdateRxIdleAnt_88E(pDM_Odm, AUX_ANT); - printk("%s fixed antenna in AUX ant\n",__FUNCTION__); + printk("%s fixed antenna in AUX ant\n",__func__); return; } } diff --git a/hal/rtl8188e_cmd.c b/hal/rtl8188e_cmd.c index ee1d17d..b4988a5 100644 --- a/hal/rtl8188e_cmd.c +++ b/hal/rtl8188e_cmd.c @@ -204,7 +204,7 @@ u8 rtl8192c_set_FwSelectSuspend_cmd(_adapter *padapter ,u8 bfwpoll, u16 period) { u8 res=_SUCCESS; struct H2C_SS_RFOFF_PARAM param; - DBG_8192C("==>%s bfwpoll(%x)\n",__FUNCTION__,bfwpoll); + DBG_8192C("==>%s bfwpoll(%x)\n",__func__,bfwpoll); param.gpio_period = period;//Polling GPIO_11 period time param.ROFOn = (_TRUE == bfwpoll)?1:0; FillH2CCmd_88E(padapter, SELECTIVE_SUSPEND_ROF_CMD, sizeof(param), (u8*)(¶m)); @@ -225,7 +225,7 @@ _func_enter_; FillH2CCmd_88E(padapter, RSSI_SETTING_EID, 3, param); #endif }else{ - DBG_8192C("==>%s fw dont support RA\n",__FUNCTION__); + DBG_8192C("==>%s fw dont support RA\n",__func__); res=_FAIL; } @@ -247,7 +247,7 @@ _func_enter_; FillH2CCmd_88E(padapter, H2C_DM_MACID_CFG, 3, buf); }else{ - DBG_8192C("==>%s fw dont support RA\n",__FUNCTION__); + DBG_8192C("==>%s fw dont support RA\n",__func__); res=_FAIL; } @@ -301,7 +301,7 @@ void rtl8188e_Add_RateATid(PADAPTER pAdapter, u32 bitmap, u8 arg, u8 rssi_level) bitmap &= 0x0fffffff; DBG_871X("%s=> mac_id:%d , raid:%d , ra_bitmap=0x%x, shortGIrate=0x%02x\n", - __FUNCTION__,macid ,raid ,bitmap, shortGIrate); + __func__,macid ,raid ,bitmap, shortGIrate); #if (RATE_ADAPTIVE_SUPPORT == 1) @@ -323,7 +323,7 @@ void rtl8188e_set_FwPwrMode_cmd(PADAPTER padapter, u8 Mode) u8 RLBM = 0; // 0:Min, 1:Max , 2:User define _func_enter_; - DBG_871X("%s: Mode=%d SmartPS=%d UAPSD=%d\n", __FUNCTION__, + DBG_871X("%s: Mode=%d SmartPS=%d UAPSD=%d\n", __func__, Mode, pwrpriv->smart_ps, padapter->registrypriv.uapsd_enable); switch (Mode) @@ -381,7 +381,7 @@ void rtl8188e_set_FwMediaStatus_cmd(PADAPTER padapter, u16 mstatus_rpt ) opmode = (u8) mst_rpt; macid = (u8)(mst_rpt >> 8) ; - DBG_871X("### %s: MStatus=%x MACID=%d\n", __FUNCTION__,opmode,macid); + DBG_871X("### %s: MStatus=%x MACID=%d\n", __func__,opmode,macid); FillH2CCmd_88E(padapter, H2C_COM_MEDIA_STATUS_RPT, sizeof(mst_rpt), (u8 *)&mst_rpt); } @@ -396,7 +396,7 @@ void ConstructBeacon(_adapter *padapter, u8 *pframe, u32 *pLength) u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; - //DBG_871X("%s\n", __FUNCTION__); + //DBG_871X("%s\n", __func__); pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -483,7 +483,7 @@ _ConstructBeacon: *pLength = pktlen; - //DBG_871X("%s bcn_sz=%d\n", __FUNCTION__, pktlen); + //DBG_871X("%s bcn_sz=%d\n", __func__, pktlen); } @@ -495,7 +495,7 @@ void ConstructPSPoll(_adapter *padapter, u8 *pframe, u32 *pLength) struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - //DBG_871X("%s\n", __FUNCTION__); + //DBG_871X("%s\n", __func__); pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -536,7 +536,7 @@ void ConstructNullFunctionData( struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - //DBG_871X("%s:%d\n", __FUNCTION__, bForcePowerSave); + //DBG_871X("%s:%d\n", __func__, bForcePowerSave); pwlanhdr = (struct rtw_ieee80211_hdr*)pframe; @@ -601,7 +601,7 @@ void ConstructProbeRsp(_adapter *padapter, u8 *pframe, u32 *pLength, u8 *StaAddr WLAN_BSSID_EX *cur_network = &(pmlmeinfo->network); - //DBG_871X("%s\n", __FUNCTION__); + //DBG_871X("%s\n", __func__); pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; @@ -677,11 +677,11 @@ static void SetFwRsvdPagePkt(PADAPTER padapter, BOOLEAN bDLFinished) RSVDPAGE_LOC RsvdPageLoc; - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); ReservedPagePacket = (u8*)rtw_zmalloc(1000); if (ReservedPagePacket == NULL) { - DBG_871X("%s: alloc ReservedPagePacket fail!\n", __FUNCTION__); + DBG_871X("%s: alloc ReservedPagePacket fail!\n", __func__); return; } @@ -791,7 +791,7 @@ static void SetFwRsvdPagePkt(PADAPTER padapter, BOOLEAN bDLFinished) rtw_hal_mgnt_xmit(padapter, pmgntframe); - DBG_871X("%s: Set RSVD page location to Fw\n", __FUNCTION__); + DBG_871X("%s: Set RSVD page location to Fw\n", __func__); FillH2CCmd_88E(padapter, H2C_COM_RSVD_PAGE, sizeof(RsvdPageLoc), (u8*)&RsvdPageLoc); exit: @@ -811,7 +811,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(PADAPTER padapter, u8 mstatus) _func_enter_; - DBG_871X("%s mstatus(%x)\n", __FUNCTION__,mstatus); + DBG_871X("%s mstatus(%x)\n", __func__,mstatus); if (mstatus == 1) { @@ -871,9 +871,9 @@ _func_enter_; { } else if (!bcn_valid) - DBG_871X("%s: 1 Download RSVD page failed! DLBcnCount:%u, poll:%u\n", __FUNCTION__ ,DLBcnCount, poll); + DBG_871X("%s: 1 Download RSVD page failed! DLBcnCount:%u, poll:%u\n", __func__ ,DLBcnCount, poll); else - DBG_871X("%s: 1 Download RSVD success! DLBcnCount:%u, poll:%u\n", __FUNCTION__, DLBcnCount, poll); + DBG_871X("%s: 1 Download RSVD success! DLBcnCount:%u, poll:%u\n", __func__, DLBcnCount, poll); // // We just can send the reserved page twice during the time that Tx thread is stopped (e.g. pnpsetpower) // becuase we need to free the Tx BCN Desc which is used by the first reserved page packet. @@ -908,9 +908,9 @@ _func_enter_; { } else if (!bcn_valid) - DBG_871X("%s: 2 Download RSVD page failed! DLBcnCount:%u, poll:%u\n", __FUNCTION__ ,DLBcnCount, poll); + DBG_871X("%s: 2 Download RSVD page failed! DLBcnCount:%u, poll:%u\n", __func__ ,DLBcnCount, poll); else - DBG_871X("%s: 2 Download RSVD success! DLBcnCount:%u, poll:%u\n", __FUNCTION__, DLBcnCount, poll); + DBG_871X("%s: 2 Download RSVD success! DLBcnCount:%u, poll:%u\n", __func__, DLBcnCount, poll); } } @@ -1000,16 +1000,16 @@ _func_enter_; p2p_ps_offload->NoA1_En = 1; // config P2P NoA Descriptor Register - //DBG_8192C("%s(): noa_duration = %x\n",__FUNCTION__,pwdinfo->noa_duration[i]); + //DBG_8192C("%s(): noa_duration = %x\n",__func__,pwdinfo->noa_duration[i]); rtw_write32(padapter, REG_NOA_DESC_DURATION, pwdinfo->noa_duration[i]); - //DBG_8192C("%s(): noa_interval = %x\n",__FUNCTION__,pwdinfo->noa_interval[i]); + //DBG_8192C("%s(): noa_interval = %x\n",__func__,pwdinfo->noa_interval[i]); rtw_write32(padapter, REG_NOA_DESC_INTERVAL, pwdinfo->noa_interval[i]); - //DBG_8192C("%s(): start_time = %x\n",__FUNCTION__,pwdinfo->noa_start_time[i]); + //DBG_8192C("%s(): start_time = %x\n",__func__,pwdinfo->noa_start_time[i]); rtw_write32(padapter, REG_NOA_DESC_START, pwdinfo->noa_start_time[i]); - //DBG_8192C("%s(): noa_count = %x\n",__FUNCTION__,pwdinfo->noa_count[i]); + //DBG_8192C("%s(): noa_count = %x\n",__func__,pwdinfo->noa_count[i]); rtw_write8(padapter, REG_NOA_DESC_COUNT, pwdinfo->noa_count[i]); } @@ -1129,21 +1129,21 @@ _func_enter_; if (pwrpriv->wowlan_pattern ==_TRUE){ pwowlan_parm.mode |= FW_WOWLAN_PATTERN_MATCH; - DBG_871X_LEVEL(_drv_info_, "%s 2.pwowlan_parm.mode=0x%x\n",__FUNCTION__,pwowlan_parm.mode ); + DBG_871X_LEVEL(_drv_info_, "%s 2.pwowlan_parm.mode=0x%x\n",__func__,pwowlan_parm.mode ); } if (pwrpriv->wowlan_magic ==_TRUE){ pwowlan_parm.mode |=FW_WOWLAN_MAGIC_PKT; - DBG_871X_LEVEL(_drv_info_, "%s 3.pwowlan_parm.mode=0x%x\n",__FUNCTION__,pwowlan_parm.mode ); + DBG_871X_LEVEL(_drv_info_, "%s 3.pwowlan_parm.mode=0x%x\n",__func__,pwowlan_parm.mode ); } if (pwrpriv->wowlan_unicast ==_TRUE){ pwowlan_parm.mode |=FW_WOWLAN_UNICAST; - DBG_871X_LEVEL(_drv_info_, "%s 4.pwowlan_parm.mode=0x%x\n",__FUNCTION__,pwowlan_parm.mode ); + DBG_871X_LEVEL(_drv_info_, "%s 4.pwowlan_parm.mode=0x%x\n",__func__,pwowlan_parm.mode ); } if (!(padapter->pwrctrlpriv.wowlan_wake_reason & FWDecisionDisconnect)) rtl8188e_set_FwJoinBssReport_cmd(padapter, 1); else - DBG_871X_LEVEL(_drv_always_, "%s, disconnected, no FwJoinBssReport\n",__FUNCTION__); + DBG_871X_LEVEL(_drv_always_, "%s, disconnected, no FwJoinBssReport\n",__func__); rtw_msleep_os(2); //WOWLAN_GPIO_ACTIVE means GPIO high active @@ -1160,8 +1160,8 @@ _func_enter_; pwowlan_parm.gpio_index=0x80; #endif //CONFIG_SDIO_HCI - DBG_871X_LEVEL(_drv_info_, "%s 5.pwowlan_parm.mode=0x%x\n",__FUNCTION__,pwowlan_parm.mode); - DBG_871X_LEVEL(_drv_info_, "%s 6.pwowlan_parm.index=0x%x\n",__FUNCTION__,pwowlan_parm.gpio_index); + DBG_871X_LEVEL(_drv_info_, "%s 5.pwowlan_parm.mode=0x%x\n",__func__,pwowlan_parm.mode); + DBG_871X_LEVEL(_drv_info_, "%s 6.pwowlan_parm.index=0x%x\n",__func__,pwowlan_parm.gpio_index); res = FillH2CCmd_88E(padapter, H2C_COM_WWLAN, 2, (u8 *)&pwowlan_parm); rtw_msleep_os(2); diff --git a/hal/rtl8188e_dm.c b/hal/rtl8188e_dm.c index 53a21e8..032715e 100644 --- a/hal/rtl8188e_dm.c +++ b/hal/rtl8188e_dm.c @@ -200,7 +200,7 @@ dm_InterruptMigration( //Update current settings. if ( bCurrentIntMt != IntMtToSet ){ - DBG_8192C("%s(): Update interrrupt migration(%d)\n",__FUNCTION__,IntMtToSet); + DBG_8192C("%s(): Update interrrupt migration(%d)\n",__func__,IntMtToSet); if (IntMtToSet) { // @@ -220,7 +220,7 @@ dm_InterruptMigration( } /*if ( bCurrentACIntDisable != ACIntToSet ){ - DBG_8192C("%s(): Update AC interrrupt(%d)\n",__FUNCTION__,ACIntToSet); + DBG_8192C("%s(): Update AC interrrupt(%d)\n",__func__,ACIntToSet); if (ACIntToSet) // Disable four ACs interrupts. { // @@ -644,7 +644,7 @@ u8 AntDivBeforeLink8188E(PADAPTER Adapter ) //PHY_SetBBReg(Adapter, rFPGA0_XA_RFInterfaceOE, 0x300, pDM_SWAT_Table->CurAntenna); rtw_antenna_select_cmd(Adapter, pDM_SWAT_Table->CurAntenna, _FALSE); - //DBG_8192C("%s change antenna to ANT_( %s ).....\n",__FUNCTION__, (pDM_SWAT_Table->CurAntenna==Antenna_A)?"A":"B"); + //DBG_8192C("%s change antenna to ANT_( %s ).....\n",__func__, (pDM_SWAT_Table->CurAntenna==Antenna_A)?"A":"B"); return _TRUE; } else diff --git a/hal/rtl8188e_hal_init.c b/hal/rtl8188e_hal_init.c index 0af531b..02cbb54 100644 --- a/hal/rtl8188e_hal_init.c +++ b/hal/rtl8188e_hal_init.c @@ -39,7 +39,7 @@ static void iol_mode_enable(PADAPTER padapter, u8 enable) { //Enable initial offload reg_0xf0 = rtw_read8(padapter, REG_SYS_CFG); - //DBG_871X("%s reg_0xf0:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0xf0, reg_0xf0|SW_OFFLOAD_EN); + //DBG_871X("%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); if (padapter->bFWReady == _FALSE) @@ -53,7 +53,7 @@ static void iol_mode_enable(PADAPTER padapter, u8 enable) { //disable initial offload reg_0xf0 = rtw_read8(padapter, REG_SYS_CFG); - //DBG_871X("%s reg_0xf0:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0xf0, reg_0xf0& ~SW_OFFLOAD_EN); + //DBG_871X("%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); } } @@ -67,7 +67,7 @@ static s32 iol_execute(PADAPTER padapter, u8 control) u32 t1,t2; control = control&0x0f; reg_0x88 = rtw_read8(padapter, REG_HMEBOX_E0); - //DBG_871X("%s reg_0x88:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0x88, reg_0x88|control); + //DBG_871X("%s reg_0x88:0x%02x, write 0x%02x\n", __func__, reg_0x88, reg_0x88|control); rtw_write8(padapter, REG_HMEBOX_E0, reg_0x88|control); t1 = start = rtw_get_current_time(); @@ -76,7 +76,7 @@ static s32 iol_execute(PADAPTER padapter, u8 control) (reg_0x88=rtw_read8(padapter, REG_HMEBOX_E0)) & control && (passing_time=rtw_get_passing_time_ms(start))<1000 ) { - //DBG_871X("%s polling reg_0x88:0x%02x,reg_0x1c7:0x%02x\n", __FUNCTION__, reg_0x88,rtw_read8(padapter, 0x1c7) ); + //DBG_871X("%s polling reg_0x88:0x%02x,reg_0x1c7:0x%02x\n", __func__, reg_0x88,rtw_read8(padapter, 0x1c7) ); //rtw_udelay_os(100); } @@ -86,7 +86,7 @@ static s32 iol_execute(PADAPTER padapter, u8 control) status = _FAIL; t2= rtw_get_current_time(); //printk("==> step iol_execute : %5u reg-0x1c0= 0x%02x\n",rtw_get_time_interval_ms(t1,t2),rtw_read8(padapter, 0x1c0)); - //DBG_871X("%s in %u ms, reg_0x88:0x%02x\n", __FUNCTION__, passing_time, reg_0x88); + //DBG_871X("%s in %u ms, reg_0x88:0x%02x\n", __func__, passing_time, reg_0x88); return status; } @@ -98,7 +98,7 @@ static s32 iol_InitLLTTable( { s32 rst = _SUCCESS; iol_mode_enable(padapter, 1); - //DBG_871X("%s txpktbuf_bndy:%u\n", __FUNCTION__, txpktbuf_bndy); + //DBG_871X("%s txpktbuf_bndy:%u\n", __func__, txpktbuf_bndy); rtw_write8(padapter, REG_TDECTRL+1, txpktbuf_bndy); rst = iol_execute(padapter, CMD_INIT_LLT); iol_mode_enable(padapter, 0); @@ -122,14 +122,14 @@ efuse_phymap_to_logical(u8 * phymap, u16 _offset, u16 _size_byte, u8 *pbuf) efuseTbl = (u8*)rtw_zmalloc(EFUSE_MAP_LEN_88E); if (efuseTbl == NULL) { - DBG_871X("%s: alloc efuseTbl fail!\n", __FUNCTION__); + DBG_871X("%s: alloc efuseTbl fail!\n", __func__); goto exit; } eFuseWord= (u16 **)rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(u16)); if (eFuseWord == NULL) { - DBG_871X("%s: alloc eFuseWord fail!\n", __FUNCTION__); + DBG_871X("%s: alloc eFuseWord fail!\n", __func__); goto exit; } @@ -304,28 +304,28 @@ void efuse_read_phymap_from_txpktbuf( if (bcnhead<0) //if not valid bcnhead = rtw_read8(adapter, REG_TDECTRL+1); - DBG_871X("%s bcnhead:%d\n", __FUNCTION__, bcnhead); + DBG_871X("%s bcnhead:%d\n", __func__, bcnhead); //reg_0x106 = rtw_read8(adapter, REG_PKT_BUFF_ACCESS_CTRL); - //DBG_871X("%s reg_0x106:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0x106, 0x69); + //DBG_871X("%s reg_0x106:0x%02x, write 0x%02x\n", __func__, reg_0x106, 0x69); rtw_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT); - //DBG_871X("%s reg_0x106:0x%02x\n", __FUNCTION__, rtw_read8(adapter, 0x106)); + //DBG_871X("%s reg_0x106:0x%02x\n", __func__, rtw_read8(adapter, 0x106)); dbg_addr = bcnhead*128/8; //8-bytes addressing while (1) { - //DBG_871X("%s dbg_addr:0x%x\n", __FUNCTION__, dbg_addr+i); + //DBG_871X("%s dbg_addr:0x%x\n", __func__, dbg_addr+i); rtw_write16(adapter, REG_PKTBUF_DBG_ADDR, dbg_addr+i); - //DBG_871X("%s write reg_0x143:0x00\n", __FUNCTION__); + //DBG_871X("%s write reg_0x143:0x00\n", __func__); rtw_write8(adapter, REG_TXPKTBUF_DBG, 0); start = rtw_get_current_time(); while (!(reg_0x143=rtw_read8(adapter, REG_TXPKTBUF_DBG))//dbg //while (rtw_read8(adapter, REG_TXPKTBUF_DBG) & BIT0 && (passing_time=rtw_get_passing_time_ms(start))<1000 ) { - DBG_871X("%s polling reg_0x143:0x%02x, reg_0x106:0x%02x\n", __FUNCTION__, reg_0x143, rtw_read8(adapter, 0x106)); + DBG_871X("%s polling reg_0x143:0x%02x, reg_0x106:0x%02x\n", __func__, reg_0x143, rtw_read8(adapter, 0x106)); rtw_usleep_os(100); } @@ -334,13 +334,13 @@ void efuse_read_phymap_from_txpktbuf( hi32 = rtw_read32(adapter, REG_PKTBUF_DBG_DATA_H); #if 0 - DBG_871X("%s lo32:0x%08x, %02x %02x %02x %02x\n", __FUNCTION__, lo32 + DBG_871X("%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+1) , rtw_read8(adapter, REG_PKTBUF_DBG_DATA_L+2) , rtw_read8(adapter, REG_PKTBUF_DBG_DATA_L+3) ); - DBG_871X("%s hi32:0x%08x, %02x %02x %02x %02x\n", __FUNCTION__, hi32 + DBG_871X("%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+1) , rtw_read8(adapter, REG_PKTBUF_DBG_DATA_H+2) @@ -365,7 +365,7 @@ void efuse_read_phymap_from_txpktbuf( limit = (len-2=count+2)?2:limit-count); count+= (limit>=count+2)?2:limit-count; @@ -395,7 +395,7 @@ void efuse_read_phymap_from_txpktbuf( rtw_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, DISABLE_TRXPKT_BUF_ACCESS); - DBG_871X("%s read count:%u\n", __FUNCTION__, count); + DBG_871X("%s read count:%u\n", __func__, count); *size = count; } @@ -420,9 +420,9 @@ static s32 iol_read_efuse( _rtw_memset(physical_map, 0xFF, 512); ///reg_0x106 = rtw_read8(padapter, REG_PKT_BUFF_ACCESS_CTRL); - //DBG_871X("%s reg_0x106:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0x106, 0x69); + //DBG_871X("%s reg_0x106:0x%02x, write 0x%02x\n", __func__, reg_0x106, 0x69); rtw_write8(padapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT); - //DBG_871X("%s reg_0x106:0x%02x\n", __FUNCTION__, rtw_read8(padapter, 0x106)); + //DBG_871X("%s reg_0x106:0x%02x\n", __func__, rtw_read8(padapter, 0x106)); status = iol_execute(padapter, CMD_READ_EFUSE_MAP); @@ -430,7 +430,7 @@ static s32 iol_read_efuse( efuse_read_phymap_from_txpktbuf(padapter, txpktbuf_bndy, physical_map, &size); #if 0 - DBG_871X("%s physical map\n", __FUNCTION__); + DBG_871X("%s physical map\n", __func__); for (i=0;i %s\n",__FUNCTION__); + printk("==> %s\n",__func__); if (rtw_IOL_applied(padapter)){ iol_mode_enable(padapter, 1); @@ -468,7 +468,7 @@ static s32 iol_ioconfig( { s32 rst = _SUCCESS; - //DBG_871X("%s iocfg_bndy:%u\n", __FUNCTION__, iocfg_bndy); + //DBG_871X("%s iocfg_bndy:%u\n", __func__, iocfg_bndy); rtw_write8(padapter, REG_TDECTRL+1, iocfg_bndy); rst = iol_execute(padapter, CMD_IOCONFIG); @@ -484,7 +484,7 @@ int rtl8188e_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, int ret = _FAIL; u32 t1,t2; - //printk("===> %s ,bndy_cnt = %d\n",__FUNCTION__,bndy_cnt); + //printk("===> %s ,bndy_cnt = %d\n",__func__,bndy_cnt); if (rtw_IOL_append_END_cmd(xmit_frame) != _SUCCESS) goto exit; #ifdef CONFIG_USB_HCI @@ -517,7 +517,7 @@ int rtl8188e_IOL_exec_cmds_sync(ADAPTER *adapter, struct xmit_frame *xmit_frame, } iol_mode_enable(adapter, 0); t2 = rtw_get_current_time(); - //printk("==> %s : %5u\n",__FUNCTION__,rtw_get_time_interval_ms(t1,t2)); + //printk("==> %s : %5u\n",__func__,rtw_get_time_interval_ms(t1,t2)); exit: //restore BCN_HEAD rtw_write8(adapter, REG_TDECTRL+1, 0); @@ -531,7 +531,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(ADAPTER *Adapter,int data_len) u16 data_cnts = (data_len/8)+1; u8 *pbuf =rtw_zvmalloc(data_len+10); - printk("###### %s ######\n",__FUNCTION__); + printk("###### %s ######\n",__func__); rtw_write8(Adapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT); if (pbuf){ @@ -560,7 +560,7 @@ void rtw_IOL_cmd_tx_pkt_buf_dump(ADAPTER *Adapter,int data_len) rtw_vmfree(pbuf, data_len+10); } - printk("###### %s ######\n",__FUNCTION__); + printk("###### %s ######\n",__func__); } #endif /* defined(CONFIG_IOL) */ @@ -816,10 +816,10 @@ static s32 _FWFreeToGo(PADAPTER padapter) } while (counter++ < POLLING_READY_TIMEOUT_COUNT); if (counter >= POLLING_READY_TIMEOUT_COUNT) { - DBG_871X("%s: chksum report fail! REG_MCUFWDL:0x%08x\n", __FUNCTION__, value32); + DBG_871X("%s: chksum report fail! REG_MCUFWDL:0x%08x\n", __func__, value32); return _FAIL; } - DBG_871X("%s: Checksum report OK! REG_MCUFWDL:0x%08x\n", __FUNCTION__, value32); + DBG_871X("%s: Checksum report OK! REG_MCUFWDL:0x%08x\n", __func__, value32); value32 = rtw_read32(padapter, REG_MCUFWDL); @@ -834,13 +834,13 @@ static s32 _FWFreeToGo(PADAPTER padapter) do { value32 = rtw_read32(padapter, REG_MCUFWDL); if (value32 & WINTINI_RDY) { - DBG_871X("%s: Polling FW ready success!! REG_MCUFWDL:0x%08x\n", __FUNCTION__, value32); + DBG_871X("%s: Polling FW ready success!! REG_MCUFWDL:0x%08x\n", __func__, value32); return _SUCCESS; } rtw_udelay_os(5); } while (counter++ < POLLING_READY_TIMEOUT_COUNT); - DBG_871X ("%s: Polling FW ready fail!! REG_MCUFWDL:0x%08x\n", __FUNCTION__, value32); + DBG_871X ("%s: Polling FW ready fail!! REG_MCUFWDL:0x%08x\n", __func__, value32); return _FAIL; } @@ -881,7 +881,7 @@ s32 rtl8188e_FirmwareDownload(PADAPTER padapter) u32 FirmwareLen; - RT_TRACE(_module_hal_init_c_, _drv_info_, ("+%s\n", __FUNCTION__)); + RT_TRACE(_module_hal_init_c_, _drv_info_, ("+%s\n", __func__)); pFirmware = (PRT_FIRMWARE_8188E)rtw_zmalloc(sizeof(RT_FIRMWARE_8188E)); if (!pFirmware) { @@ -903,7 +903,7 @@ s32 rtl8188e_FirmwareDownload(PADAPTER padapter) #ifdef CONFIG_FILE_FWIMG if (rtw_is_file_readable(rtw_fw_file_path) == _TRUE) { - DBG_871X("%s accquire FW from file:%s\n", __FUNCTION__, rtw_fw_file_path); + DBG_871X("%s accquire FW from file:%s\n", __func__, rtw_fw_file_path); pFirmware->eFWSource = FW_SOURCE_IMG_FILE; } else @@ -959,7 +959,7 @@ s32 rtl8188e_FirmwareDownload(PADAPTER padapter) pHalData->FirmwareSignature = le16_to_cpu(pFwHdr->Signature); DBG_871X ("%s: fw_ver=%d fw_subver=%d sig=0x%x\n", - __FUNCTION__, pHalData->FirmwareVersion, pHalData->FirmwareSubVersion, pHalData->FirmwareSignature); + __func__, pHalData->FirmwareVersion, pHalData->FirmwareSubVersion, pHalData->FirmwareSignature); if (IS_FW_HEADER_EXIST(pFwHdr)) { @@ -989,7 +989,7 @@ s32 rtl8188e_FirmwareDownload(PADAPTER padapter) ) break; - DBG_871X("%s writeFW_retry:%u, time after fwdl_start_time:%ums\n", __FUNCTION__ + DBG_871X("%s writeFW_retry:%u, time after fwdl_start_time:%ums\n", __func__ , writeFW_retry , rtw_get_passing_time_ms(fwdl_start_time) ); @@ -1267,14 +1267,14 @@ Hal_EfuseReadEFuse88E( efuseTbl = (u8*)rtw_zmalloc(EFUSE_MAP_LEN_88E); if (efuseTbl == NULL) { - DBG_871X("%s: alloc efuseTbl fail!\n", __FUNCTION__); + DBG_871X("%s: alloc efuseTbl fail!\n", __func__); goto exit; } eFuseWord= (u16 **)rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(u16)); if (eFuseWord == NULL) { - DBG_871X("%s: alloc eFuseWord fail!\n", __FUNCTION__); + DBG_871X("%s: alloc eFuseWord fail!\n", __func__); goto exit; } @@ -1524,7 +1524,7 @@ exit: if (_rtw_memcmp(logical_map, Adapter->eeprompriv.efuse_eeprom_data, 0x130) == _FALSE) { int i; - DBG_871X("%s compare first 0x130 byte fail\n", __FUNCTION__); + DBG_871X("%s compare first 0x130 byte fail\n", __func__); for (i=0;i<512;i++) { if (i%16==0) @@ -2840,7 +2840,7 @@ void rtl8188e_start_thread(_adapter *padapter) pHalData->SdioXmitThread = kthread_run(rtl8188es_xmit_thread, padapter, "RTWHALXT"); if (IS_ERR(pHalData->SdioXmitThread)) { - RT_TRACE(_module_hal_xmit_c_, _drv_err_, ("%s: start rtl8188es_xmit_thread FAIL!!\n", __FUNCTION__)); + RT_TRACE(_module_hal_xmit_c_, _drv_err_, ("%s: start rtl8188es_xmit_thread FAIL!!\n", __func__)); } #endif #endif @@ -3401,7 +3401,7 @@ void Hal_ReadPowerSavingMode88E( //if (SUPPORT_HW_RADIO_DETECT(Adapter)) //Adapter->registrypriv.usbss_enable = Adapter->pwrctrlpriv.bSupportRemoteWakeup ; - DBG_8192C("%s...bHWPwrPindetect(%x)-bHWPowerdown(%x) ,bSupportRemoteWakeup(%x)\n",__FUNCTION__, + DBG_8192C("%s...bHWPwrPindetect(%x)-bHWPowerdown(%x) ,bSupportRemoteWakeup(%x)\n",__func__, padapter->pwrctrlpriv.bHWPwrPindetect,padapter->pwrctrlpriv.bHWPowerdown ,padapter->pwrctrlpriv.bSupportRemoteWakeup); DBG_8192C("### PS params=> power_mgnt(%x),usbss_enable(%x) ###\n",padapter->registrypriv.power_mgnt,padapter->registrypriv.usbss_enable); diff --git a/hal/rtl8188e_phycfg.c b/hal/rtl8188e_phycfg.c index 82dfe65..3eb55d3 100644 --- a/hal/rtl8188e_phycfg.c +++ b/hal/rtl8188e_phycfg.c @@ -2942,7 +2942,7 @@ static void _PHY_SwChnl8192C(PADAPTER Adapter, u8 channel) if ( Adapter->bNotifyChannelChange ) { - DBG_871X( "[%s] ch = %d\n", __FUNCTION__, channel ); + DBG_871X( "[%s] ch = %d\n", __func__, channel ); } //s1. pre common command - CmdID_SetTxPowerLevel diff --git a/hal/rtl8188e_rxdesc.c b/hal/rtl8188e_rxdesc.c index b4560e2..3e76b69 100644 --- a/hal/rtl8188e_rxdesc.c +++ b/hal/rtl8188e_rxdesc.c @@ -314,7 +314,7 @@ void update_recvframe_phyinfo_88e( if (psta) { pkt_info.StationID = psta->mac_id; - //DBG_8192C("%s ==> StationID(%d)\n",__FUNCTION__,pkt_info.StationID); + //DBG_8192C("%s ==> StationID(%d)\n",__func__,pkt_info.StationID); } pkt_info.Rate = pattrib->mcs_rate; //rtl8188e_query_rx_phy_status(precvframe, pphy_status); diff --git a/hal/rtl8188e_sreset.c b/hal/rtl8188e_sreset.c index 927c84d..4e4c606 100644 --- a/hal/rtl8188e_sreset.c +++ b/hal/rtl8188e_sreset.c @@ -142,7 +142,7 @@ void rtl8188e_silentreset_for_specific_platform(_adapter *padapter) #ifdef DBG_CONFIG_ERROR_RESET - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; @@ -189,13 +189,13 @@ void rtl8188e_sreset_xmit_status_check(_adapter *padapter) u32 txdma_status; if ( (txdma_status=rtw_read32(padapter, REG_TXDMA_STATUS)) !=0x00){ - DBG_871X("%s REG_TXDMA_STATUS:0x%08x\n", __FUNCTION__, txdma_status); + DBG_871X("%s REG_TXDMA_STATUS:0x%08x\n", __func__, txdma_status); rtw_write32(padapter,REG_TXDMA_STATUS,txdma_status); rtl8188e_silentreset_for_specific_platform(padapter); } #ifdef CONFIG_USB_HCI //total xmit irp = 4 - //DBG_8192C("==>%s free_xmitbuf_cnt(%d),txirp_cnt(%d)\n",__FUNCTION__,pxmitpriv->free_xmitbuf_cnt,pxmitpriv->txirp_cnt); + //DBG_8192C("==>%s free_xmitbuf_cnt(%d),txirp_cnt(%d)\n",__func__,pxmitpriv->free_xmitbuf_cnt,pxmitpriv->txirp_cnt); //if (pxmitpriv->txirp_cnt == NR_XMITBUFF+1) current_time = rtw_get_current_time(); if (0==pxmitpriv->free_xmitbuf_cnt) @@ -210,7 +210,7 @@ void rtl8188e_sreset_xmit_status_check(_adapter *padapter) diff_time = jiffies_to_msecs(current_time - psrtpriv->last_tx_complete_time); if (diff_time > 4000){ //padapter->Wifi_Error_Status = WIFI_TX_HANG; - DBG_8192C("%s tx hang\n", __FUNCTION__); + DBG_8192C("%s tx hang\n", __func__); rtl8188e_silentreset_for_specific_platform(padapter); } } @@ -225,16 +225,16 @@ void rtl8188e_sreset_linked_status_check(_adapter *padapter) u8 fw_status=0; rx_dma_status = rtw_read32(padapter,REG_RXDMA_STATUS); if (rx_dma_status!= 0x00){ - DBG_8192C("%s REG_RXDMA_STATUS:0x%08x\n",__FUNCTION__,rx_dma_status); + DBG_8192C("%s REG_RXDMA_STATUS:0x%08x\n",__func__,rx_dma_status); rtw_write32(padapter,REG_RXDMA_STATUS,rx_dma_status); } fw_status = rtw_read8(padapter,REG_FMETHR); if (fw_status != 0x00) { if (fw_status == 1) - DBG_8192C("%s REG_FW_STATUS (0x%02x), Read_Efuse_Fail !! \n",__FUNCTION__,fw_status); + DBG_8192C("%s REG_FW_STATUS (0x%02x), Read_Efuse_Fail !! \n",__func__,fw_status); else if (fw_status == 2) - DBG_8192C("%s REG_FW_STATUS (0x%02x), Condition_No_Match !! \n",__FUNCTION__,fw_status); + DBG_8192C("%s REG_FW_STATUS (0x%02x), Condition_No_Match !! \n",__func__,fw_status); } #if 0 u32 regc50,regc58,reg824,reg800; @@ -247,7 +247,7 @@ void rtl8188e_sreset_linked_status_check(_adapter *padapter) (((reg824&0xFFFFFF00)!= 0x00390000)&&(((reg824&0xFFFFFF00)!= 0x80390000)))|| ( ((reg800&0xFFFFFF00)!= 0x03040000)&&((reg800&0xFFFFFF00)!= 0x83040000))) { - DBG_8192C("%s regc50:0x%08x, regc58:0x%08x, reg824:0x%08x, reg800:0x%08x,\n", __FUNCTION__, + DBG_8192C("%s regc50:0x%08x, regc58:0x%08x, reg824:0x%08x, reg800:0x%08x,\n", __func__, regc50, regc58, reg824, reg800); rtl8188e_silentreset_for_specific_platform(padapter); } diff --git a/hal/rtl8188e_xmit.c b/hal/rtl8188e_xmit.c index 5c4fa9a..7324226 100644 --- a/hal/rtl8188e_xmit.c +++ b/hal/rtl8188e_xmit.c @@ -145,9 +145,9 @@ InsertEMContent_8188E( #ifdef DBG_EMINFO { int i; - DBG_8192C("\n%s ==> pEMInfo->EMPktNum =%d\n",__FUNCTION__,pEMInfo->EMPktNum); + DBG_8192C("\n%s ==> pEMInfo->EMPktNum =%d\n",__func__,pEMInfo->EMPktNum); for (i=0;i< EARLY_MODE_MAX_PKT_NUM;i++){ - DBG_8192C("%s ==> pEMInfo->EMPktLen[%d] =%d\n",__FUNCTION__,i,pEMInfo->EMPktLen[i]); + DBG_8192C("%s ==> pEMInfo->EMPktLen[%d] =%d\n",__func__,i,pEMInfo->EMPktLen[i]); } } @@ -227,12 +227,12 @@ void UpdateEarlyModeInfo8188E(struct xmit_priv *pxmitpriv,struct xmit_buf *pxmit pmem= pframe->buf_addr; #ifdef DBG_EMINFO - DBG_8192C("\n%s ==> agg_num:%d\n",__FUNCTION__, pframe->agg_num); + DBG_8192C("\n%s ==> agg_num:%d\n",__func__, pframe->agg_num); for (index=0;indexagg_num;index++){ offset = pxmitpriv->agg_pkt[index].offset; pktlen = pxmitpriv->agg_pkt[index].pkt_len; - DBG_8192C("%s ==> agg_pkt[%d].offset=%d\n",__FUNCTION__,index,offset); - DBG_8192C("%s ==> agg_pkt[%d].pkt_len=%d\n",__FUNCTION__,index,pktlen); + DBG_8192C("%s ==> agg_pkt[%d].offset=%d\n",__func__,index,offset); + DBG_8192C("%s ==> agg_pkt[%d].pkt_len=%d\n",__func__,index,pktlen); } #endif @@ -277,7 +277,7 @@ void UpdateEarlyModeInfo8188E(struct xmit_priv *pxmitpriv,struct xmit_buf *pxmit } #ifdef DBG_EMINFO - DBG_8192C("%s ==> desc.pkt_len=%d\n",__FUNCTION__,ptxdesc->pktlen); + DBG_8192C("%s ==> desc.pkt_len=%d\n",__func__,ptxdesc->pktlen); #endif InsertEMContent_8188E(&eminfo,pEMInfo_mem); } diff --git a/hal/rtl8188eu_xmit.c b/hal/rtl8188eu_xmit.c index 4e016ce..1f0bb43 100644 --- a/hal/rtl8188eu_xmit.c +++ b/hal/rtl8188eu_xmit.c @@ -291,7 +291,7 @@ if (padapter->registrypriv.mp_mode == 0) //4 offset 0 ptxdesc->txdw0 |= cpu_to_le32(OWN | FSG | LSG); - //DBG_8192C("%s==> pkt_len=%d,bagg_pkt=%02x\n",__FUNCTION__,sz,bagg_pkt); + //DBG_8192C("%s==> pkt_len=%d,bagg_pkt=%02x\n",__func__,sz,bagg_pkt); ptxdesc->txdw0 |= cpu_to_le32(sz & 0x0000ffff);//update TXPKTSIZE offset = TXDESC_SIZE + OFFSET_SZ; @@ -301,7 +301,7 @@ if (padapter->registrypriv.mp_mode == 0) offset += EARLY_MODE_INFO_SIZE ;//0x28 } #endif - //DBG_8192C("%s==>offset(0x%02x) \n",__FUNCTION__,offset); + //DBG_8192C("%s==>offset(0x%02x) \n",__func__,offset); ptxdesc->txdw0 |= cpu_to_le32(((offset) << OFFSET_SHT) & 0x00ff0000);//32 bytes for TX Desc if (bmcst) ptxdesc->txdw0 |= cpu_to_le32(BMC); @@ -316,7 +316,7 @@ if (padapter->registrypriv.mp_mode == 0) } } #endif - //DBG_8192C("%s, pkt_offset=0x%02x\n",__FUNCTION__,pxmitframe->pkt_offset); + //DBG_8192C("%s, pkt_offset=0x%02x\n",__func__,pxmitframe->pkt_offset); // pkt_offset, unit:8 bytes padding if (pxmitframe->pkt_offset > 0) @@ -368,7 +368,7 @@ if (padapter->registrypriv.mp_mode == 0) //offset 20 #ifdef CONFIG_USB_TX_AGGREGATION if (pxmitframe->agg_num > 1){ - //DBG_8192C("%s agg_num:%d\n",__FUNCTION__,pxmitframe->agg_num ); + //DBG_8192C("%s agg_num:%d\n",__func__,pxmitframe->agg_num ); ptxdesc->txdw5 |= cpu_to_le32((pxmitframe->agg_num << USB_TXAGG_NUM_SHT) & 0xFF000000); } #endif @@ -484,7 +484,7 @@ if (padapter->registrypriv.mp_mode == 0) #ifdef CONFIG_INTEL_PROXIM if ((padapter->proximity.proxim_on==_TRUE)&&(pattrib->intel_proxim==_TRUE)){ - DBG_871X("\n %s pattrib->rate=%d\n",__FUNCTION__,pattrib->rate); + DBG_871X("\n %s pattrib->rate=%d\n",__func__,pattrib->rate); ptxdesc->txdw5 |= cpu_to_le32( pattrib->rate); } else @@ -574,7 +574,7 @@ s32 rtl8188eu_xmit_buf_handler(PADAPTER padapter) ret = _rtw_down_sema(&pxmitpriv->xmit_sema); if (_FAIL == ret) { RT_TRACE(_module_hal_xmit_c_, _drv_emerg_, - ("%s: down SdioXmitBufSema fail!\n", __FUNCTION__)); + ("%s: down SdioXmitBufSema fail!\n", __func__)); return _FAIL; } @@ -582,7 +582,7 @@ s32 rtl8188eu_xmit_buf_handler(PADAPTER padapter) if (ret) { RT_TRACE(_module_hal_xmit_c_, _drv_notice_, ("%s: bDriverStopped(%d) bSurpriseRemoved(%d)!\n", - __FUNCTION__, padapter->bDriverStopped, padapter->bSurpriseRemoved)); + __func__, padapter->bDriverStopped, padapter->bSurpriseRemoved)); return _FAIL; } @@ -593,7 +593,7 @@ s32 rtl8188eu_xmit_buf_handler(PADAPTER padapter) ret = rtw_register_tx_alive(padapter); if (ret != _SUCCESS) { RT_TRACE(_module_hal_xmit_c_, _drv_notice_, - ("%s: wait to leave LPS_LCLK\n", __FUNCTION__)); + ("%s: wait to leave LPS_LCLK\n", __func__)); return _SUCCESS; } #endif @@ -763,12 +763,12 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv if (pxmitbuf == NULL) { pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv); if (pxmitbuf == NULL){ - //DBG_871X("%s #1, connot alloc xmitbuf!!!!\n",__FUNCTION__); + //DBG_871X("%s #1, connot alloc xmitbuf!!!!\n",__func__); return _FALSE; } } -//DBG_8192C("%s =====================================\n",__FUNCTION__); +//DBG_8192C("%s =====================================\n",__func__); //3 1. pick up first frame do { rtw_free_xmitframe(pxmitpriv, pxmitframe); @@ -898,7 +898,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/2))//to do : for TX TP finial tune , Georgia 2012-0323 { - //DBG_8192C("%s....len> MAX_XMITBUF_SZ\n",__FUNCTION__); + //DBG_8192C("%s....len> MAX_XMITBUF_SZ\n",__func__); pxmitframe->agg_num = 1; pxmitframe->pkt_offset = 1; break; @@ -936,7 +936,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv #else res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe); if (res == _FALSE) { - DBG_871X("%s coalesce failed\n",__FUNCTION__); + DBG_871X("%s coalesce failed\n",__func__); rtw_free_xmitframe(pxmitpriv, pxmitframe); continue; } @@ -1011,7 +1011,7 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv //3 4. write xmit buffer to USB FIFO ff_hwaddr = rtw_get_ff_hwaddr(pfirstframe); -//DBG_8192C("%s ===================================== write port,buf_size(%d)\n",__FUNCTION__,pbuf_tail); +//DBG_8192C("%s ===================================== write port,buf_size(%d)\n",__func__,pbuf_tail); // xmit address == ((xmit_frame*)pxmitbuf->priv_data)->buf_addr rtw_write_port(padapter, ff_hwaddr, pbuf_tail, (u8*)pxmitbuf); @@ -1112,14 +1112,14 @@ s32 rtl8188eu_xmitframe_complete(_adapter *padapter, struct xmit_priv *pxmitpriv static s32 xmitframe_direct(_adapter *padapter, struct xmit_frame *pxmitframe) { s32 res = _SUCCESS; -//DBG_8192C("==> %s\n",__FUNCTION__); +//DBG_8192C("==> %s\n",__func__); res = rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe); if (res == _SUCCESS) { rtw_dump_xframe(padapter, pxmitframe); } else{ - DBG_8192C("==> %s xmitframe_coalsece failed\n",__FUNCTION__); + DBG_8192C("==> %s xmitframe_coalsece failed\n",__func__); } return res; @@ -1145,7 +1145,7 @@ static s32 pre_xmitframe(_adapter *padapter, struct xmit_frame *pxmitframe) _enter_critical_bh(&pxmitpriv->lock, &irqL); -//DBG_8192C("==> %s\n",__FUNCTION__); +//DBG_8192C("==> %s\n",__func__); if (rtw_txframes_sta_ac_pending(padapter, pattrib) > 0) { @@ -1218,7 +1218,7 @@ static void rtl8188eu_hostap_mgnt_xmit_cb(struct urb *urb) #ifdef PLATFORM_LINUX struct sk_buff *skb = (struct sk_buff *)urb->context; - //DBG_8192C("%s\n", __FUNCTION__); + //DBG_8192C("%s\n", __func__); dev_kfree_skb_any(skb); #endif @@ -1241,7 +1241,7 @@ s32 rtl8188eu_hostap_mgnt_xmit_entry(_adapter *padapter, _pkt *pkt) struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); - //DBG_8192C("%s\n", __FUNCTION__); + //DBG_8192C("%s\n", __func__); skb = pkt; diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index a67bb5f..8d4d834 100644 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -88,7 +88,7 @@ _ConfigNormalChipOutEP_8188E( break; } - DBG_871X("%s OutEpQueueSel(0x%02x), OutEpNumber(%d)\n",__FUNCTION__,pHalData->OutEpQueueSel,pHalData->OutEpNumber ); + DBG_871X("%s OutEpQueueSel(0x%02x), OutEpNumber(%d)\n",__func__,pHalData->OutEpQueueSel,pHalData->OutEpNumber ); } @@ -1350,7 +1350,7 @@ _InitAntenna_Selection(IN PADAPTER Adapter) if (pHalData->AntDivCfg==0) return; - DBG_8192C("==> %s ....\n",__FUNCTION__); + DBG_8192C("==> %s ....\n",__func__); rtw_write32(Adapter, REG_LEDCFG0, rtw_read32(Adapter, REG_LEDCFG0)|BIT23); PHY_SetBBReg(Adapter, rFPGA0_XAB_RFParameter, BIT13, 0x01); @@ -1359,7 +1359,7 @@ _InitAntenna_Selection(IN PADAPTER Adapter) pHalData->CurAntenna = Antenna_A; else pHalData->CurAntenna = Antenna_B; - DBG_8192C("%s,Cur_ant:(%x)%s\n",__FUNCTION__,pHalData->CurAntenna,(pHalData->CurAntenna == Antenna_A)?"Antenna_A":"Antenna_B"); + DBG_8192C("%s,Cur_ant:(%x)%s\n",__func__,pHalData->CurAntenna,(pHalData->CurAntenna == Antenna_A)?"Antenna_A":"Antenna_B"); } @@ -1703,7 +1703,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_DOWNLOAD_FW); #endif //CONFIG_WOWLAN if (status != _SUCCESS) { - DBG_871X("%s: Download Firmware failed!!\n", __FUNCTION__); + DBG_871X("%s: Download Firmware failed!!\n", __func__); Adapter->bFWReady = _FALSE; pHalData->fw_ractrl = _FALSE; return status; @@ -1757,7 +1757,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_EFUSE_PATCH); #if defined(CONFIG_IOL_EFUSE_PATCH) status = rtl8188e_iol_efuse_patch(Adapter); if (status == _FAIL){ - DBG_871X("%s rtl8188e_iol_efuse_patch failed\n",__FUNCTION__); + DBG_871X("%s rtl8188e_iol_efuse_patch failed\n",__func__); goto exit; } #endif @@ -2070,7 +2070,7 @@ HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_LCK); exit: HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_END); - DBG_871X("%s in %dms\n", __FUNCTION__, rtw_get_passing_time_ms(init_start_time)); + DBG_871X("%s in %dms\n", __func__, rtw_get_passing_time_ms(init_start_time)); #ifdef DBG_HAL_INIT_PROFILING hal_init_stages_timestamp[HAL_INIT_STAGES_END]=rtw_get_current_time(); @@ -2197,7 +2197,7 @@ u32 rtl8188eu_hal_deinit(PADAPTER Adapter) { HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); - DBG_8192C("==> %s\n",__FUNCTION__); + DBG_8192C("==> %s\n",__func__); #ifdef CONFIG_SUPPORT_USB_INT rtw_write32(Adapter, REG_HIMR_88E, IMR_DISABLED_88E); @@ -2270,7 +2270,7 @@ _func_enter_; if (pHalData->RtIntInPipe != 0x05) { status = _FAIL; - DBG_871X("%s =>Warning !! Have not USB Int-IN pipe, pHalData->RtIntInPipe(%d)!!!\n",__FUNCTION__,pHalData->RtIntInPipe); + DBG_871X("%s =>Warning !! Have not USB Int-IN pipe, pHalData->RtIntInPipe(%d)!!!\n",__func__,pHalData->RtIntInPipe); goto exit; } _read_interrupt = pintfhdl->io_ops._read_interrupt; @@ -2583,7 +2583,7 @@ _ReadMACAddress( //sMacAddr[5] = (u8)GetRandomNumber(1, 254); _rtw_memcpy(pEEPROM->mac_addr, sMacAddr, ETH_ALEN); } - DBG_8192C("%s MAC Address from EFUSE = "MAC_FMT"\n",__FUNCTION__, MAC_ARG(pEEPROM->mac_addr)); + DBG_8192C("%s MAC Address from EFUSE = "MAC_FMT"\n",__func__, MAC_ARG(pEEPROM->mac_addr)); //NicIFSetMacAddress(Adapter, Adapter->PermanentAddress); //RT_PRINT_ADDR(COMP_INIT|COMP_EFUSE, DBG_LOUD, "MAC Addr: %s", Adapter->PermanentAddress); #endif @@ -2911,7 +2911,7 @@ static void _ReadPSSetting(IN PADAPTER Adapter,IN u8*PROMContent,IN u8 AutoloadF //if (SUPPORT_HW_RADIO_DETECT(Adapter)) //Adapter->registrypriv.usbss_enable = Adapter->pwrctrlpriv.bSupportRemoteWakeup ; - DBG_8192C("%s...bHWPwrPindetect(%x)-bHWPowerdown(%x) ,bSupportRemoteWakeup(%x)\n",__FUNCTION__, + DBG_8192C("%s...bHWPwrPindetect(%x)-bHWPowerdown(%x) ,bSupportRemoteWakeup(%x)\n",__func__, Adapter->pwrctrlpriv.bHWPwrPindetect,Adapter->pwrctrlpriv.bHWPowerdown ,Adapter->pwrctrlpriv.bSupportRemoteWakeup); DBG_8192C("### PS params=> power_mgnt(%x),usbss_enable(%x) ###\n",Adapter->registrypriv.power_mgnt,Adapter->registrypriv.usbss_enable); @@ -3134,7 +3134,7 @@ static int _ReadAdapterInfo8188EU(PADAPTER Adapter) //HAL_DATA_TYPE *pHalData = GET_HAL_DATA(Adapter); u32 start=rtw_get_current_time(); - MSG_8192C("====> %s\n", __FUNCTION__); + MSG_8192C("====> %s\n", __func__); //Efuse_InitSomeVar(Adapter); @@ -3144,9 +3144,9 @@ static int _ReadAdapterInfo8188EU(PADAPTER Adapter) _ReadRFType(Adapter);//rf_chip -> _InitRFType() _ReadPROMContent(Adapter); - //MSG_8192C("%s()(done), rf_chip=0x%x, rf_type=0x%x\n", __FUNCTION__, pHalData->rf_chip, pHalData->rf_type); + //MSG_8192C("%s()(done), rf_chip=0x%x, rf_type=0x%x\n", __func__, pHalData->rf_chip, pHalData->rf_type); - MSG_8192C("<==== %s in %d ms\n", __FUNCTION__, rtw_get_passing_time_ms(start)); + MSG_8192C("<==== %s in %d ms\n", __func__, rtw_get_passing_time_ms(start)); return _SUCCESS; } @@ -3250,7 +3250,7 @@ static void hw_var_set_opmode(PADAPTER Adapter, u8 variable, u8* val) val8 |= (mode<<2); rtw_write8(Adapter, MSR, val8); - DBG_871X("%s()-%d mode = %d\n", __FUNCTION__, __LINE__, mode); + DBG_871X("%s()-%d mode = %d\n", __func__, __LINE__, mode); if ((mode == _HW_STATE_STATION_) || (mode == _HW_STATE_NOLINK_)) { @@ -3343,7 +3343,7 @@ static void hw_var_set_opmode(PADAPTER Adapter, u8 variable, u8* val) if ( check_buddy_fwstate(Adapter, (WIFI_STATION_STATE|WIFI_ASOC_STATE)) ) { if (reset_tsf(Adapter, IFACE_PORT1) == _FALSE) DBG_871X("ERROR! %s()-%d: Reset port1 TSF fail\n", - __FUNCTION__, __LINE__); + __func__, __LINE__); } #endif // CONFIG_TSF_RESET_OFFLOAD } @@ -3359,7 +3359,7 @@ static void hw_var_set_opmode(PADAPTER Adapter, u8 variable, u8* val) val8 |= mode; rtw_write8(Adapter, MSR, val8); - DBG_871X("%s()-%d mode = %d\n", __FUNCTION__, __LINE__, mode); + DBG_871X("%s()-%d mode = %d\n", __func__, __LINE__, mode); if ((mode == _HW_STATE_STATION_) || (mode == _HW_STATE_NOLINK_)) { @@ -3453,7 +3453,7 @@ static void hw_var_set_opmode(PADAPTER Adapter, u8 variable, u8* val) if ( check_buddy_fwstate(Adapter, (WIFI_STATION_STATE|WIFI_ASOC_STATE)) ) { if (reset_tsf(Adapter, IFACE_PORT0) == _FALSE) DBG_871X("ERROR! %s()-%d: Reset port0 TSF fail\n", - __FUNCTION__, __LINE__); + __func__, __LINE__); } #endif // CONFIG_TSF_RESET_OFFLOAD } @@ -3580,7 +3580,7 @@ static void hw_var_set_correct_tsf(PADAPTER Adapter, u8 variable, u8* val) // Update buddy port's TSF(TBTT) if it is SoftAP for beacon TX issue! if (reset_tsf(Adapter, IFACE_PORT0) == _FALSE) DBG_871X("ERROR! %s()-%d: Reset port0 TSF fail\n", - __FUNCTION__, __LINE__); + __func__, __LINE__); #endif // CONFIG_TSF_RESET_OFFLOAD } @@ -3614,7 +3614,7 @@ static void hw_var_set_correct_tsf(PADAPTER Adapter, u8 variable, u8* val) // Update buddy port's TSF if it is SoftAP for beacon TX issue! if (reset_tsf(Adapter, IFACE_PORT1) == _FALSE) DBG_871X("ERROR! %s()-%d: Reset port1 TSF fail\n", - __FUNCTION__, __LINE__); + __func__, __LINE__); #endif // CONFIG_TSF_RESET_OFFLOAD } @@ -4069,7 +4069,7 @@ _func_enter_; struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); u16 bcn_interval = *((u16 *)val); if ((pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE){ - DBG_8192C("%s==> bcn_interval:%d, eraly_int:%d\n",__FUNCTION__,bcn_interval,bcn_interval>>1); + DBG_8192C("%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 } } @@ -5073,7 +5073,7 @@ void UpdateHalRAMask8188EUsb(PADAPTER padapter, u32 mac_id, u8 rssi_level) { rate_bitmap = ODM_Get_Rate_Bitmap(&pHalData->odmpriv,mac_id,mask,rssi_level); printk("%s => mac_id:%d, networkType:0x%02x, mask:0x%08x\n\t ==> rssi_level:%d, rate_bitmap:0x%08x\n", - __FUNCTION__,mac_id,networkType,mask,rssi_level,rate_bitmap); + __func__,mac_id,networkType,mask,rssi_level,rate_bitmap); } #endif diff --git a/hal/usb_ops_linux.c b/hal/usb_ops_linux.c index 2bda600..575071a 100644 --- a/hal/usb_ops_linux.c +++ b/hal/usb_ops_linux.c @@ -62,7 +62,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u } #endif - //DBG_871X("%s %s:%d\n",__FUNCTION__, current->comm, current->pid); + //DBG_871X("%s %s:%d\n",__func__, current->comm, current->pid); if ((padapter->bSurpriseRemoved) ||(padapter->pwrctrlpriv.pnp_bstop_trx)){ RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usbctrl_vendorreq:(padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n")); @@ -71,7 +71,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u } if (len>MAX_VENDOR_REQ_CMD_SIZE){ - DBG_8192C( "[%s] Buffer len error ,vendor request failed\n", __FUNCTION__ ); + DBG_8192C( "[%s] Buffer len error ,vendor request failed\n", __func__ ); status = -EINVAL; goto exit; } @@ -99,7 +99,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u #endif if ( pIo_buf== NULL) { - DBG_8192C( "[%s] pIo_buf == NULL\n", __FUNCTION__ ); + DBG_8192C( "[%s] pIo_buf == NULL\n", __func__ ); status = -ENOMEM; goto release_mutex; } @@ -391,7 +391,7 @@ void interrupt_handler_8188eu(_adapter *padapter,u16 pkt_len,u8 *pbuf) if ( pkt_len != INTERRUPT_MSG_FORMAT_LEN ) { - DBG_8192C("%s Invalid interrupt content length (%d)!\n", __FUNCTION__, pkt_len); + DBG_8192C("%s Invalid interrupt content length (%d)!\n", __func__, pkt_len); return ; } @@ -409,7 +409,7 @@ void interrupt_handler_8188eu(_adapter *padapter,u16 pkt_len,u8 *pbuf) hisr_ex = le32_to_cpu(hisr_ex); if ((hisr != 0) || (hisr_ex!=0)) - DBG_871X("===> %s hisr:0x%08x ,hisr_ex:0x%08x\n",__FUNCTION__,hisr,hisr_ex); + DBG_871X("===> %s hisr:0x%08x ,hisr_ex:0x%08x\n",__func__,hisr,hisr_ex); } #endif @@ -475,13 +475,13 @@ void interrupt_handler_8188eu(_adapter *padapter,u16 pkt_len,u8 *pbuf) #ifdef DBG_CONFIG_ERROR_DETECT_INT if ( pHalData->IntArray[1] & IMR_TXERR_88E ) - DBG_871X("===> %s Tx Error Flag Interrupt Status\n",__FUNCTION__); + DBG_871X("===> %s Tx Error Flag Interrupt Status\n",__func__); if ( pHalData->IntArray[1] & IMR_RXERR_88E ) - DBG_871X("===> %s Rx Error Flag INT Status\n",__FUNCTION__); + DBG_871X("===> %s Rx Error Flag INT Status\n",__func__); if ( pHalData->IntArray[1] & IMR_TXFOVW_88E ) - DBG_871X("===> %s Transmit FIFO Overflow\n",__FUNCTION__); + DBG_871X("===> %s Transmit FIFO Overflow\n",__func__); if ( pHalData->IntArray[1] & IMR_RXFOVW_88E ) - DBG_871X("===> %s Receive FIFO Overflow\n",__FUNCTION__); + DBG_871X("===> %s Receive FIFO Overflow\n",__func__); #endif//DBG_CONFIG_ERROR_DETECT_INT @@ -503,7 +503,7 @@ static void usb_read_interrupt_complete(struct urb *purb, struct pt_regs *regs) if (padapter->bSurpriseRemoved || padapter->bDriverStopped||padapter->bReadPortCancel) { DBG_8192C("%s() RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n", - __FUNCTION__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel); + __func__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel); return; } @@ -769,7 +769,7 @@ static s32 pre_recv_entry(union recv_frame *precvframe, struct recv_stat *prxsta } else { rtw_free_recvframe(precvframe_if2, pfree_recv_queue); - DBG_8192C("%s()-%d: alloc_skb() failed!\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: alloc_skb() failed!\n", __func__, __LINE__); } } @@ -829,7 +829,7 @@ static int recvbuf2recvframe(_adapter *padapter, struct recv_buf *precvbuf) if (precvframe==NULL) { RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvbuf2recvframe: precvframe==NULL\n")); - DBG_8192C("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n", __func__, __LINE__); goto _exit_recvbuf2recvframe; } @@ -844,15 +844,15 @@ static int recvbuf2recvframe(_adapter *padapter, struct recv_buf *precvbuf) #ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV //if (pattrib->pkt_len>2000){ - // printk("%s: RX Warning!pkt_len= %d, data rate=0x%02x\n", __FUNCTION__,pattrib->pkt_len,pattrib->mcs_rate); + // printk("%s: RX Warning!pkt_len= %d, data rate=0x%02x\n", __func__,pattrib->pkt_len,pattrib->mcs_rate); //} #endif if ((pattrib->crc_err) || (pattrib->icv_err)) { if (pattrib->pkt_len>2000){ - DBG_8192C("%s: RX Warning! crc_err=%d icv_err=%d, skip!\n", __FUNCTION__, pattrib->crc_err, pattrib->icv_err); + DBG_8192C("%s: RX Warning! crc_err=%d icv_err=%d, skip!\n", __func__, pattrib->crc_err, pattrib->icv_err); #ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV - printk("%s: RX Warning!pkt_len= %d, data rate=0x%02x\n", __FUNCTION__,pattrib->pkt_len,pattrib->mcs_rate); + printk("%s: RX Warning!pkt_len= %d, data rate=0x%02x\n", __func__,pattrib->pkt_len,pattrib->mcs_rate); #endif } rtw_free_recvframe(precvframe, pfree_recv_queue); @@ -870,7 +870,7 @@ static int recvbuf2recvframe(_adapter *padapter, struct recv_buf *precvbuf) if ((pattrib->pkt_len<=0) || (pkt_offset>transfer_len)) { RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("recvbuf2recvframe: pkt_len<=0\n")); - DBG_8192C("%s()-%d: RX Warning!\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: RX Warning!\n", __func__, __LINE__); rtw_free_recvframe(precvframe, pfree_recv_queue); goto _exit_recvbuf2recvframe; } @@ -998,7 +998,7 @@ static int recvbuf2recvframe(_adapter *padapter, struct recv_buf *precvbuf) } else if (pattrib->pkt_rpt_type == HIS_REPORT) { - //DBG_8192C("%s , rx USB HISR\n",__FUNCTION__); + //DBG_8192C("%s , rx USB HISR\n",__func__); #ifdef CONFIG_SUPPORT_USB_INT interrupt_handler_8188eu(padapter,pattrib->pkt_len,precvframe->u.hdr.rx_data); #endif @@ -1060,7 +1060,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) { RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", padapter->bDriverStopped, padapter->bSurpriseRemoved)); DBG_8192C("%s() RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n", - __FUNCTION__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel); + __func__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel); goto exit; } @@ -1234,7 +1234,7 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb) if (precvframe==NULL) { RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("recvbuf2recvframe: precvframe==NULL\n")); - DBG_8192C("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: rtw_alloc_recvframe() failed! RX Drop!\n", __func__, __LINE__); goto _exit_recvbuf2recvframe; } @@ -1249,7 +1249,7 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb) if ((pattrib->crc_err) || (pattrib->icv_err)) { - DBG_8192C("%s: RX Warning! crc_err=%d icv_err=%d, skip!\n", __FUNCTION__, pattrib->crc_err, pattrib->icv_err); + DBG_8192C("%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); goto _exit_recvbuf2recvframe; @@ -1265,7 +1265,7 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb) if ((pattrib->pkt_len<=0) || (pkt_offset>transfer_len)) { RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("recvbuf2recvframe: pkt_len<=0\n")); - DBG_8192C("%s()-%d: RX Warning!,pkt_len<=0 or pkt_offset> transfoer_len\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: RX Warning!,pkt_len<=0 or pkt_offset> transfoer_len\n", __func__, __LINE__); rtw_free_recvframe(precvframe, pfree_recv_queue); goto _exit_recvbuf2recvframe; } @@ -1403,7 +1403,7 @@ static int recvbuf2recvframe(_adapter *padapter, _pkt *pskb) } else if (pattrib->pkt_rpt_type == HIS_REPORT) { - //DBG_8192C("%s , rx USB HISR\n",__FUNCTION__); + //DBG_8192C("%s , rx USB HISR\n",__func__); #ifdef CONFIG_SUPPORT_USB_INT interrupt_handler_8188eu(padapter,pattrib->pkt_len,precvframe->u.hdr.rx_data); #endif @@ -1498,7 +1498,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) } #endif DBG_8192C("%s() RX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bReadPortCancel(%d)\n", - __FUNCTION__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel); + __func__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel); goto exit; } @@ -1509,7 +1509,7 @@ static void usb_read_port_complete(struct urb *purb, struct pt_regs *regs) RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_read_port_complete: (purb->actual_length > MAX_RECVBUF_SZ) || (purb->actual_length < RXDESC_SIZE)\n")); precvbuf->reuse = _TRUE; rtw_read_port(padapter, precvpriv->ff_hwaddr, 0, (unsigned char *)precvbuf); - DBG_8192C("%s()-%d: RX Warning!\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: RX Warning!\n", __func__, __LINE__); } else { diff --git a/include/odm_debug.h b/include/odm_debug.h index 8bcc554..93f8944 100644 --- a/include/odm_debug.h +++ b/include/odm_debug.h @@ -100,10 +100,10 @@ #define RT_PRINTK DbgPrint #elif (DM_ODM_SUPPORT_TYPE == ODM_CE) #define DbgPrint printk - #define RT_PRINTK(fmt, args...) DbgPrint( "%s(): " fmt, __FUNCTION__, ## args); + #define RT_PRINTK(fmt, args...) DbgPrint( "%s(): " fmt, __func__, ## args); #else #define DbgPrint panic_printk -#define RT_PRINTK(fmt, args...) DbgPrint( "%s(): " fmt, __FUNCTION__, ## args); +#define RT_PRINTK(fmt, args...) DbgPrint( "%s(): " fmt, __func__, ## args); #endif #ifndef ASSERT @@ -138,13 +138,13 @@ #define ODM_RT_ASSERT(pDM_Odm, expr, fmt) \ if (!(expr)) { \ DbgPrint( "Assertion failed! %s at ......\n", #expr); \ - DbgPrint( " ......%s,%s,line=%d\n",__FILE__,__FUNCTION__,__LINE__); \ + DbgPrint( " ......%s,%s,line=%d\n",__FILE__,__func__,__LINE__); \ RT_PRINTK fmt; \ ASSERT(FALSE); \ } -#define ODM_dbg_enter() { DbgPrint("==> %s\n", __FUNCTION__); } -#define ODM_dbg_exit() { DbgPrint("<== %s\n", __FUNCTION__); } -#define ODM_dbg_trace(str) { DbgPrint("%s:%s\n", __FUNCTION__, str); } +#define ODM_dbg_enter() { DbgPrint("==> %s\n", __func__); } +#define ODM_dbg_exit() { DbgPrint("<== %s\n", __func__); } +#define ODM_dbg_trace(str) { DbgPrint("%s:%s\n", __func__, str); } #define ODM_PRINT_ADDR(pDM_Odm, comp, level, title_str, ptr) \ if (((comp) & pDM_Odm->DebugComponents) && (level <= pDM_Odm->DebugLevel)) \ @@ -669,7 +669,7 @@ typedef enum tag_DBGP_Flag_Type_Definition /*------------------------Export Marco Definition---------------------------*/ #if (DM_ODM_SUPPORT_TYPE != ODM_MP) -#define RT_PRINTK(fmt, args...) printk( "%s(): " fmt, __FUNCTION__, ## args); +#define RT_PRINTK(fmt, args...) printk( "%s(): " fmt, __func__, ## args); #if DBG #define ODM_RT_TRACE(pDM_Odm,comp, level, fmt) \ @@ -687,11 +687,11 @@ typedef enum tag_DBGP_Flag_Type_Definition #define RT_ASSERT(expr,fmt) \ if (!(expr)) { \ printk( "Assertion failed! %s at ......\n", #expr); \ - printk( " ......%s,%s,line=%d\n",__FILE__,__FUNCTION__,__LINE__); \ + printk( " ......%s,%s,line=%d\n",__FILE__,__func__,__LINE__); \ } -#define dbg_enter() { printk("==> %s\n", __FUNCTION__); } -#define dbg_exit() { printk("<== %s\n", __FUNCTION__); } -#define dbg_trace(str) { printk("%s:%s\n", __FUNCTION__, str); } +#define dbg_enter() { printk("==> %s\n", __func__); } +#define dbg_exit() { printk("<== %s\n", __func__); } +#define dbg_trace(str) { printk("%s:%s\n", __func__, str); } #else #define ODM_RT_TRACE(pDM_Odm,comp, level, fmt) #define RT_TRACE_F(comp, level, fmt) @@ -849,8 +849,8 @@ typedef enum tag_DBGP_Flag_Type_Definition #define FuncEntry FunctionIn(COMP_FUNC) #define FuncExit FunctionOut(COMP_FUNC) -#define FunctionIn(_comp) ODM_RT_TRACE(pDM_Odm,(_comp), DBG_LOUD, ("==========> %s\n", __FUNCTION__)) -#define FunctionOut(_comp) ODM_RT_TRACE(pDM_Odm,(_comp), DBG_LOUD, ("<========== %s\n", __FUNCTION__)) +#define FunctionIn(_comp) ODM_RT_TRACE(pDM_Odm,(_comp), DBG_LOUD, ("==========> %s\n", __func__)) +#define FunctionOut(_comp) ODM_RT_TRACE(pDM_Odm,(_comp), DBG_LOUD, ("<========== %s\n", __func__)) #else diff --git a/include/osdep_service.h b/include/osdep_service.h index a7c506e..fc8a770 100644 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -388,7 +388,7 @@ static inline unsigned char *__skb_pull(struct sk_buff *skb, unsigned int len) { skb->len -= len; if (skb->len < skb->data_len) - printf("%s(),%d,error!\n",__FUNCTION__,__LINE__); + printf("%s(),%d,error!\n",__func__,__LINE__); return skb->data += len; } static inline unsigned char *skb_pull(struct sk_buff *skb, unsigned int len) @@ -717,12 +717,12 @@ __inline static void _cancel_timer(_timer *ptimer,u8 *bcancelled) __inline static void _init_workitem(_workitem *pwork, void *pfunc, PVOID cntx) { - printf("%s Not implement yet!\n",__FUNCTION__); + printf("%s Not implement yet!\n",__func__); } __inline static void _set_workitem(_workitem *pwork) { - printf("%s Not implement yet!\n",__FUNCTION__); + printf("%s Not implement yet!\n",__func__); // schedule_work(pwork); } @@ -1303,17 +1303,17 @@ extern u8* dbg_rtw_malloc(u32 sz, const char *func, int line); extern u8* dbg_rtw_zmalloc(u32 sz, const char *func, int line); extern void dbg_rtw_mfree(u8 *pbuf, u32 sz, const char *func, int line); #ifdef CONFIG_USE_VMALLOC -#define rtw_vmalloc(sz) dbg_rtw_vmalloc((sz), __FUNCTION__, __LINE__) -#define rtw_zvmalloc(sz) dbg_rtw_zvmalloc((sz), __FUNCTION__, __LINE__) -#define rtw_vmfree(pbuf, sz) dbg_rtw_vmfree((pbuf), (sz), __FUNCTION__, __LINE__) +#define rtw_vmalloc(sz) dbg_rtw_vmalloc((sz), __func__, __LINE__) +#define rtw_zvmalloc(sz) dbg_rtw_zvmalloc((sz), __func__, __LINE__) +#define rtw_vmfree(pbuf, sz) dbg_rtw_vmfree((pbuf), (sz), __func__, __LINE__) #else //CONFIG_USE_VMALLOC -#define rtw_vmalloc(sz) dbg_rtw_malloc((sz), __FUNCTION__, __LINE__) -#define rtw_zvmalloc(sz) dbg_rtw_zmalloc((sz), __FUNCTION__, __LINE__) -#define rtw_vmfree(pbuf, sz) dbg_rtw_mfree((pbuf), (sz), __FUNCTION__, __LINE__) +#define rtw_vmalloc(sz) dbg_rtw_malloc((sz), __func__, __LINE__) +#define rtw_zvmalloc(sz) dbg_rtw_zmalloc((sz), __func__, __LINE__) +#define rtw_vmfree(pbuf, sz) dbg_rtw_mfree((pbuf), (sz), __func__, __LINE__) #endif //CONFIG_USE_VMALLOC -#define rtw_malloc(sz) dbg_rtw_malloc((sz), __FUNCTION__, __LINE__) -#define rtw_zmalloc(sz) dbg_rtw_zmalloc((sz), __FUNCTION__, __LINE__) -#define rtw_mfree(pbuf, sz) dbg_rtw_mfree((pbuf), (sz), __FUNCTION__, __LINE__) +#define rtw_malloc(sz) dbg_rtw_malloc((sz), __func__, __LINE__) +#define rtw_zmalloc(sz) dbg_rtw_zmalloc((sz), __func__, __LINE__) +#define rtw_mfree(pbuf, sz) dbg_rtw_mfree((pbuf), (sz), __func__, __LINE__) #else #define rtw_update_mem_stat(flag, sz) do {} while (0) extern u8* _rtw_vmalloc(u32 sz); @@ -1384,8 +1384,8 @@ extern void rtw_usleep_os(int us); extern u32 rtw_atoi(u8* s); #ifdef DBG_DELAY_OS -#define rtw_mdelay_os(ms) _rtw_mdelay_os((ms), __FUNCTION__, __LINE__) -#define rtw_udelay_os(ms) _rtw_udelay_os((ms), __FUNCTION__, __LINE__) +#define rtw_mdelay_os(ms) _rtw_mdelay_os((ms), __func__, __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_udelay_os(int us, const char *func, const int line); #else diff --git a/include/rtl8723a_bt-coexist.h b/include/rtl8723a_bt-coexist.h index 2878982..b49269d 100644 --- a/include/rtl8723a_bt-coexist.h +++ b/include/rtl8723a_bt-coexist.h @@ -1238,7 +1238,7 @@ typedef struct _BTData_ENTRY #define BTHCI_SM_WITH_INFO(_Adapter, _StateToEnter, _StateCmd, _EntryNum) \ { \ - RTPRINT(FIOCTL, IOCTL_STATE, ("[BT state change] caused by ""%s"", line=%d\n", __FUNCTION__, __LINE__)); \ + RTPRINT(FIOCTL, IOCTL_STATE, ("[BT state change] caused by ""%s"", line=%d\n", __func__, __LINE__)); \ BTHCI_StateMachine(_Adapter, _StateToEnter, _StateCmd, _EntryNum);\ } diff --git a/include/rtw_debug.h b/include/rtw_debug.h index 4972600..556393c 100644 --- a/include/rtw_debug.h +++ b/include/rtw_debug.h @@ -248,7 +248,7 @@ extern void rtl871x_cedbg(const char *fmt, ...); do { \ if (GlobalDebugLevel >= _drv_debug_) \ { \ - _dbgdump("\n %s : %s enters at %d\n", DRIVER_PREFIX, __FUNCTION__, __LINE__);\ + _dbgdump("\n %s : %s enters at %d\n", DRIVER_PREFIX, __func__, __LINE__);\ } \ } while (0) @@ -257,7 +257,7 @@ extern void rtl871x_cedbg(const char *fmt, ...); do { \ if (GlobalDebugLevel >= _drv_debug_) \ { \ - _dbgdump("\n %s : %s exits at %d\n", DRIVER_PREFIX, __FUNCTION__, __LINE__); \ + _dbgdump("\n %s : %s exits at %d\n", DRIVER_PREFIX, __func__, __LINE__); \ } \ } while (0) diff --git a/include/rtw_io.h b/include/rtw_io.h index c48f44f..352cc27 100644 --- a/include/rtw_io.h +++ b/include/rtw_io.h @@ -408,17 +408,17 @@ extern int dbg_rtw_write16(_adapter *adapter, u32 addr, u16 val, const char *cal extern int dbg_rtw_write32(_adapter *adapter, u32 addr, u32 val, const char *caller, const int line); extern int dbg_rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *data, const char *caller, const int line); -#define rtw_read8(adapter, addr) dbg_rtw_read8((adapter), (addr), __FUNCTION__, __LINE__) -#define rtw_read16(adapter, addr) dbg_rtw_read16((adapter), (addr), __FUNCTION__, __LINE__) -#define rtw_read32(adapter, addr) dbg_rtw_read32((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), __func__, __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_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_write8(adapter, addr, val) dbg_rtw_write8((adapter), (addr), (val), __FUNCTION__, __LINE__) -#define rtw_write16(adapter, addr, val) dbg_rtw_write16((adapter), (addr), (val), __FUNCTION__, __LINE__) -#define rtw_write32(adapter, addr, val) dbg_rtw_write32((adapter), (addr), (val), __FUNCTION__, __LINE__) -#define rtw_writeN(adapter, addr, length, data) dbg_rtw_writeN((adapter), (addr), (length), (data), __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), __func__, __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), __func__, __LINE__) #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)) diff --git a/include/rtw_ioctl.h b/include/rtw_ioctl.h index cfdf45b..b5db314 100644 --- a/include/rtw_ioctl.h +++ b/include/rtw_ioctl.h @@ -67,7 +67,7 @@ #define DEBUG_OID(dbg, str) \ if ((!dbg)) \ { \ - RT_TRACE(_module_rtl871x_ioctl_c_,_drv_info_,("%s(%d): %s", __FUNCTION__, __LINE__, str)); \ + RT_TRACE(_module_rtl871x_ioctl_c_,_drv_info_,("%s(%d): %s", __func__, __LINE__, str)); \ } diff --git a/include/rtw_iol.h b/include/rtw_iol.h index 0b0672a..a264788 100644 --- a/include/rtw_iol.h +++ b/include/rtw_iol.h @@ -123,9 +123,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_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); -#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_WW_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WW_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), __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), __func__, __LINE__) +#define rtw_IOL_append_WD_cmd(xmit_frame, addr, value) dbg_rtw_IOL_append_WD_cmd((xmit_frame), (addr), (value), __func__, __LINE__) #else #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)) diff --git a/include/rtw_mlme_ext.h b/include/rtw_mlme_ext.h index 0d94cef..dca6d2b 100644 --- a/include/rtw_mlme_ext.h +++ b/include/rtw_mlme_ext.h @@ -739,13 +739,13 @@ void addba_timer_hdl(struct sta_info *psta); #define set_survey_timer(mlmeext, ms) \ do { \ - /*DBG_871X("%s set_survey_timer(%p, %d)\n", __FUNCTION__, (mlmeext), (ms));*/ \ + /*DBG_871X("%s set_survey_timer(%p, %d)\n", __func__, (mlmeext), (ms));*/ \ _set_timer(&(mlmeext)->survey_timer, (ms)); \ } while (0) #define set_link_timer(mlmeext, ms) \ do { \ - /*DBG_871X("%s set_link_timer(%p, %d)\n", __FUNCTION__, (mlmeext), (ms));*/ \ + /*DBG_871X("%s set_link_timer(%p, %d)\n", __func__, (mlmeext), (ms));*/ \ _set_timer(&(mlmeext)->link_timer, (ms)); \ } while (0) diff --git a/include/rtw_p2p.h b/include/rtw_p2p.h index 6e47592..c533964 100644 --- a/include/rtw_p2p.h +++ b/include/rtw_p2p.h @@ -128,10 +128,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_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); -#define rtw_p2p_set_state(wdinfo, state) dbg_rtw_p2p_set_state(wdinfo, state, __FUNCTION__, __LINE__) -#define rtw_p2p_set_pre_state(wdinfo, state) dbg_rtw_p2p_set_pre_state(wdinfo, state, __FUNCTION__, __LINE__) -#define rtw_p2p_set_role(wdinfo, role) dbg_rtw_p2p_set_role(wdinfo, role, __FUNCTION__, __LINE__) -//#define rtw_p2p_restore_state(wdinfo) dbg_rtw_p2p_restore_state(wdinfo, __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, __func__, __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, __func__, __LINE__) #else //CONFIG_DBG_P2P #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) diff --git a/include/rtw_pwrctrl.h b/include/rtw_pwrctrl.h index f4777f0..9c228d6 100644 --- a/include/rtw_pwrctrl.h +++ b/include/rtw_pwrctrl.h @@ -305,7 +305,7 @@ struct pwrctrl_priv #define _rtw_set_pwr_state_check_timer(pwrctrlpriv, ms) \ do { \ - /*DBG_871X("%s _rtw_set_pwr_state_check_timer(%p, %d)\n", __FUNCTION__, (pwrctrlpriv), (ms));*/ \ + /*DBG_871X("%s _rtw_set_pwr_state_check_timer(%p, %d)\n", __func__, (pwrctrlpriv), (ms));*/ \ _set_timer(&(pwrctrlpriv)->pwr_state_check_timer, (ms)); \ } while (0) @@ -365,8 +365,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); void rtw_set_ips_deny(_adapter *padapter, u32 ms); 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_ex(adapter, ips_deffer_ms) _rtw_pwr_wakeup(adapter, ips_deffer_ms, __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, __func__) int rtw_pm_set_ips(_adapter *padapter, u8 mode); int rtw_pm_set_lps(_adapter *padapter, u8 mode); diff --git a/include/rtw_wapi.h b/include/rtw_wapi.h index 83ecc2f..0f3f827 100644 --- a/include/rtw_wapi.h +++ b/include/rtw_wapi.h @@ -48,7 +48,7 @@ do { if (wapi_debug_component & (component)){ \ { \ printk("RTWLAN: "); \ printk( "Assertion failed! %s,%s,line=%d\n", \ - #_Exp,__FUNCTION__,__LINE__); \ + #_Exp,__func__,__LINE__); \ return; \ } #define RT_ASSERT_RET_VALUE(_Exp,Ret) \ @@ -56,7 +56,7 @@ do { if (wapi_debug_component & (component)){ \ { \ printk("RTWLAN: "); \ printk( "Assertion failed! %s,%s,line=%d\n", \ - #_Exp,__FUNCTION__,__LINE__); \ + #_Exp,__func__,__LINE__); \ return (Ret); \ } diff --git a/os_dep/ioctl_cfg80211.c b/os_dep/ioctl_cfg80211.c index 6ac38fe..4e3fd9c 100644 --- a/os_dep/ioctl_cfg80211.c +++ b/os_dep/ioctl_cfg80211.c @@ -514,7 +514,7 @@ void rtw_cfg80211_indicate_connect(_adapter *padapter) notify_channel = ieee80211_get_channel(wiphy, freq); #endif - DBG_871X("%s call cfg80211_roamed\n", __FUNCTION__); + DBG_871X("%s call cfg80211_roamed\n", __func__); cfg80211_roamed(padapter->pnetdev #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) || defined(COMPAT_KERNEL_RELEASE) , notify_channel @@ -638,7 +638,7 @@ static int set_group_key(_adapter *padapter, u8 *key, u8 alg, int keyid) struct cmd_priv *pcmdpriv=&(padapter->cmdpriv); int res=_SUCCESS; - DBG_8192C("%s\n", __FUNCTION__); + DBG_8192C("%s\n", __func__); pcmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); if (pcmd==NULL){ @@ -726,7 +726,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa struct security_priv* psecuritypriv=&(padapter->securitypriv); struct sta_priv *pstapriv = &padapter->stapriv; - DBG_8192C("%s\n", __FUNCTION__); + DBG_8192C("%s\n", __func__); param->u.crypt.err = 0; param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0'; @@ -824,7 +824,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa { if (strcmp(param->u.crypt.alg, "WEP") == 0) { - DBG_8192C("%s, set group_key, WEP\n", __FUNCTION__); + DBG_8192C("%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)); @@ -837,7 +837,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa } else if (strcmp(param->u.crypt.alg, "TKIP") == 0) { - DBG_8192C("%s, set group_key, TKIP\n", __FUNCTION__); + DBG_8192C("%s, set group_key, TKIP\n", __func__); psecuritypriv->dot118021XGrpPrivacy = _TKIP_; @@ -853,7 +853,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa } else if (strcmp(param->u.crypt.alg, "CCMP") == 0) { - DBG_8192C("%s, set group_key, CCMP\n", __FUNCTION__); + DBG_8192C("%s, set group_key, CCMP\n", __func__); psecuritypriv->dot118021XGrpPrivacy = _AES_; @@ -861,7 +861,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa } else { - DBG_8192C("%s, set group_key, none\n", __FUNCTION__); + DBG_8192C("%s, set group_key, none\n", __func__); psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_; } @@ -897,7 +897,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa if (strcmp(param->u.crypt.alg, "WEP") == 0) { - DBG_8192C("%s, set pairwise key, WEP\n", __FUNCTION__); + DBG_8192C("%s, set pairwise key, WEP\n", __func__); psta->dot118021XPrivacy = _WEP40_; if (param->u.crypt.key_len==13) @@ -907,7 +907,7 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa } else if (strcmp(param->u.crypt.alg, "TKIP") == 0) { - DBG_8192C("%s, set pairwise key, TKIP\n", __FUNCTION__); + DBG_8192C("%s, set pairwise key, TKIP\n", __func__); psta->dot118021XPrivacy = _TKIP_; @@ -922,13 +922,13 @@ static int rtw_cfg80211_ap_set_encryption(struct net_device *dev, struct ieee_pa else if (strcmp(param->u.crypt.alg, "CCMP") == 0) { - DBG_8192C("%s, set pairwise key, CCMP\n", __FUNCTION__); + DBG_8192C("%s, set pairwise key, CCMP\n", __func__); psta->dot118021XPrivacy = _AES_; } else { - DBG_8192C("%s, set pairwise key, none\n", __FUNCTION__); + DBG_8192C("%s, set pairwise key, none\n", __func__); psta->dot118021XPrivacy = _NO_PRIVACY_; } @@ -1682,7 +1682,7 @@ void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv, bool abor //struct cfg80211_scan_request *scan_request = pwdev_priv->scan_request; #ifdef CONFIG_DEBUG_CFG80211 - DBG_871X("%s with scan req\n", __FUNCTION__); + DBG_871X("%s with scan req\n", __func__); #endif //avoid WARN_ON(request != wiphy_to_dev(request->wiphy)->scan_req); @@ -1700,7 +1700,7 @@ void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv, bool abor } else { #ifdef CONFIG_DEBUG_CFG80211 - DBG_871X("%s without scan req\n", __FUNCTION__); + DBG_871X("%s without scan req\n", __func__); #endif } _exit_critical_bh(&pwdev_priv->scan_req_lock, &irqL); @@ -1793,7 +1793,7 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(struct net_device *net, char *buf pmlmepriv->wps_probe_req_ie = rtw_malloc(wps_ielen); if ( pmlmepriv->wps_probe_req_ie == NULL) { - DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__); return -EINVAL; } @@ -1821,7 +1821,7 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(struct net_device *net, char *buf pmlmepriv->p2p_probe_req_ie = rtw_malloc(p2p_ielen); if ( pmlmepriv->p2p_probe_req_ie == NULL) { - DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__); return -EINVAL; } @@ -1850,7 +1850,7 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(struct net_device *net, char *buf pmlmepriv->wfd_probe_req_ie = rtw_malloc(wfd_ielen); if ( pmlmepriv->wfd_probe_req_ie == NULL) { - DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__); return -EINVAL; } @@ -1922,7 +1922,7 @@ if (padapter->registrypriv.mp_mode == 1) { #ifdef CONFIG_DEBUG_CFG80211 - DBG_871X("%s under WIFI_AP_STATE\n", __FUNCTION__); + DBG_871X("%s under WIFI_AP_STATE\n", __func__); #endif //need_indicate_scan_done = _TRUE; //goto check_need_indicate_scan_done; @@ -2454,7 +2454,7 @@ static int rtw_cfg80211_set_wpa_ie(_adapter *padapter, u8 *pie, size_t ielen) if ((p2p_ie=rtw_get_p2p_ie(buf, ielen, NULL, &p2p_ielen))) { #ifdef CONFIG_DEBUG_CFG80211 - DBG_8192C("%s p2p_assoc_req_ielen=%d\n", __FUNCTION__, p2p_ielen); + DBG_8192C("%s p2p_assoc_req_ielen=%d\n", __func__, p2p_ielen); #endif if (pmlmepriv->p2p_assoc_req_ie) @@ -2467,7 +2467,7 @@ static int rtw_cfg80211_set_wpa_ie(_adapter *padapter, u8 *pie, size_t ielen) pmlmepriv->p2p_assoc_req_ie = rtw_malloc(p2p_ielen); if ( pmlmepriv->p2p_assoc_req_ie == NULL) { - DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__); goto exit; } _rtw_memcpy(pmlmepriv->p2p_assoc_req_ie, p2p_ie, p2p_ielen); @@ -2485,7 +2485,7 @@ static int rtw_cfg80211_set_wpa_ie(_adapter *padapter, u8 *pie, size_t ielen) if (rtw_get_wfd_ie(buf, ielen, NULL, &wfd_ielen)) { #ifdef CONFIG_DEBUG_CFG80211 - DBG_8192C("%s wfd_assoc_req_ielen=%d\n", __FUNCTION__, wfd_ielen); + DBG_8192C("%s wfd_assoc_req_ielen=%d\n", __func__, wfd_ielen); #endif if (pmlmepriv->wfd_assoc_req_ie) @@ -2498,7 +2498,7 @@ static int rtw_cfg80211_set_wpa_ie(_adapter *padapter, u8 *pie, size_t ielen) pmlmepriv->wfd_assoc_req_ie = rtw_malloc(wfd_ielen); if ( pmlmepriv->wfd_assoc_req_ie == NULL) { - DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__); goto exit; } rtw_get_wfd_ie(buf, ielen, pmlmepriv->wfd_assoc_req_ie, &pmlmepriv->wfd_assoc_req_ie_len); @@ -2546,7 +2546,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, if (wdev_to_priv(padapter->rtw_wdev)->block == _TRUE) { ret = -EBUSY; - DBG_871X("%s wdev_priv.block is set\n", __FUNCTION__); + DBG_871X("%s wdev_priv.block is set\n", __func__); goto exit; } @@ -2578,7 +2578,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, #ifdef CONFIG_CONCURRENT_MODE if (check_buddy_fwstate(padapter, _FW_UNDER_LINKING) == _TRUE) { - DBG_8192C("%s, but buddy_intf is under linking\n", __FUNCTION__); + DBG_8192C("%s, but buddy_intf is under linking\n", __func__); ret = -EINVAL; goto exit; } @@ -2614,7 +2614,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == _TRUE) { ret = -EBUSY; - DBG_8192C("%s, fw_state=0x%x, goto exit\n", __FUNCTION__, pmlmepriv->fw_state); + DBG_8192C("%s, fw_state=0x%x, goto exit\n", __func__, pmlmepriv->fw_state); goto exit; } @@ -2750,7 +2750,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, { u32 wep_key_idx, wep_key_len,wep_total_len; NDIS_802_11_WEP *pwep = NULL; - DBG_871X("%s(): Shared/Auto WEP\n",__FUNCTION__); + DBG_871X("%s(): Shared/Auto WEP\n",__func__); wep_key_idx = sme->key_idx; wep_key_len = sme->key_len; @@ -2839,7 +2839,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, exit: - DBG_8192C("<=%s, ret %d\n",__FUNCTION__, ret); + DBG_8192C("<=%s, ret %d\n",__func__, ret); return ret; } @@ -2857,7 +2857,7 @@ static int cfg80211_rtw_disconnect(struct wiphy *wiphy, struct net_device *ndev, LeaveAllPowerSaveMode(padapter); rtw_disassoc_cmd(padapter, 500, _FALSE); - DBG_871X("%s...call rtw_indicate_disconnect\n", __FUNCTION__); + DBG_871X("%s...call rtw_indicate_disconnect\n", __func__); padapter->mlmepriv.not_indic_disco = _TRUE; rtw_indicate_disconnect(padapter); @@ -3516,7 +3516,7 @@ static int rtw_add_beacon(_adapter *adapter, const u8 *head, size_t head_len, co //struct sta_priv *pstapriv = &padapter->stapriv; - DBG_8192C("%s beacon_head_len=%zu, beacon_tail_len=%zu\n", __FUNCTION__, head_len, tail_len); + DBG_8192C("%s beacon_head_len=%zu, beacon_tail_len=%zu\n", __func__, head_len, tail_len); if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) @@ -3984,7 +3984,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); - DBG_871X( "[%s] In\n", __FUNCTION__ ); + DBG_871X( "[%s] In\n", __func__ ); //prepare for building provision_request frame _rtw_memcpy(pwdinfo->tx_prov_disc_info.peerIFAddr, GetAddr1Ptr(buf), ETH_ALEN); @@ -4286,7 +4286,7 @@ static s32 cfg80211_rtw_remain_on_channel(struct wiphy *wiphy, struct net_device //set_channel_bwmode(padapter, remain_ch, HAL_PRIME_CHNL_OFFSET_DONT_CARE, HT_CHANNEL_WIDTH_20); } } else { - DBG_871X("%s remain_ch:%u not in channel plan!!!!\n", __FUNCTION__, remain_ch); + DBG_871X("%s remain_ch:%u not in channel plan!!!!\n", __func__, remain_ch); } @@ -4671,7 +4671,7 @@ static int rtw_cfg80211_set_beacon_wpsp2pie(struct net_device *ndev, char *buf, pmlmepriv->wps_beacon_ie = rtw_malloc(wps_ielen); if ( pmlmepriv->wps_beacon_ie == NULL) { - DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__); return -EINVAL; } @@ -4703,7 +4703,7 @@ static int rtw_cfg80211_set_beacon_wpsp2pie(struct net_device *ndev, char *buf, pmlmepriv->p2p_beacon_ie = rtw_malloc(p2p_ielen); if ( pmlmepriv->p2p_beacon_ie == NULL) { - DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__); return -EINVAL; } @@ -4734,7 +4734,7 @@ static int rtw_cfg80211_set_beacon_wpsp2pie(struct net_device *ndev, char *buf, pmlmepriv->wfd_beacon_ie = rtw_malloc(wfd_ielen); if ( pmlmepriv->wfd_beacon_ie == NULL) { - DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__); return -EINVAL; } @@ -4787,7 +4787,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu pmlmepriv->wps_probe_resp_ie = rtw_malloc(wps_ielen); if ( pmlmepriv->wps_probe_resp_ie == NULL) { - DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__); return -EINVAL; } @@ -4828,7 +4828,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_CAPABILITY, (u8*)&cap_attr, (uint*) &attr_contentlen) ) { u8 grp_cap=0; - //DBG_8192C( "[%s] Got P2P Capability Attr!!\n", __FUNCTION__ ); + //DBG_8192C( "[%s] Got P2P Capability Attr!!\n", __func__ ); cap_attr = le16_to_cpu(cap_attr); grp_cap = (u8)((cap_attr >> 8)&0xff); @@ -4851,7 +4851,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu pmlmepriv->p2p_probe_resp_ie = rtw_malloc(p2p_ielen); if ( pmlmepriv->p2p_probe_resp_ie == NULL) { - DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__); return -EINVAL; } @@ -4870,7 +4870,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); if ( pmlmepriv->p2p_go_probe_resp_ie == NULL) { - DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__); return -EINVAL; } @@ -4901,7 +4901,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu pmlmepriv->wfd_probe_resp_ie = rtw_malloc(wfd_ielen); if ( pmlmepriv->wfd_probe_resp_ie == NULL) { - DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__); return -EINVAL; } @@ -4935,7 +4935,7 @@ static int rtw_cfg80211_set_assoc_resp_wpsp2pie(struct net_device *net, char *bu pmlmepriv->wps_assoc_resp_ie = rtw_malloc(len); if ( pmlmepriv->wps_assoc_resp_ie == NULL) { - DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); + DBG_8192C("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__); return -EINVAL; } diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index d5cae11..12a6a93 100644 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -160,7 +160,7 @@ static void indicate_wx_custom_event(_adapter *padapter, char *msg) union iwreq_data wrqu; if (strlen(msg) > IW_CUSTOM_MAX) { - DBG_871X("%s strlen(msg):%zu > IW_CUSTOM_MAX:%u\n", __FUNCTION__ , strlen(msg), IW_CUSTOM_MAX); + DBG_871X("%s strlen(msg):%zu > IW_CUSTOM_MAX:%u\n", __func__ , strlen(msg), IW_CUSTOM_MAX); return; } @@ -173,7 +173,7 @@ static void indicate_wx_custom_event(_adapter *padapter, char *msg) _rtw_memset(&wrqu,0,sizeof(wrqu)); wrqu.data.length = strlen(msg); - DBG_871X("%s %s\n", __FUNCTION__, buff); + DBG_871X("%s %s\n", __func__, buff); #ifndef CONFIG_IOCTL_CFG80211 wireless_send_event(padapter->pnetdev, IWEVCUSTOM, &wrqu, buff); #endif @@ -205,7 +205,7 @@ static void request_wps_pbc_event(_adapter *padapter) wrqu.data.length = (wrqu.data.lengthpnetdev, IWEVCUSTOM, &wrqu, buff); @@ -1543,7 +1543,7 @@ static int rtw_wx_get_sens(struct net_device *dev, if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) { //wrqu->sens.value=-padapter->recvpriv.signal_strength; wrqu->sens.value=-padapter->recvpriv.rssi; - //DBG_871X("%s: %d\n", __FUNCTION__, wrqu->sens.value); + //DBG_871X("%s: %d\n", __func__, wrqu->sens.value); wrqu->sens.fixed = 0; /* no auto select */ } else #endif @@ -1875,12 +1875,12 @@ struct iw_mlme if (mlme==NULL) return -1; - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); reason = cpu_to_le16(mlme->reason_code); - DBG_871X("%s, cmd=%d, reason=%d\n", __FUNCTION__, mlme->cmd, reason); + DBG_871X("%s, cmd=%d, reason=%d\n", __func__, mlme->cmd, reason); switch (mlme->cmd) @@ -1920,7 +1920,7 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a, _func_enter_; #ifdef DBG_IOCTL - DBG_871X("DBG_IOCTL %s:%d\n",__FUNCTION__, __LINE__); + DBG_871X("DBG_IOCTL %s:%d\n",__func__, __LINE__); #endif /* #ifdef CONFIG_CONCURRENT_MODE @@ -1989,7 +1989,7 @@ if (padapter->registrypriv.mp_mode == 1) delta_time = rtw_systime_to_ms(delta_time); if (delta_time < 500) // 500ms { - DBG_871X("%s: send DHCP pkt before %d ms, Skip scan\n", __FUNCTION__, delta_time); + DBG_871X("%s: send DHCP pkt before %d ms, Skip scan\n", __func__, delta_time); ret = -1; goto exit; } @@ -2089,7 +2089,7 @@ if (padapter->registrypriv.mp_mode == 1) char sec_len; int ssid_index = 0; - //DBG_871X("%s COMBO_SCAN header is recognized\n", __FUNCTION__); + //DBG_871X("%s COMBO_SCAN header is recognized\n", __func__); while (len >= 1) { section = *(pos++); len-=1; @@ -2107,7 +2107,7 @@ if (padapter->registrypriv.mp_mode == 1) if (sec_len>0 && sec_len<=len) { ssid[ssid_index].SsidLength = sec_len; _rtw_memcpy(ssid[ssid_index].Ssid, pos, ssid[ssid_index].SsidLength); - //DBG_871X("%s COMBO_SCAN with specific ssid:%s, %d\n", __FUNCTION__ + //DBG_871X("%s COMBO_SCAN with specific ssid:%s, %d\n", __func__ // , ssid[ssid_index].Ssid, ssid[ssid_index].SsidLength); ssid_index++; } @@ -2164,7 +2164,7 @@ if (padapter->registrypriv.mp_mode == 1) exit: #ifdef DBG_IOCTL - DBG_871X("DBG_IOCTL %s:%d return %d\n",__FUNCTION__, __LINE__, ret); + DBG_871X("DBG_IOCTL %s:%d return %d\n",__func__, __LINE__, ret); #endif _func_exit_; @@ -2200,7 +2200,7 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a, _func_enter_; #ifdef DBG_IOCTL - DBG_871X("DBG_IOCTL %s:%d\n",__FUNCTION__, __LINE__); + DBG_871X("DBG_IOCTL %s:%d\n",__func__, __LINE__); #endif /* @@ -2318,7 +2318,7 @@ exit: _func_exit_; #ifdef DBG_IOCTL - DBG_871X("DBG_IOCTL %s:%d return %d\n",__FUNCTION__, __LINE__, ret); + DBG_871X("DBG_IOCTL %s:%d return %d\n",__func__, __LINE__, ret); #endif return ret ; @@ -2351,7 +2351,7 @@ static int rtw_wx_set_essid(struct net_device *dev, _func_enter_; #ifdef DBG_IOCTL - DBG_871X("DBG_IOCTL %s:%d\n",__FUNCTION__, __LINE__); + DBG_871X("DBG_IOCTL %s:%d\n",__func__, __LINE__); #endif /* @@ -2412,7 +2412,7 @@ static int rtw_wx_set_essid(struct net_device *dev, } authmode = padapter->securitypriv.ndisauthtype; - DBG_871X("=>%s\n",__FUNCTION__); + DBG_871X("=>%s\n",__func__); if (wrqu->essid.flags && wrqu->essid.length) { // Commented by Albert 20100519 @@ -2511,10 +2511,10 @@ static int rtw_wx_set_essid(struct net_device *dev, exit: - DBG_871X("<=%s, ret %d\n",__FUNCTION__, ret); + DBG_871X("<=%s, ret %d\n",__func__, ret); #ifdef DBG_IOCTL - DBG_871X("DBG_IOCTL %s:%d return %d\n",__FUNCTION__, __LINE__, ret); + DBG_871X("DBG_IOCTL %s:%d return %d\n",__func__, __LINE__, ret); #endif _func_exit_; @@ -3173,7 +3173,7 @@ static int rtw_wx_set_auth(struct net_device *dev, if (check_fwstate(&padapter->mlmepriv, _FW_LINKED)) { LeaveAllPowerSaveMode(padapter); rtw_disassoc_cmd(padapter, 500, _FALSE); - DBG_871X("%s...call rtw_indicate_disconnect\n ",__FUNCTION__); + DBG_871X("%s...call rtw_indicate_disconnect\n ",__func__); rtw_indicate_disconnect(padapter); rtw_free_assoc_resources(padapter, 1); } @@ -3731,7 +3731,7 @@ static void rtw_dbg_mode_hdl(_adapter *padapter, u32 id, u8 *pdata, u32 len) u8 offset; u32 value; - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); switch (id) { @@ -4079,10 +4079,10 @@ static int rtw_set_pid(struct net_device *dev, #ifdef CONFIG_GLOBAL_UI_PID ui_pid[selector] = *(pdata+1); #endif - DBG_871X("%s set pid[%d]=%d\n", __FUNCTION__, selector ,padapter->pid[selector]); + DBG_871X("%s set pid[%d]=%d\n", __func__, selector ,padapter->pid[selector]); } else - DBG_871X("%s selector %d error\n", __FUNCTION__, selector); + DBG_871X("%s selector %d error\n", __func__, selector); exit: @@ -4114,7 +4114,7 @@ static int rtw_wps_start(struct net_device *dev, u32wps_start = *extra; } - DBG_871X( "[%s] wps_start = %d\n", __FUNCTION__, u32wps_start ); + DBG_871X( "[%s] wps_start = %d\n", __func__, u32wps_start ); if ( u32wps_start == 1 ) // WPS Start { @@ -4235,7 +4235,7 @@ static int rtw_p2p_set_go_nego_ssid(struct net_device *dev, struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo= &(padapter->wdinfo); - DBG_871X( "[%s] ssid = %s, len = %zu\n", __FUNCTION__, extra, strlen( extra ) ); + DBG_871X( "[%s] ssid = %s, len = %zu\n", __func__, extra, strlen( extra ) ); _rtw_memcpy( pwdinfo->nego_ssid, extra, strlen( extra ) ); pwdinfo->nego_ssidlen = strlen( extra ); @@ -4276,7 +4276,7 @@ static int rtw_p2p_set_intent(struct net_device *dev, ret = -1; } - DBG_871X( "[%s] intent = %d\n", __FUNCTION__, intent); + DBG_871X( "[%s] intent = %d\n", __func__, intent); return ret; @@ -4316,7 +4316,7 @@ static int rtw_p2p_set_listen_ch(struct net_device *dev, ret = -1; } - DBG_871X( "[%s] listen_ch = %d\n", __FUNCTION__, pwdinfo->listen_channel ); + DBG_871X( "[%s] listen_ch = %d\n", __func__, pwdinfo->listen_channel ); return ret; @@ -4357,7 +4357,7 @@ static int rtw_p2p_set_op_ch(struct net_device *dev, ret = -1; } - DBG_871X( "[%s] op_ch = %d\n", __FUNCTION__, pwdinfo->operating_channel ); + DBG_871X( "[%s] op_ch = %d\n", __func__, pwdinfo->operating_channel ); return ret; @@ -4383,7 +4383,7 @@ static int rtw_p2p_profilefound(struct net_device *dev, // YY => SSID Length // SSID => SSID for persistence group - DBG_871X( "[%s] In value = %s, len = %d\n", __FUNCTION__, extra, wrqu->data.length -1); + DBG_871X( "[%s] In value = %s, len = %d\n", __func__, extra, wrqu->data.length -1); // The upper application should pass the SSID to driver by using this rtw_p2p_profilefound function. @@ -4433,7 +4433,7 @@ static int rtw_p2p_setDN(struct net_device *dev, struct wifidirect_info *pwdinfo= &(padapter->wdinfo); - DBG_871X( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); + DBG_871X( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1 ); _rtw_memset( pwdinfo->device_name, 0x00, WPS_MAX_DEVICE_NAME_LEN ); _rtw_memcpy( pwdinfo->device_name, extra, wrqu->data.length - 1 ); pwdinfo->device_name_len = wrqu->data.length - 1; @@ -4461,7 +4461,7 @@ static int rtw_p2p_get_status(struct net_device *dev, if ( padapter->bShowGetP2PState ) { - DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), + DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), 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[ 4 ], pwdinfo->p2p_peer_interface_addr[ 5 ]); } @@ -4509,7 +4509,7 @@ static int rtw_p2p_get_role(struct net_device *dev, struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); - DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), + DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), 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[ 4 ], pwdinfo->p2p_peer_interface_addr[ 5 ]); @@ -4531,7 +4531,7 @@ static int rtw_p2p_get_peer_ifaddr(struct net_device *dev, struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); - DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), + DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), 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[ 4 ], pwdinfo->p2p_peer_interface_addr[ 5 ]); @@ -4554,7 +4554,7 @@ static int rtw_p2p_get_peer_devaddr(struct net_device *dev, struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); - DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), + DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), pwdinfo->rx_prov_disc_info.peerDevAddr[ 0 ], pwdinfo->rx_prov_disc_info.peerDevAddr[ 1 ], pwdinfo->rx_prov_disc_info.peerDevAddr[ 2 ], pwdinfo->rx_prov_disc_info.peerDevAddr[ 3 ], pwdinfo->rx_prov_disc_info.peerDevAddr[ 4 ], pwdinfo->rx_prov_disc_info.peerDevAddr[ 5 ]); @@ -4578,7 +4578,7 @@ static int rtw_p2p_get_peer_devaddr_by_invitation(struct net_device *dev, struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); - DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __FUNCTION__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), + DBG_871X( "[%s] Role = %d, Status = %d, peer addr = %.2X:%.2X:%.2X:%.2X:%.2X:%.2X\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo), pwdinfo->p2p_peer_device_addr[ 0 ], pwdinfo->p2p_peer_device_addr[ 1 ], pwdinfo->p2p_peer_device_addr[ 2 ], pwdinfo->p2p_peer_device_addr[ 3 ], pwdinfo->p2p_peer_device_addr[ 4 ], pwdinfo->p2p_peer_device_addr[ 5 ]); @@ -4624,7 +4624,7 @@ static int rtw_p2p_get_op_ch(struct net_device *dev, struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); - DBG_871X( "[%s] Op_ch = %02x\n", __FUNCTION__, pwdinfo->operating_channel); + DBG_871X( "[%s] Op_ch = %02x\n", __func__, pwdinfo->operating_channel); sprintf( extra, "\n\nOp_ch=%.2d\n", pwdinfo->operating_channel ); wrqu->data.length = strlen( extra ); @@ -4660,7 +4660,7 @@ static int rtw_p2p_get_wps_configmethod(struct net_device *dev, // After knowing its WPS config method, the application can decide the config method for provisioning discovery. // Format: iwpriv wlanx p2p_get_wpsCM 00:E0:4C:00:00:05 - DBG_871X( "[%s] data = %s\n", __FUNCTION__, ( char* ) extra ); + DBG_871X( "[%s] data = %s\n", __func__, ( char* ) extra ); if ( copy_from_user(peerMACStr, wrqu->data.pointer + 6 , 17) ) { return -EFAULT; } @@ -4733,10 +4733,10 @@ static int rtw_p2p_get_peer_wfd_port(struct net_device *dev, struct iw_point *pdata = &wrqu->data; struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); - DBG_871X( "[%s] p2p_state = %d\n", __FUNCTION__, rtw_p2p_state(pwdinfo) ); + DBG_871X( "[%s] p2p_state = %d\n", __func__, rtw_p2p_state(pwdinfo) ); sprintf( extra, "\n\nPort=%d\n", pwdinfo->wfd_info->peer_rtsp_ctrlport ); - DBG_871X( "[%s] remote port = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); + DBG_871X( "[%s] remote port = %d\n", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport ); wrqu->data.length = strlen( extra ); return ret; @@ -4754,7 +4754,7 @@ static int rtw_p2p_get_peer_wfd_preferred_connection(struct net_device *dev, struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); sprintf( extra, "\n\nwfd_pc=%d\n", pwdinfo->wfd_info->wfd_pc ); - DBG_871X( "[%s] wfd_pc = %d\n", __FUNCTION__, pwdinfo->wfd_info->wfd_pc ); + DBG_871X( "[%s] wfd_pc = %d\n", __func__, pwdinfo->wfd_info->wfd_pc ); wrqu->data.length = strlen( extra ); pwdinfo->wfd_info->wfd_pc = _FALSE; // Reset the WFD preferred connection to P2P @@ -4773,7 +4773,7 @@ static int rtw_p2p_get_peer_wfd_session_available(struct net_device *dev, struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); sprintf( extra, "\n\nwfd_sa=%d\n", pwdinfo->wfd_info->peer_session_avail ); - DBG_871X( "[%s] wfd_sa = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_session_avail ); + DBG_871X( "[%s] wfd_sa = %d\n", __func__, pwdinfo->wfd_info->peer_session_avail ); wrqu->data.length = strlen( extra ); pwdinfo->wfd_info->peer_session_avail = _TRUE; // Reset the WFD session available @@ -4812,7 +4812,7 @@ static int rtw_p2p_get_go_device_address(struct net_device *dev, // The input data is the GO's interface address which the application wants to know its device address. // Format: iwpriv wlanx p2p_get2 go_devadd=00:E0:4C:00:00:05 - DBG_871X( "[%s] data = %s\n", __FUNCTION__, ( char* ) extra ); + DBG_871X( "[%s] data = %s\n", __func__, ( char* ) extra ); if ( copy_from_user(peerMACStr, wrqu->data.pointer + 10 , 17) ) { return -EFAULT; } @@ -4918,7 +4918,7 @@ static int rtw_p2p_get_device_type(struct net_device *dev, // Such user interface could know the device type. // Format: iwpriv wlanx p2p_get2 dev_type=00:E0:4C:00:00:05 - DBG_871X( "[%s] data = %s\n", __FUNCTION__, ( char* ) extra ); + DBG_871X( "[%s] data = %s\n", __func__, ( char* ) extra ); if ( copy_from_user(peerMACStr, wrqu->data.pointer + 9 , 17) ) { return -EFAULT; } @@ -5008,7 +5008,7 @@ static int rtw_p2p_get_device_name(struct net_device *dev, // Such user interface could show peer device's device name instead of ssid. // Format: iwpriv wlanx p2p_get2 devN=00:E0:4C:00:00:05 - DBG_871X( "[%s] data = %s\n", __FUNCTION__, ( char* ) extra ); + DBG_871X( "[%s] data = %s\n", __func__, ( char* ) extra ); if ( copy_from_user(peerMACStr, wrqu->data.pointer + 5 , 17) ) { return -EFAULT; } @@ -5096,7 +5096,7 @@ static int rtw_p2p_get_invitation_procedure(struct net_device *dev, // The application wants to know P2P initation procedure is support or not. // Format: iwpriv wlanx p2p_get2 InvProc=00:E0:4C:00:00:05 - DBG_871X( "[%s] data = %s\n", __FUNCTION__, ( char* ) extra ); + DBG_871X( "[%s] data = %s\n", __func__, ( char* ) extra ); if ( copy_from_user(peerMACStr, wrqu->data.pointer + 8 , 17) ) { return -EFAULT; } @@ -5199,11 +5199,11 @@ static int rtw_p2p_connect(struct net_device *dev, // Format: 00:E0:4C:00:00:05 // Format: 00:E0:4C:00:00:05 - DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); + DBG_871X( "[%s] data = %s\n", __func__, extra ); if ( pwdinfo->p2p_state == P2P_STATE_NONE ) { - DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ ); + DBG_871X( "[%s] WiFi Direct is disable!\n", __func__ ); return ret; } @@ -5276,7 +5276,7 @@ static int rtw_p2p_connect(struct net_device *dev, } #endif // CONFIG_CONCURRENT_MODE - DBG_871X( "[%s] Start PreTx Procedure!\n", __FUNCTION__ ); + DBG_871X( "[%s] Start PreTx Procedure!\n", __func__ ); _set_timer( &pwdinfo->pre_tx_scan_timer, P2P_TX_PRESCAN_TIMEOUT ); #ifdef CONFIG_CONCURRENT_MODE if ( check_fwstate( pbuddy_mlmepriv, _FW_LINKED ) ) @@ -5294,7 +5294,7 @@ static int rtw_p2p_connect(struct net_device *dev, } else { - DBG_871X( "[%s] Not Found in Scanning Queue~\n", __FUNCTION__ ); + DBG_871X( "[%s] Not Found in Scanning Queue~\n", __func__ ); ret = -1; } exit: @@ -5339,17 +5339,17 @@ static int rtw_p2p_invite_req(struct net_device *dev, // Command line sample: iwpriv wlan0 p2p_set invite="00:11:22:33:44:55 00:E0:4C:00:00:05 DIRECT-xy" // Format: 00:11:22:33:44:55 00:E0:4C:00:00:05 DIRECT-xy - DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); + DBG_871X( "[%s] data = %s\n", __func__, extra ); if ( wrqu->data.length <= 37 ) { - DBG_871X( "[%s] Wrong format!\n", __FUNCTION__ ); + DBG_871X( "[%s] Wrong format!\n", __func__ ); return ret; } if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) { - DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ ); + DBG_871X( "[%s] WiFi Direct is disable!\n", __func__ ); return ret; } else @@ -5428,7 +5428,7 @@ static int rtw_p2p_invite_req(struct net_device *dev, u8 wfd_devinfo[ 6 ] = { 0x00 }; uint wfd_devlen = 6; - DBG_871X( "[%s] Found WFD IE!\n", __FUNCTION__ ); + DBG_871X( "[%s] Found WFD IE!\n", __func__ ); if ( rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, wfd_devinfo, &wfd_devlen ) ) { u16 wfd_devinfo_field = 0; @@ -5450,7 +5450,7 @@ static int rtw_p2p_invite_req(struct net_device *dev, if ( _FALSE == pwfd_info->peer_session_avail ) { - DBG_871X( "[%s] WFD Session not avaiable!\n", __FUNCTION__ ); + DBG_871X( "[%s] WFD Session not avaiable!\n", __func__ ); goto exit; } } @@ -5515,7 +5515,7 @@ static int rtw_p2p_invite_req(struct net_device *dev, } else { - DBG_871X( "[%s] NOT Found in the Scanning Queue!\n", __FUNCTION__ ); + DBG_871X( "[%s] NOT Found in the Scanning Queue!\n", __func__ ); } exit: @@ -5559,11 +5559,11 @@ static int rtw_p2p_set_persistent(struct net_device *dev, // 0: disable persistent group functionality // 1: enable persistent group founctionality - DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); + DBG_871X( "[%s] data = %s\n", __func__, extra ); if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) { - DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ ); + DBG_871X( "[%s] WiFi Direct is disable!\n", __func__ ); return ret; } else @@ -5581,7 +5581,7 @@ static int rtw_p2p_set_persistent(struct net_device *dev, pwdinfo->persistent_supported = _FALSE; } } - printk( "[%s] persistent_supported = %d\n", __FUNCTION__, pwdinfo->persistent_supported ); + printk( "[%s] persistent_supported = %d\n", __func__, pwdinfo->persistent_supported ); exit: @@ -5621,11 +5621,11 @@ static int rtw_p2p_set_pc(struct net_device *dev, // 1. Input information is the MAC address which wants to know the Preferred Connection bit (PC bit) // Format: 00:E0:4C:00:00:05 - DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); + DBG_871X( "[%s] data = %s\n", __func__, extra ); if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) { - DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ ); + DBG_871X( "[%s] WiFi Direct is disable!\n", __func__ ); return ret; } @@ -5654,11 +5654,11 @@ static int rtw_p2p_set_pc(struct net_device *dev, { // The P2P Device ID attribute is included in the Beacon frame. // The P2P Device Info attribute is included in the probe response frame. - printk( "[%s] Got P2P IE\n", __FUNCTION__ ); + printk( "[%s] Got P2P IE\n", __func__ ); if ( rtw_get_p2p_attr_content( p2pie, p2pielen, P2P_ATTR_DEVICE_ID, attr_content, &attr_contentlen) ) { // Handle the P2P Device ID attribute of Beacon first - printk( "[%s] P2P_ATTR_DEVICE_ID\n", __FUNCTION__ ); + printk( "[%s] P2P_ATTR_DEVICE_ID\n", __func__ ); if ( _rtw_memcmp( attr_content, peerMAC, ETH_ALEN ) ) { uintPeerChannel = pnetwork->network.Configuration.DSConfig; @@ -5668,7 +5668,7 @@ static int rtw_p2p_set_pc(struct net_device *dev, else if ( rtw_get_p2p_attr_content( p2pie, p2pielen, P2P_ATTR_DEVICE_INFO, attr_content, &attr_contentlen) ) { // Handle the P2P Device Info attribute of probe response - printk( "[%s] P2P_ATTR_DEVICE_INFO\n", __FUNCTION__ ); + printk( "[%s] P2P_ATTR_DEVICE_INFO\n", __func__ ); if ( _rtw_memcmp( attr_content, peerMAC, ETH_ALEN ) ) { uintPeerChannel = pnetwork->network.Configuration.DSConfig; @@ -5683,7 +5683,7 @@ static int rtw_p2p_set_pc(struct net_device *dev, } _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); - printk( "[%s] channel = %d\n", __FUNCTION__, uintPeerChannel ); + printk( "[%s] channel = %d\n", __func__, uintPeerChannel ); if ( uintPeerChannel ) { @@ -5695,7 +5695,7 @@ static int rtw_p2p_set_pc(struct net_device *dev, u8 wfd_devinfo[ 6 ] = { 0x00 }; uint wfd_devlen = 6; - DBG_871X( "[%s] Found WFD IE!\n", __FUNCTION__ ); + DBG_871X( "[%s] Found WFD IE!\n", __func__ ); if ( rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, wfd_devinfo, &wfd_devlen ) ) { u16 wfd_devinfo_field = 0; @@ -5717,7 +5717,7 @@ static int rtw_p2p_set_pc(struct net_device *dev, } else { - DBG_871X( "[%s] NOT Found in the Scanning Queue!\n", __FUNCTION__ ); + DBG_871X( "[%s] NOT Found in the Scanning Queue!\n", __func__ ); } exit: @@ -5742,7 +5742,7 @@ static int rtw_p2p_set_wfd_device_type(struct net_device *dev, // 0: specify to Miracast source device // 1 or others: specify to Miracast sink device (display device) - DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); + DBG_871X( "[%s] data = %s\n", __func__, extra ); if ( extra[ 0 ] == '0' ) // Set to Miracast source device. { @@ -5778,7 +5778,7 @@ static int rtw_p2p_set_scan_result_type(struct net_device *dev, // It will show up all the Miracast source device if this device is sink. // It will show up all the Miracast sink device if this device is source. - DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); + DBG_871X( "[%s] data = %s\n", __func__, extra ); if ( extra[ 0 ] == '0' ) { @@ -5815,11 +5815,11 @@ static int rtw_p2p_set_sa(struct net_device *dev, struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); struct wifi_display_info *pwfd_info = pwdinfo->wfd_info; - DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); + DBG_871X( "[%s] data = %s\n", __func__, extra ); if ( 0 ) { - DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ ); + DBG_871X( "[%s] WiFi Direct is disable!\n", __func__ ); return ret; } else @@ -5837,7 +5837,7 @@ static int rtw_p2p_set_sa(struct net_device *dev, pwdinfo->session_available = _FALSE; } } - printk( "[%s] session available = %d\n", __FUNCTION__, pwdinfo->session_available ); + printk( "[%s] session available = %d\n", __func__, pwdinfo->session_available ); exit: @@ -5883,11 +5883,11 @@ static int rtw_p2p_prov_disc(struct net_device *dev, // Format: 00:E0:4C:00:00:05_pbc // Format: 00:E0:4C:00:00:05_label - DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); + DBG_871X( "[%s] data = %s\n", __func__, extra ); if ( pwdinfo->p2p_state == P2P_STATE_NONE ) { - DBG_871X( "[%s] WiFi Direct is disable!\n", __FUNCTION__ ); + DBG_871X( "[%s] WiFi Direct is disable!\n", __func__ ); return ret; } else @@ -5924,7 +5924,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, } else { - DBG_871X( "[%s] Unknown WPS config methodn", __FUNCTION__ ); + DBG_871X( "[%s] Unknown WPS config methodn", __func__ ); return( ret ); } @@ -5995,7 +5995,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, u8 wfd_devinfo[ 6 ] = { 0x00 }; uint wfd_devlen = 6; - DBG_871X( "[%s] Found WFD IE!\n", __FUNCTION__ ); + DBG_871X( "[%s] Found WFD IE!\n", __func__ ); if ( rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, wfd_devinfo, &wfd_devlen ) ) { u16 wfd_devinfo_field = 0; @@ -6017,7 +6017,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, if ( _FALSE == pwfd_info->peer_session_avail ) { - DBG_871X( "[%s] WFD Session not avaiable!\n", __FUNCTION__ ); + DBG_871X( "[%s] WFD Session not avaiable!\n", __func__ ); goto exit; } } @@ -6026,7 +6026,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, if ( uintPeerChannel ) { - DBG_871X( "[%s] peer channel: %d!\n", __FUNCTION__, uintPeerChannel ); + DBG_871X( "[%s] peer channel: %d!\n", __func__, uintPeerChannel ); #ifdef CONFIG_CONCURRENT_MODE if ( check_fwstate( pbuddy_mlmepriv, _FW_LINKED ) ) { @@ -6084,7 +6084,7 @@ static int rtw_p2p_prov_disc(struct net_device *dev, } else { - DBG_871X( "[%s] NOT Found in the Scanning Queue!\n", __FUNCTION__ ); + DBG_871X( "[%s] NOT Found in the Scanning Queue!\n", __func__ ); } exit: @@ -6106,7 +6106,7 @@ static int rtw_p2p_got_wpsinfo(struct net_device *dev, struct wifidirect_info *pwdinfo = &( padapter->wdinfo ); - DBG_871X( "[%s] data = %s\n", __FUNCTION__, extra ); + DBG_871X( "[%s] data = %s\n", __func__, extra ); // Added by Albert 20110328 // if the input data is P2P_NO_WPSINFO -> reset the wpsinfo // if the input data is P2P_GOT_WPSINFO_PEER_DISPLAY_PIN -> the utility just input the PIN code got from the peer P2P device. @@ -6154,7 +6154,7 @@ static int rtw_p2p_set(struct net_device *dev, struct wifidirect_info *pwdinfo= &(padapter->wdinfo); struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; - DBG_871X( "[%s] extra = %s\n", __FUNCTION__, extra ); + DBG_871X( "[%s] extra = %s\n", __func__, extra ); if ( _rtw_memcmp( extra, "enable=", 7 ) ) { @@ -6273,7 +6273,7 @@ static int rtw_p2p_get(struct net_device *dev, if ( padapter->bShowGetP2PState ) { - DBG_871X( "[%s] extra = %s\n", __FUNCTION__, (char*) wrqu->data.pointer ); + DBG_871X( "[%s] extra = %s\n", __func__, (char*) wrqu->data.pointer ); } if ( _rtw_memcmp( wrqu->data.pointer, "status", 6 ) ) @@ -6346,7 +6346,7 @@ static int rtw_p2p_get2(struct net_device *dev, struct wifidirect_info *pwdinfo= &(padapter->wdinfo); struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; - DBG_871X( "[%s] extra = %s\n", __FUNCTION__, (char*) wrqu->data.pointer ); + DBG_871X( "[%s] extra = %s\n", __func__, (char*) wrqu->data.pointer ); if ( _rtw_memcmp( extra, "wpsCM=", 6 ) ) { @@ -6433,7 +6433,7 @@ static int rtw_rereg_nd_name(struct net_device *dev, rereg_priv->old_ifname[IFNAMSIZ-1] = 0; } - //DBG_871X("%s wrqu->data.length:%d\n", __FUNCTION__, wrqu->data.length); + //DBG_871X("%s wrqu->data.length:%d\n", __func__, wrqu->data.length); if (wrqu->data.length > IFNAMSIZ) return -EFAULT; @@ -6445,7 +6445,7 @@ static int rtw_rereg_nd_name(struct net_device *dev, return ret; } - DBG_871X("%s new_ifname:%s\n", __FUNCTION__, new_ifname); + DBG_871X("%s new_ifname:%s\n", __func__, new_ifname); if ( 0 != (ret = rtw_change_ifname(padapter, new_ifname)) ) { goto exit; } @@ -6461,7 +6461,7 @@ static int rtw_rereg_nd_name(struct net_device *dev, if (_rtw_memcmp(new_ifname, "disable%d", 9) == _TRUE) { - DBG_871X("%s disable\n", __FUNCTION__); + DBG_871X("%s disable\n", __func__); // free network queue for Android's timming issue rtw_free_network_queue(padapter, _TRUE); @@ -7510,7 +7510,7 @@ static int set_group_key(_adapter *padapter, u8 *key, u8 alg, int keyid) struct cmd_priv *pcmdpriv=&(padapter->cmdpriv); int res=_SUCCESS; - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); pcmd = (struct cmd_obj*)rtw_zmalloc(sizeof(struct cmd_obj)); if (pcmd==NULL){ @@ -7600,7 +7600,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, struct security_priv* psecuritypriv=&(padapter->securitypriv); struct sta_priv *pstapriv = &padapter->stapriv; - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); param->u.crypt.err = 0; param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0'; @@ -7732,7 +7732,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, { if (strcmp(param->u.crypt.alg, "WEP") == 0) { - DBG_871X("%s, set group_key, WEP\n", __FUNCTION__); + DBG_871X("%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)); @@ -7745,7 +7745,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, } else if (strcmp(param->u.crypt.alg, "TKIP") == 0) { - DBG_871X("%s, set group_key, TKIP\n", __FUNCTION__); + DBG_871X("%s, set group_key, TKIP\n", __func__); psecuritypriv->dot118021XGrpPrivacy = _TKIP_; @@ -7761,7 +7761,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, } else if (strcmp(param->u.crypt.alg, "CCMP") == 0) { - DBG_871X("%s, set group_key, CCMP\n", __FUNCTION__); + DBG_871X("%s, set group_key, CCMP\n", __func__); psecuritypriv->dot118021XGrpPrivacy = _AES_; @@ -7769,7 +7769,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, } else { - DBG_871X("%s, set group_key, none\n", __FUNCTION__); + DBG_871X("%s, set group_key, none\n", __func__); psecuritypriv->dot118021XGrpPrivacy = _NO_PRIVACY_; } @@ -7805,7 +7805,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, if (strcmp(param->u.crypt.alg, "WEP") == 0) { - DBG_871X("%s, set pairwise key, WEP\n", __FUNCTION__); + DBG_871X("%s, set pairwise key, WEP\n", __func__); psta->dot118021XPrivacy = _WEP40_; if (param->u.crypt.key_len==13) @@ -7815,7 +7815,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, } else if (strcmp(param->u.crypt.alg, "TKIP") == 0) { - DBG_871X("%s, set pairwise key, TKIP\n", __FUNCTION__); + DBG_871X("%s, set pairwise key, TKIP\n", __func__); psta->dot118021XPrivacy = _TKIP_; @@ -7830,13 +7830,13 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, else if (strcmp(param->u.crypt.alg, "CCMP") == 0) { - DBG_871X("%s, set pairwise key, CCMP\n", __FUNCTION__); + DBG_871X("%s, set pairwise key, CCMP\n", __func__); psta->dot118021XPrivacy = _AES_; } else { - DBG_871X("%s, set pairwise key, none\n", __FUNCTION__); + DBG_871X("%s, set pairwise key, none\n", __func__); psta->dot118021XPrivacy = _NO_PRIVACY_; } @@ -7924,7 +7924,7 @@ static int rtw_set_beacon(struct net_device *dev, struct ieee_param *param, int unsigned char *pbuf = param->u.bcn_ie.buf; - DBG_871X("%s, len=%d\n", __FUNCTION__, len); + DBG_871X("%s, len=%d\n", __func__, len); if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) return -EINVAL; @@ -7954,7 +7954,7 @@ static int rtw_hostapd_sta_flush(struct net_device *dev) _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); //struct sta_priv *pstapriv = &padapter->stapriv; - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); flush_all_cam_entry(padapter); //clear CAM @@ -8261,7 +8261,7 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param, struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); int ie_len; - DBG_871X("%s, len=%d\n", __FUNCTION__, len); + DBG_871X("%s, len=%d\n", __func__, len); if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) return -EINVAL; @@ -8280,7 +8280,7 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param, pmlmepriv->wps_beacon_ie = rtw_malloc(ie_len); pmlmepriv->wps_beacon_ie_len = ie_len; if ( pmlmepriv->wps_beacon_ie == NULL) { - DBG_871X("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); + DBG_871X("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__); return -EINVAL; } @@ -8304,7 +8304,7 @@ static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *par struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); int ie_len; - DBG_871X("%s, len=%d\n", __FUNCTION__, len); + DBG_871X("%s, len=%d\n", __func__, len); if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) return -EINVAL; @@ -8323,7 +8323,7 @@ static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *par pmlmepriv->wps_probe_resp_ie = rtw_malloc(ie_len); pmlmepriv->wps_probe_resp_ie_len = ie_len; if ( pmlmepriv->wps_probe_resp_ie == NULL) { - DBG_871X("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); + DBG_871X("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__); return -EINVAL; } _rtw_memcpy(pmlmepriv->wps_probe_resp_ie, param->u.bcn_ie.buf, ie_len); @@ -8341,7 +8341,7 @@ static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *par struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); int ie_len; - DBG_871X("%s, len=%d\n", __FUNCTION__, len); + DBG_871X("%s, len=%d\n", __func__, len); if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE) return -EINVAL; @@ -8360,7 +8360,7 @@ static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *par pmlmepriv->wps_assoc_resp_ie = rtw_malloc(ie_len); pmlmepriv->wps_assoc_resp_ie_len = ie_len; if ( pmlmepriv->wps_assoc_resp_ie == NULL) { - DBG_871X("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); + DBG_871X("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__); return -EINVAL; } @@ -8387,7 +8387,7 @@ static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param, if (param->u.wpa_param.name != 0) //dummy test... { - DBG_871X("%s name(%u) != 0\n", __FUNCTION__, param->u.wpa_param.name); + DBG_871X("%s name(%u) != 0\n", __func__, param->u.wpa_param.name); } value = param->u.wpa_param.value; @@ -8396,7 +8396,7 @@ static int rtw_set_hidden_ssid(struct net_device *dev, struct ieee_param *param, if (value != 1 && value != 2) value = 0; - DBG_871X("%s value(%u)\n", __FUNCTION__, value); + DBG_871X("%s value(%u)\n", __func__, value); pmlmeinfo->hidden_ssid_mode = value; return ret; @@ -8467,7 +8467,7 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p) int ret=0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - //DBG_871X("%s\n", __FUNCTION__); + //DBG_871X("%s\n", __func__); /* * this function is expect to call in master mode, which allows no power saving @@ -8500,7 +8500,7 @@ static int rtw_hostapd_ioctl(struct net_device *dev, struct iw_point *p) goto out; } - //DBG_871X("%s, cmd=%d\n", __FUNCTION__, param->cmd); + //DBG_871X("%s, cmd=%d\n", __func__, param->cmd); switch (param->cmd) { @@ -8681,7 +8681,7 @@ static int rtw_wx_set_priv(struct net_device *dev, pmlmepriv->wps_probe_req_ie = rtw_malloc(cp_sz); if ( pmlmepriv->wps_probe_req_ie == NULL) { - printk("%s()-%d: rtw_malloc() ERROR!\n", __FUNCTION__, __LINE__); + printk("%s()-%d: rtw_malloc() ERROR!\n", __func__, __LINE__); ret = -EINVAL; goto FREE_EXT; @@ -8759,7 +8759,7 @@ static int rtw_wx_set_priv(struct net_device *dev, break; default : #ifdef CONFIG_DEBUG_RTW_WX_SET_PRIV - DBG_871X("%s: %s unknowned req=%s\n", __FUNCTION__, + DBG_871X("%s: %s unknowned req=%s\n", __func__, dev->name, ext_dbg); #endif @@ -8771,7 +8771,7 @@ static int rtw_wx_set_priv(struct net_device *dev, ret = -EFAULT; #ifdef CONFIG_DEBUG_RTW_WX_SET_PRIV - DBG_871X("%s: %s req=%s rep=%s dwrq->length=%d, strlen(ext)+1=%d\n", __FUNCTION__, + DBG_871X("%s: %s req=%s rep=%s dwrq->length=%d, strlen(ext)+1=%d\n", __func__, dev->name, ext_dbg ,ext, dwrq->length, (u16)(strlen(ext)+1)); #endif #endif //end of CONFIG_ANDROID @@ -8799,7 +8799,7 @@ static int rtw_pm_set(struct net_device *dev, unsigned mode = 0; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - DBG_871X( "[%s] extra = %s\n", __FUNCTION__, extra ); + DBG_871X( "[%s] extra = %s\n", __func__, extra ); if ( _rtw_memcmp( extra, "lps=", 4 ) ) { @@ -8875,7 +8875,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, #endif pch = extra; - DBG_871X("%s: in=%s\n", __FUNCTION__, extra); + DBG_871X("%s: in=%s\n", __func__, extra); i = 0; //mac 16 "00e04c871200" rmap,00,2 @@ -8923,7 +8923,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, mapLen = EFUSE_MAP_SIZE; if (rtw_efuse_map_read(padapter, 0, mapLen, pEfuseHal->fakeEfuseInitMap) == _FAIL) { - DBG_871X("%s: read realmap Fail!!\n", __FUNCTION__); + DBG_871X("%s: read realmap Fail!!\n", __func__); err = -EFAULT; goto exit; } @@ -8953,40 +8953,40 @@ static int rtw_mp_efuse_get(struct net_device *dev, { if ((tmp[1]==NULL) || (tmp[2]==NULL)) { - DBG_871X("%s: rmap Fail!! Parameters error!\n", __FUNCTION__); + DBG_871X("%s: rmap Fail!! Parameters error!\n", __func__); err = -EINVAL; goto exit; } // rmap addr cnts addr = simple_strtoul(tmp[1], &ptmp, 16); - DBG_871X("%s: addr=%x\n", __FUNCTION__, addr); + DBG_871X("%s: addr=%x\n", __func__, addr); cnts = simple_strtoul(tmp[2], &ptmp, 10); if (cnts == 0) { - DBG_871X("%s: rmap Fail!! cnts error!\n", __FUNCTION__); + DBG_871X("%s: rmap Fail!! cnts error!\n", __func__); err = -EINVAL; goto exit; } - DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts); + DBG_871X("%s: cnts=%d\n", __func__, cnts); EFUSE_GetEfuseDefinition(padapter, EFUSE_WIFI, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); if ((addr + cnts) > max_available_size) { - DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); + DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts); err = -EINVAL; goto exit; } if (rtw_efuse_map_read(padapter, addr, cnts, data) == _FAIL) { - DBG_871X("%s: rtw_efuse_map_read error!\n", __FUNCTION__); + DBG_871X("%s: rtw_efuse_map_read error!\n", __func__); err = -EFAULT; goto exit; } -// DBG_871X("%s: data={", __FUNCTION__); +// DBG_871X("%s: data={", __func__); *extra = 0; for (i=0; i max_available_size) { - DBG_871X("%s: addr(0x%02x)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); + DBG_871X("%s: addr(0x%02x)+cnts(%d) parameter error!\n", __func__, addr, cnts); err = -EFAULT; goto exit; } if (rtw_efuse_map_read(padapter, addr, cnts, data) == _FAIL) { - DBG_871X("%s: rtw_efuse_map_read error!\n", __FUNCTION__); + DBG_871X("%s: rtw_efuse_map_read error!\n", __func__); err = -EFAULT; goto exit; } -// DBG_871X("%s: MAC address={", __FUNCTION__); +// DBG_871X("%s: MAC address={", __func__); *extra = 0; for (i=0; i max_available_size) { - DBG_871X("%s: addr(0x%02x)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); + DBG_871X("%s: addr(0x%02x)+cnts(%d) parameter error!\n", __func__, addr, cnts); err = -EFAULT; goto exit; } if (rtw_efuse_map_read(padapter, addr, cnts, data) == _FAIL) { - DBG_871X("%s: rtw_efuse_access error!!\n", __FUNCTION__); + DBG_871X("%s: rtw_efuse_access error!!\n", __func__); err = -EFAULT; goto exit; } -// DBG_871X("%s: {VID,PID}={", __FUNCTION__); +// DBG_871X("%s: {VID,PID}={", __func__); *extra = 0; for (i=0; iBTEfuseInitMap) == _FAIL) { - DBG_871X("%s: rtw_BT_efuse_map_read Fail!!\n", __FUNCTION__); + DBG_871X("%s: rtw_BT_efuse_map_read Fail!!\n", __func__); err = -EFAULT; goto exit; } @@ -9158,7 +9158,7 @@ static int rtw_mp_efuse_get(struct net_device *dev, mapLen = EFUSE_BT_MAX_MAP_LEN; if (rtw_BT_efuse_map_read(padapter, 0, mapLen, pEfuseHal->BTEfuseInitMap) == _FAIL) { - DBG_871X("%s: rtw_BT_efuse_map_read Fail!!\n", __FUNCTION__); + DBG_871X("%s: rtw_BT_efuse_map_read Fail!!\n", __func__); err = -EFAULT; goto exit; } @@ -9195,34 +9195,34 @@ static int rtw_mp_efuse_get(struct net_device *dev, // rmap addr cnts addr = simple_strtoul(tmp[1], &ptmp, 16); - DBG_871X("%s: addr=0x%X\n", __FUNCTION__, addr); + DBG_871X("%s: addr=0x%X\n", __func__, addr); cnts = simple_strtoul(tmp[2], &ptmp, 10); if (cnts == 0) { - DBG_871X("%s: btrmap Fail!! cnts error!\n", __FUNCTION__); + DBG_871X("%s: btrmap Fail!! cnts error!\n", __func__); err = -EINVAL; goto exit; } - DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts); + DBG_871X("%s: cnts=%d\n", __func__, cnts); EFUSE_GetEfuseDefinition(padapter, EFUSE_BT, TYPE_AVAILABLE_EFUSE_BYTES_TOTAL, (PVOID)&max_available_size, _FALSE); if ((addr + cnts) > max_available_size) { - DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); + DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts); err = -EFAULT; goto exit; } if (rtw_BT_efuse_map_read(padapter, addr, cnts, data) == _FAIL) { - DBG_871X("%s: rtw_BT_efuse_map_read error!!\n", __FUNCTION__); + DBG_871X("%s: rtw_BT_efuse_map_read error!!\n", __func__); err = -EFAULT; goto exit; } *extra = 0; -// DBG_871X("%s: bt efuse data={", __FUNCTION__); +// DBG_871X("%s: bt efuse data={", __func__); for (i=0; i max_available_size) { - DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); + DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts); err = -EFAULT; goto exit; } if (rtw_efuse_map_write(padapter, addr, cnts, setdata) == _FAIL) { - DBG_871X("%s: rtw_efuse_map_write error!!\n", __FUNCTION__); + DBG_871X("%s: rtw_efuse_map_write error!!\n", __func__); err = -EFAULT; goto exit; } @@ -9475,9 +9475,9 @@ static int rtw_mp_efuse_set(struct net_device *dev, goto exit; } - DBG_871X("%s: addr=0x%X\n", __FUNCTION__, addr); - DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts); - DBG_871X("%s: raw data=%s\n", __FUNCTION__, tmp[2]); + DBG_871X("%s: addr=0x%X\n", __func__, addr); + DBG_871X("%s: cnts=%d\n", __func__, cnts); + DBG_871X("%s: raw data=%s\n", __func__, tmp[2]); for (jj=0, kk=0; jj 6) { - DBG_871X("%s: error data for mac addr=\"%s\"\n", __FUNCTION__, tmp[1]); + DBG_871X("%s: error data for mac addr=\"%s\"\n", __func__, tmp[1]); err = -EFAULT; goto exit; } - DBG_871X("%s: addr=0x%X\n", __FUNCTION__, addr); - DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts); - DBG_871X("%s: MAC address=%s\n", __FUNCTION__, tmp[1]); + DBG_871X("%s: addr=0x%X\n", __func__, addr); + DBG_871X("%s: cnts=%d\n", __func__, cnts); + DBG_871X("%s: MAC address=%s\n", __func__, tmp[1]); for (jj=0, kk=0; jj max_available_size) { - DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); + DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts); err = -EFAULT; goto exit; } if (rtw_efuse_map_write(padapter, addr, cnts, setdata) == _FAIL) { - DBG_871X("%s: rtw_efuse_map_write error!!\n", __FUNCTION__); + DBG_871X("%s: rtw_efuse_map_write error!!\n", __func__); err = -EFAULT; goto exit; } @@ -9615,9 +9615,9 @@ static int rtw_mp_efuse_set(struct net_device *dev, goto exit; } - DBG_871X("%s: addr=0x%X\n", __FUNCTION__, addr); - DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts); - DBG_871X("%s: VID/PID=%s\n", __FUNCTION__, tmp[1]); + DBG_871X("%s: addr=0x%X\n", __func__, addr); + DBG_871X("%s: cnts=%d\n", __func__, cnts); + DBG_871X("%s: VID/PID=%s\n", __func__, tmp[1]); for (jj=0, kk=0; jj max_available_size) { - DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); + DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts); err = -EFAULT; goto exit; } if (rtw_efuse_map_write(padapter, addr, cnts, setdata) == _FAIL) { - DBG_871X("%s: rtw_efuse_map_write error!!\n", __FUNCTION__); + DBG_871X("%s: rtw_efuse_map_write error!!\n", __func__); err = -EFAULT; goto exit; } @@ -9663,9 +9663,9 @@ static int rtw_mp_efuse_set(struct net_device *dev, goto exit; } - DBG_871X("%s: addr=0x%X\n", __FUNCTION__, addr); - DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts); - DBG_871X("%s: BT data=%s\n", __FUNCTION__, tmp[2]); + DBG_871X("%s: addr=0x%X\n", __func__, addr); + DBG_871X("%s: cnts=%d\n", __func__, cnts); + DBG_871X("%s: BT data=%s\n", __func__, tmp[2]); for (jj=0, kk=0; jj max_available_size) { - DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __FUNCTION__, addr, cnts); + DBG_871X("%s: addr(0x%X)+cnts(%d) parameter error!\n", __func__, addr, cnts); err = -EFAULT; goto exit; } if (rtw_BT_efuse_map_write(padapter, addr, cnts, setdata) == _FAIL) { - DBG_871X("%s: rtw_BT_efuse_map_write error!!\n", __FUNCTION__); + DBG_871X("%s: rtw_BT_efuse_map_write error!!\n", __func__); err = -EFAULT; goto exit; } @@ -9711,9 +9711,9 @@ static int rtw_mp_efuse_set(struct net_device *dev, goto exit; } - DBG_871X("%s: addr=0x%X\n", __FUNCTION__, addr); - DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts); - DBG_871X("%s: BT tmp data=%s\n", __FUNCTION__, tmp[2]); + DBG_871X("%s: addr=0x%X\n", __func__, addr); + DBG_871X("%s: cnts=%d\n", __func__, cnts); + DBG_871X("%s: BT tmp data=%s\n", __func__, tmp[2]); for (jj=0, kk=0; jjfakeBTEfuseModifiedMap) == _SUCCESS) { - DBG_871X("%s: BT read all map success\n", __FUNCTION__); + DBG_871X("%s: BT read all map success\n", __func__); } else { - DBG_871X("%s: BT read all map Fail!\n", __FUNCTION__); + DBG_871X("%s: BT read all map Fail!\n", __func__); err = -EFAULT; } } else if (strcmp(tmp[0], "wldumpfake") == 0) { if (rtw_efuse_map_read(padapter, 0, EFUSE_BT_MAX_MAP_LEN, pEfuseHal->fakeEfuseModifiedMap) == _SUCCESS) { - DBG_871X("%s: BT read all map success\n", __FUNCTION__); + DBG_871X("%s: BT read all map success\n", __func__); } else { - DBG_871X("%s: BT read all map Fail\n", __FUNCTION__); + DBG_871X("%s: BT read all map Fail\n", __func__); err = -EFAULT; } } @@ -9751,7 +9751,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, if (rtw_BT_efuse_map_write(padapter, 0x00, EFUSE_BT_MAX_MAP_LEN, pEfuseHal->fakeBTEfuseModifiedMap) == _FAIL) { - DBG_871X("%s: rtw_BT_efuse_map_write error!\n", __FUNCTION__); + DBG_871X("%s: rtw_BT_efuse_map_write error!\n", __func__); err = -EFAULT; goto exit; } @@ -9767,7 +9767,7 @@ static int rtw_mp_efuse_set(struct net_device *dev, if (rtw_efuse_map_write(padapter, 0x00, EFUSE_MAX_MAP_LEN, pEfuseHal->fakeEfuseModifiedMap) == _FAIL) { - DBG_871X("%s: rtw_efuse_map_write error!\n", __FUNCTION__); + DBG_871X("%s: rtw_efuse_map_write error!\n", __func__); err = -EFAULT; goto exit; } @@ -9796,9 +9796,9 @@ static int rtw_mp_efuse_set(struct net_device *dev, goto exit; } - DBG_871X("%s: addr=0x%X\n", __FUNCTION__, addr); - DBG_871X("%s: cnts=%d\n", __FUNCTION__, cnts); - DBG_871X("%s: map tmp data=%s\n", __FUNCTION__, tmp[2]); + DBG_871X("%s: addr=0x%X\n", __func__, addr); + DBG_871X("%s: cnts=%d\n", __func__, cnts); + DBG_871X("%s: map tmp data=%s\n", __func__, tmp[2]); for (jj=0, kk=0; jjdata.length -1 ); + printk( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1 ); if ( extra[ 0 ] == '0' ) { @@ -11304,7 +11304,7 @@ static int rtw_tdls_weaksec(struct net_device *dev, u8 i, j; _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - DBG_871X( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); + DBG_871X( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1 ); if ( extra[ 0 ] == '0' ) { @@ -11338,7 +11338,7 @@ static int rtw_tdls_enable(struct net_device *dev, u8 tdls_sta[NUM_STA][ETH_ALEN]; u8 empty_hwaddr[ETH_ALEN] = { 0x00 }; - printk( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); + printk( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1 ); _rtw_memset(tdls_sta, 0x00, sizeof(tdls_sta)); @@ -11405,7 +11405,7 @@ static int rtw_tdls_setup(struct net_device *dev, struct wifidirect_info *pwdinfo= &(padapter->wdinfo); #endif // CONFIG_WFD - printk( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); + printk( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1 ); for ( i=0, j=0 ; i < ETH_ALEN; i++, j+=3 ){ mac_addr[i]=key_2char2num(*(extra+j), *(extra+j+1)); @@ -11418,7 +11418,7 @@ static int rtw_tdls_setup(struct net_device *dev, if ( 0 == pwdinfo->wfd_tdls_weaksec ) { // Can't send the tdls setup request out!! - DBG_871X( "[%s] Current link is not AES, SKIP sending the tdls setup request!!\n", __FUNCTION__ ); + DBG_871X( "[%s] Current link is not AES, SKIP sending the tdls setup request!!\n", __func__ ); } else { @@ -11448,7 +11448,7 @@ static int rtw_tdls_teardown(struct net_device *dev, struct sta_info *ptdls_sta = NULL; u8 mac_addr[ETH_ALEN]; - DBG_871X( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); + DBG_871X( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1 ); for ( i=0, j=0 ; i < ETH_ALEN; i++, j+=3 ){ mac_addr[i]=key_2char2num(*(extra+j), *(extra+j+1)); @@ -11479,7 +11479,7 @@ static int rtw_tdls_discovery(struct net_device *dev, struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); - DBG_871X( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); + DBG_871X( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1 ); issue_tdls_dis_req(padapter, NULL); @@ -11501,7 +11501,7 @@ static int rtw_tdls_ch_switch (struct net_device *dev, u8 i, j, mac_addr[ETH_ALEN]; struct sta_info *ptdls_sta = NULL; - DBG_8192C( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); + DBG_8192C( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1 ); for ( i=0, j=0 ; i < ETH_ALEN; i++, j+=3 ){ mac_addr[i]=key_2char2num(*(extra+j), *(extra+j+1)); @@ -11533,7 +11533,7 @@ static int rtw_tdls_pson(struct net_device *dev, u8 i, j, mac_addr[ETH_ALEN]; struct sta_info *ptdls_sta = NULL; - DBG_871X( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); + DBG_871X( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1 ); for ( i=0, j=0 ; i < ETH_ALEN; i++, j+=3 ){ mac_addr[i]=key_2char2num(*(extra+j), *(extra+j+1)); @@ -11562,7 +11562,7 @@ static int rtw_tdls_psoff(struct net_device *dev, u8 i, j, mac_addr[ETH_ALEN]; struct sta_info *ptdls_sta = NULL; - DBG_8192C( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); + DBG_8192C( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1 ); for ( i=0, j=0 ; i < ETH_ALEN; i++, j+=3 ){ mac_addr[i]=key_2char2num(*(extra+j), *(extra+j+1)); @@ -11591,7 +11591,7 @@ static int rtw_tdls_setip(struct net_device *dev, struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info; u8 i=0, j=0, k=0, tag=0, ip[3] = { 0xff }, *ptr = extra; - printk( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length - 1 ); + printk( "[%s] %s %d\n", __func__, extra, wrqu->data.length - 1 ); while ( i < 4 ) @@ -11614,7 +11614,7 @@ static int rtw_tdls_setip(struct net_device *dev, i++; } - printk( "[%s] Set IP = %u.%u.%u.%u\n", __FUNCTION__, + printk( "[%s] Set IP = %u.%u.%u.%u\n", __func__, ptdlsinfo->wfd_info->ip_address[0], ptdlsinfo->wfd_info->ip_address[1], ptdlsinfo->wfd_info->ip_address[2], ptdlsinfo->wfd_info->ip_address[3] ); @@ -11638,14 +11638,14 @@ static int rtw_tdls_getip(struct net_device *dev, struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info; - printk( "[%s]\n", __FUNCTION__); + printk( "[%s]\n", __func__); sprintf( extra, "\n\n%u.%u.%u.%u\n", pwfd_info->peer_ip_address[0], pwfd_info->peer_ip_address[1], pwfd_info->peer_ip_address[2], pwfd_info->peer_ip_address[3] ); - printk( "[%s] IP=%u.%u.%u.%u\n", __FUNCTION__, + printk( "[%s] IP=%u.%u.%u.%u\n", __func__, pwfd_info->peer_ip_address[0], pwfd_info->peer_ip_address[1], pwfd_info->peer_ip_address[2], pwfd_info->peer_ip_address[3] ); @@ -11672,10 +11672,10 @@ static int rtw_tdls_getport(struct net_device *dev, struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info; - printk( "[%s]\n", __FUNCTION__); + printk( "[%s]\n", __func__); sprintf( extra, "\n\n%d\n", pwfd_info->peer_rtsp_ctrlport ); - printk( "[%s] remote port = %d\n", __FUNCTION__, pwfd_info->peer_rtsp_ctrlport ); + printk( "[%s] remote port = %d\n", __func__, pwfd_info->peer_rtsp_ctrlport ); wrqu->data.length = strlen( extra ); @@ -11701,7 +11701,7 @@ static int rtw_tdls_dis_result(struct net_device *dev, struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info; - printk( "[%s]\n", __FUNCTION__); + printk( "[%s]\n", __func__); if (ptdlsinfo->dev_discovered == 1 ) { @@ -11733,7 +11733,7 @@ static int rtw_wfd_tdls_status(struct net_device *dev, struct tdls_info *ptdlsinfo = &padapter->tdlsinfo; struct wifi_display_info *pwfd_info = ptdlsinfo->wfd_info; - printk( "[%s]\n", __FUNCTION__); + printk( "[%s]\n", __func__); if (ptdlsinfo->setup_state == TDLS_LINKED_STATE ) { @@ -11765,7 +11765,7 @@ static int rtw_tdls_ch_switch_off(struct net_device *dev, u8 i, j, mac_addr[ETH_ALEN]; struct sta_info *ptdls_sta = NULL; - DBG_871X( "[%s] %s %d\n", __FUNCTION__, extra, wrqu->data.length -1 ); + DBG_871X( "[%s] %s %d\n", __func__, extra, wrqu->data.length -1 ); for ( i=0, j=0 ; i < ETH_ALEN; i++, j+=3 ){ mac_addr[i]=key_2char2num(*(extra+j), *(extra+j+1)); @@ -11796,7 +11796,7 @@ static int rtw_tdls(struct net_device *dev, #ifdef CONFIG_TDLS _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); - DBG_871X( "[%s] extra = %s\n", __FUNCTION__, extra ); + DBG_871X( "[%s] extra = %s\n", __func__, extra ); // WFD Sigma will use the tdls enable command to let the driver know we want to test the tdls now! if ( _rtw_memcmp( extra, "wfdenable=", 10 ) ) { @@ -11884,7 +11884,7 @@ static int rtw_tdls_get(struct net_device *dev, #ifdef CONFIG_WFD - DBG_871X( "[%s] extra = %s\n", __FUNCTION__, (char*) wrqu->data.pointer ); + DBG_871X( "[%s] extra = %s\n", __func__, (char*) wrqu->data.pointer ); if ( _rtw_memcmp( wrqu->data.pointer, "ip", 2 ) ) { @@ -11942,7 +11942,7 @@ static int rtw_widi_set_probe_request(struct net_device *dev, intel_widi_wk_cmd(padapter, INTEL_WIDI_ISSUE_PROB_WK, pbuf); } #else - DBG_871X( "[%s] len = %d\n", __FUNCTION__,wrqu->data.length); + DBG_871X( "[%s] len = %d\n", __func__,wrqu->data.length); issue_probereq_widi(padapter, wrqu->data.pointer); #endif diff --git a/os_dep/mlme_linux.c b/os_dep/mlme_linux.c index 3a914f3..e687755 100644 --- a/os_dep/mlme_linux.c +++ b/os_dep/mlme_linux.c @@ -416,7 +416,7 @@ static int mgnt_xmit_entry(struct sk_buff *skb, struct net_device *pnetdev) struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev); _adapter *padapter = (_adapter *)phostapdpriv->padapter; - //DBG_871X("%s\n", __FUNCTION__); + //DBG_871X("%s\n", __func__); return rtw_hal_hostap_mgnt_xmit_entry(padapter, skb); } @@ -446,7 +446,7 @@ static int mgnt_netdev_close(struct net_device *pnetdev) { struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev); - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); usb_kill_anchored_urbs(&phostapdpriv->anchored); diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index 754e29b..4763e31 100644 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -1999,7 +1999,7 @@ void netdev_br_init(struct net_device *netdev) memcpy(adapter->br_mac, br_netdev->dev_addr, ETH_ALEN); dev_put(br_netdev); } 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; @@ -2141,7 +2141,7 @@ int ips_netdrv_open(_adapter *padapter) { int status = _SUCCESS; padapter->net_closed = _FALSE; - DBG_871X("===> %s.........\n",__FUNCTION__); + DBG_871X("===> %s.........\n",__func__); padapter->bDriverStopped = _FALSE; @@ -2209,7 +2209,7 @@ void rtw_ips_dev_unload(_adapter *padapter) { struct net_device *pnetdev= (struct net_device*)padapter->pnetdev; struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); - DBG_871X("====> %s...\n",__FUNCTION__); + DBG_871X("====> %s...\n",__func__); rtw_hal_set_hwreg(padapter, HW_VAR_FIFO_CLEARN_UP, 0); diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 56d3894..1eff3de 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -390,7 +390,7 @@ void rtw_update_mem_stat(u8 flag, u32 sz) inline u8* dbg_rtw_vmalloc(u32 sz, const char *func, int line) { u8 *p; - //DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); + //DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __func__, (sz)); p=_rtw_vmalloc((sz)); @@ -405,7 +405,7 @@ inline u8* dbg_rtw_vmalloc(u32 sz, const char *func, int line) inline u8* dbg_rtw_zvmalloc(u32 sz, const char *func, int line) { u8 *p; - //DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); + //DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __func__, (sz)); p=_rtw_zvmalloc((sz)); @@ -419,7 +419,7 @@ inline u8* dbg_rtw_zvmalloc(u32 sz, const char *func, int line) inline void dbg_rtw_vmfree(u8 *pbuf, u32 sz, const char *func, int line) { - //DBG_871X("DBG_MEM_ALLOC %s:%d %s(%p,%d)\n", func, line, __FUNCTION__, (pbuf), (sz)); + //DBG_871X("DBG_MEM_ALLOC %s:%d %s(%p,%d)\n", func, line, __func__, (pbuf), (sz)); _rtw_vmfree((pbuf), (sz)); @@ -435,7 +435,7 @@ inline u8* dbg_rtw_malloc(u32 sz, const char *func, int line) u8 *p; if ((sz)>4096) - DBG_871X("DBG_MEM_ALLOC !!!!!!!!!!!!!! %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); + DBG_871X("DBG_MEM_ALLOC !!!!!!!!!!!!!! %s:%d %s(%d)\n", func, line, __func__, (sz)); p=_rtw_malloc((sz)); @@ -452,7 +452,7 @@ inline u8* dbg_rtw_zmalloc(u32 sz, const char *func, int line) u8 *p; if ((sz)>4096) - DBG_871X("DBG_MEM_ALLOC !!!!!!!!!!!!!! %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); + DBG_871X("DBG_MEM_ALLOC !!!!!!!!!!!!!! %s:%d %s(%d)\n", func, line, __func__, (sz)); p = _rtw_zmalloc((sz)); @@ -468,7 +468,7 @@ inline u8* dbg_rtw_zmalloc(u32 sz, const char *func, int line) inline void dbg_rtw_mfree(u8 *pbuf, u32 sz, const char *func, int line) { if ((sz)>4096) - DBG_871X("DBG_MEM_ALLOC !!!!!!!!!!!!!! %s:%d %s(%p,%d)\n", func, line, __FUNCTION__, (pbuf), (sz)); + DBG_871X("DBG_MEM_ALLOC !!!!!!!!!!!!!! %s:%d %s(%p,%d)\n", func, line, __func__, (pbuf), (sz)); _rtw_mfree((pbuf), (sz)); @@ -486,7 +486,7 @@ void* rtw_malloc2d(int h, int w, int size) void **a = (void **) rtw_zmalloc( h*sizeof(void *) + h*w*size ); if (a == NULL) { - DBG_871X("%s: alloc memory fail!\n", __FUNCTION__); + DBG_871X("%s: alloc memory fail!\n", __func__); return NULL; } @@ -594,7 +594,7 @@ struct sk_buff * dev_alloc_skb(unsigned int size) skb->tail = (unsigned char*)data; skb->end = (unsigned char*)data + size; skb->len = 0; - //printf("%s()-%d: skb=%p, skb->head = %p\n", __FUNCTION__, __LINE__, skb, skb->head); + //printf("%s()-%d: skb=%p, skb->head = %p\n", __func__, __LINE__, skb, skb->head); out: return skb; @@ -607,10 +607,10 @@ goto out; void dev_kfree_skb_any(struct sk_buff *skb) { - //printf("%s()-%d: skb->head = %p\n", __FUNCTION__, __LINE__, skb->head); + //printf("%s()-%d: skb->head = %p\n", __func__, __LINE__, skb->head); if (skb->head) _rtw_mfree(skb->head, 0); - //printf("%s()-%d: skb = %p\n", __FUNCTION__, __LINE__, skb); + //printf("%s()-%d: skb = %p\n", __func__, __LINE__, skb); if (skb) _rtw_mfree((u8 *)skb, 0); } @@ -907,7 +907,7 @@ void rtw_mtx_lock(_lock *plock){ mtx_lock(&prtw_lock->glock); } else{ - printf("%s prtw_lock==NULL",__FUNCTION__); + printf("%s prtw_lock==NULL",__func__); } } void rtw_mtx_unlock(_lock *plock){ @@ -915,7 +915,7 @@ void rtw_mtx_unlock(_lock *plock){ mtx_unlock(&prtw_lock->glock); } else{ - printf("%s prtw_lock==NULL",__FUNCTION__); + printf("%s prtw_lock==NULL",__func__); } } @@ -1183,13 +1183,13 @@ void _rtw_mdelay_os(int ms, const char *func, const int line) { #if 0 if (ms>10) - DBG_871X("%s:%d %s(%d)\n", func, line, __FUNCTION__, ms); + DBG_871X("%s:%d %s(%d)\n", func, line, __func__, ms); rtw_msleep_os(ms); return; #endif - DBG_871X("%s:%d %s(%d)\n", func, line, __FUNCTION__, ms); + DBG_871X("%s:%d %s(%d)\n", func, line, __func__, ms); #if defined(PLATFORM_LINUX) @@ -1208,14 +1208,14 @@ void _rtw_udelay_os(int us, const char *func, const int line) #if 0 if (us > 1000) { - DBG_871X("%s:%d %s(%d)\n", func, line, __FUNCTION__, us); + DBG_871X("%s:%d %s(%d)\n", func, line, __func__, us); rtw_usleep_os(us); return; } #endif - DBG_871X("%s:%d %s(%d)\n", func, line, __FUNCTION__, us); + DBG_871X("%s:%d %s(%d)\n", func, line, __func__, us); #if defined(PLATFORM_LINUX) @@ -1322,7 +1322,7 @@ inline void rtw_lock_suspend() #endif #if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER) - //DBG_871X("####%s: suspend_lock_count:%d####\n", __FUNCTION__, rtw_suspend_lock.stat.count); + //DBG_871X("####%s: suspend_lock_count:%d####\n", __func__, rtw_suspend_lock.stat.count); #endif } @@ -1335,7 +1335,7 @@ inline void rtw_unlock_suspend() #endif #if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER) - //DBG_871X("####%s: suspend_lock_count:%d####\n", __FUNCTION__, rtw_suspend_lock.stat.count); + //DBG_871X("####%s: suspend_lock_count:%d####\n", __func__, rtw_suspend_lock.stat.count); #endif } @@ -1584,20 +1584,20 @@ static int retriveFromFile(char *path, u8* buf, u32 sz) if (path && buf) { if ( 0 == (ret=openFile(&fp,path, O_RDONLY, 0)) ){ - DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp); + DBG_871X("%s openFile path:%s fp=%p\n",__func__, path ,fp); oldfs = get_fs(); set_fs(get_ds()); ret=readFile(fp, buf, sz); set_fs(oldfs); closeFile(fp); - DBG_871X("%s readFile, ret:%d\n",__FUNCTION__, ret); + DBG_871X("%s readFile, ret:%d\n",__func__, ret); } else { - DBG_871X("%s openFile path:%s Fail, ret:%d\n",__FUNCTION__, path, ret); + DBG_871X("%s openFile path:%s Fail, ret:%d\n",__func__, path, ret); } } else { - DBG_871X("%s NULL pointer\n",__FUNCTION__); + DBG_871X("%s NULL pointer\n",__func__); ret = -EINVAL; } return ret; @@ -1618,20 +1618,20 @@ static int storeToFile(char *path, u8* buf, u32 sz) if (path && buf) { if ( 0 == (ret=openFile(&fp, path, O_CREAT|O_WRONLY, 0666)) ) { - DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp); + DBG_871X("%s openFile path:%s fp=%p\n",__func__, path ,fp); oldfs = get_fs(); set_fs(get_ds()); ret=writeFile(fp, buf, sz); set_fs(oldfs); closeFile(fp); - DBG_871X("%s writeFile, ret:%d\n",__FUNCTION__, ret); + DBG_871X("%s writeFile, ret:%d\n",__func__, ret); } else { - DBG_871X("%s openFile path:%s Fail, ret:%d\n",__FUNCTION__, path, ret); + DBG_871X("%s openFile path:%s Fail, ret:%d\n",__func__, path, ret); } } else { - DBG_871X("%s NULL pointer\n",__FUNCTION__); + DBG_871X("%s NULL pointer\n",__func__); ret = -EINVAL; } return ret; diff --git a/os_dep/recv_linux.c b/os_dep/recv_linux.c index 3f74ae0..956d781 100644 --- a/os_dep/recv_linux.c +++ b/os_dep/recv_linux.c @@ -269,7 +269,7 @@ _func_enter_; #ifdef CONFIG_WAPI_SUPPORT 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; } #endif diff --git a/os_dep/rtw_android.c b/os_dep/rtw_android.c index 5787602..3213eb5 100644 --- a/os_dep/rtw_android.c +++ b/os_dep/rtw_android.c @@ -153,10 +153,10 @@ static int wl_android_set_pno_setup(struct net_device *dev, char *command, int t }; #endif /* PNO_SET_DEBUG */ - DHD_INFO(("%s: command=%s, len=%d\n", __FUNCTION__, command, total_len)); + DHD_INFO(("%s: command=%s, len=%d\n", __func__, command, total_len)); if (total_len < (strlen(CMD_PNOSETUP_SET) + sizeof(cmd_tlv_t))) { - DBG_871X("%s argument=%d less min size\n", __FUNCTION__, total_len); + DBG_871X("%s argument=%d less min size\n", __func__, total_len); goto exit_proc; } @@ -188,35 +188,35 @@ static int wl_android_set_pno_setup(struct net_device *dev, char *command, int t } else { if ((str_ptr[0] != PNO_TLV_TYPE_TIME) || (tlv_size_left <= 1)) { DBG_871X("%s scan duration corrupted field size %d\n", - __FUNCTION__, tlv_size_left); + __func__, tlv_size_left); goto exit_proc; } str_ptr++; pno_time = simple_strtoul(str_ptr, &str_ptr, 16); - DHD_INFO(("%s: pno_time=%d\n", __FUNCTION__, pno_time)); + DHD_INFO(("%s: pno_time=%d\n", __func__, pno_time)); if (str_ptr[0] != 0) { if ((str_ptr[0] != PNO_TLV_FREQ_REPEAT)) { DBG_871X("%s pno repeat : corrupted field\n", - __FUNCTION__); + __func__); goto exit_proc; } str_ptr++; pno_repeat = simple_strtoul(str_ptr, &str_ptr, 16); - DHD_INFO(("%s :got pno_repeat=%d\n", __FUNCTION__, pno_repeat)); + DHD_INFO(("%s :got pno_repeat=%d\n", __func__, pno_repeat)); if (str_ptr[0] != PNO_TLV_FREQ_EXPO_MAX) { DBG_871X("%s FREQ_EXPO_MAX corrupted field size\n", - __FUNCTION__); + __func__); goto exit_proc; } str_ptr++; pno_freq_expo_max = simple_strtoul(str_ptr, &str_ptr, 16); DHD_INFO(("%s: pno_freq_expo_max=%d\n", - __FUNCTION__, pno_freq_expo_max)); + __func__, pno_freq_expo_max)); } } } else { - DBG_871X("%s get wrong TLV command\n", __FUNCTION__); + DBG_871X("%s get wrong TLV command\n", __func__); goto exit_proc; } @@ -350,13 +350,13 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) command = kmalloc(priv_cmd.total_len, GFP_KERNEL); if (!command) { - DBG_871X("%s: failed to allocate memory\n", __FUNCTION__); + DBG_871X("%s: failed to allocate memory\n", __func__); ret = -ENOMEM; goto exit; } if (!access_ok(VERIFY_READ, priv_cmd.buf, priv_cmd.total_len)){ - DBG_871X("%s: failed to access memory\n", __FUNCTION__); + DBG_871X("%s: failed to access memory\n", __func__); ret = -EFAULT; goto exit; } @@ -366,7 +366,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) } DBG_871X("%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); @@ -380,7 +380,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd) if (!g_wifi_on) { DBG_871X("%s: Ignore private cmd \"%s\" - iface %s is down\n" - ,__FUNCTION__, command, ifr->ifr_name); + ,__func__, command, ifr->ifr_name); ret = 0; goto exit; } @@ -578,14 +578,14 @@ response: if ((bytes_written == 0) && (priv_cmd.total_len > 0)) command[0] = '\0'; if (bytes_written >= priv_cmd.total_len) { - DBG_871X("%s: bytes_written = %d\n", __FUNCTION__, bytes_written); + DBG_871X("%s: bytes_written = %d\n", __func__, bytes_written); bytes_written = priv_cmd.total_len; } else { bytes_written++; } priv_cmd.used_len = bytes_written; if (copy_to_user((void *)priv_cmd.buf, command, bytes_written)) { - DBG_871X("%s: failed to copy data to user buffer\n", __FUNCTION__); + DBG_871X("%s: failed to copy data to user buffer\n", __func__); ret = -EFAULT; } } @@ -623,7 +623,7 @@ int rtw_android_wifictrl_func_add(void) ret = wifi_add_dev(); if (ret) { - DBG_871X("%s: platform_driver_register failed\n", __FUNCTION__); + DBG_871X("%s: platform_driver_register failed\n", __func__); return ret; } g_wifidev_registered = 1; @@ -631,7 +631,7 @@ int rtw_android_wifictrl_func_add(void) /* Waiting callback after platform_driver_register is done or exit with error */ if (down_timeout(&wifi_control_sem, msecs_to_jiffies(1000)) != 0) { ret = -EINVAL; - DBG_871X("%s: platform_driver_register timeout\n", __FUNCTION__); + DBG_871X("%s: platform_driver_register timeout\n", __func__); } return ret; @@ -678,7 +678,7 @@ int wifi_get_irq_number(unsigned long *irq_flags_ptr) int wifi_set_power(int on, unsigned long msec) { - DBG_871X("%s = %d\n", __FUNCTION__, on); + DBG_871X("%s = %d\n", __func__, on); if (wifi_control_data && wifi_control_data->set_power) { wifi_control_data->set_power(on); } @@ -690,7 +690,7 @@ int wifi_set_power(int on, unsigned long msec) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)) int wifi_get_mac_addr(unsigned char *buf) { - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); if (!buf) return -EINVAL; if (wifi_control_data && wifi_control_data->get_mac_addr) { @@ -703,7 +703,7 @@ int wifi_get_mac_addr(unsigned char *buf) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) || defined(COMPAT_KERNEL_RELEASE) void *wifi_get_country_code(char *ccode) { - DBG_871X("%s\n", __FUNCTION__); + DBG_871X("%s\n", __func__); if (!ccode) return NULL; if (wifi_control_data && wifi_control_data->get_country_code) { @@ -715,7 +715,7 @@ void *wifi_get_country_code(char *ccode) static int wifi_set_carddetect(int on) { - DBG_871X("%s = %d\n", __FUNCTION__, on); + DBG_871X("%s = %d\n", __func__, on); if (wifi_control_data && wifi_control_data->set_carddetect) { wifi_control_data->set_carddetect(on); } @@ -727,7 +727,7 @@ static int wifi_probe(struct platform_device *pdev) struct wifi_platform_data *wifi_ctrl = (struct wifi_platform_data *)(pdev->dev.platform_data); - DBG_871X("## %s\n", __FUNCTION__); + DBG_871X("## %s\n", __func__); wifi_irqres = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "bcmdhd_wlan_irq"); if (wifi_irqres == NULL) wifi_irqres = platform_get_resource_byname(pdev, @@ -746,7 +746,7 @@ static int wifi_remove(struct platform_device *pdev) struct wifi_platform_data *wifi_ctrl = (struct wifi_platform_data *)(pdev->dev.platform_data); - DBG_871X("## %s\n", __FUNCTION__); + DBG_871X("## %s\n", __func__); wifi_control_data = wifi_ctrl; wifi_set_power(0, 0); /* Power Off */ @@ -758,7 +758,7 @@ static int wifi_remove(struct platform_device *pdev) static int wifi_suspend(struct platform_device *pdev, pm_message_t state) { - DBG_871X("##> %s\n", __FUNCTION__); + DBG_871X("##> %s\n", __func__); #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY) bcmsdh_oob_intr_set(0); #endif @@ -767,7 +767,7 @@ static int wifi_suspend(struct platform_device *pdev, pm_message_t state) static int wifi_resume(struct platform_device *pdev) { - DBG_871X("##> %s\n", __FUNCTION__); + DBG_871X("##> %s\n", __func__); #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY) if (dhd_os_check_if_up(bcmsdh_get_drvdata())) bcmsdh_oob_intr_set(1); diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c index 671d5a0..fc4c5d8 100644 --- a/os_dep/usb_intf.c +++ b/os_dep/usb_intf.c @@ -751,7 +751,7 @@ static void rtw_dev_unload(_adapter *padapter) //DBG_871X("r871x_dev_unload()->rtl871x_hal_deinit()\n"); #ifdef CONFIG_WOWLAN if ((padapter->pwrctrlpriv.bSupportRemoteWakeup==_TRUE)&&(padapter->pwrctrlpriv.wowlan_mode==_TRUE)){ - DBG_871X("%s bSupportWakeOnWlan==_TRUE do not run rtw_hal_deinit()\n",__FUNCTION__); + DBG_871X("%s bSupportWakeOnWlan==_TRUE do not run rtw_hal_deinit()\n",__func__); } else #endif //CONFIG_WOWLAN @@ -806,7 +806,7 @@ static void process_spec_devid(const struct usb_device_id *pdid) { extern char* ifname; strncpy(ifname, "wlan10", 6); - //DBG_871X("%s()-%d: ifname=%s, vid=%04X, pid=%04X\n", __FUNCTION__, __LINE__, ifname, vid, pid); + //DBG_871X("%s()-%d: ifname=%s, vid=%04X, pid=%04X\n", __func__, __LINE__, ifname, vid, pid); } #endif /* RTK_DMP_PLATFORM */ @@ -887,7 +887,7 @@ int rtw_hw_suspend(_adapter *padapter ) return 0; error_exit: - DBG_871X("%s, failed\n",__FUNCTION__); + DBG_871X("%s, failed\n",__func__); return (-1); } @@ -938,7 +938,7 @@ int rtw_hw_resume(_adapter *padapter) return 0; error_exit: - DBG_871X("%s, Open net dev failed\n",__FUNCTION__); + DBG_871X("%s, Open net dev failed\n",__func__); return (-1); } #endif @@ -960,7 +960,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) _func_enter_; - DBG_871X("==> %s (%s:%d)\n",__FUNCTION__, current->comm, current->pid); + DBG_871X("==> %s (%s:%d)\n",__func__, current->comm, current->pid); #ifdef CONFIG_WOWLAN if (check_fwstate(pmlmepriv, _FW_LINKED)) @@ -1020,8 +1020,8 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) #ifdef CONFIG_LAYER2_ROAMING_RESUME if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED) ) { - //DBG_871X("%s:%d assoc_ssid:%s\n", __FUNCTION__, __LINE__, pmlmepriv->assoc_ssid.Ssid); - DBG_871X("%s:%d %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n",__FUNCTION__, __LINE__, + //DBG_871X("%s:%d assoc_ssid:%s\n", __func__, __LINE__, pmlmepriv->assoc_ssid.Ssid); + DBG_871X("%s:%d %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n",__func__, __LINE__, pmlmepriv->cur_network.network.Ssid.Ssid, MAC_ARG(pmlmepriv->cur_network.network.MacAddress), pmlmepriv->cur_network.network.Ssid.SsidLength, @@ -1054,7 +1054,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) rtw_indicate_disconnect(padapter); exit: - DBG_871X("<=== %s return %d.............. in %dms\n", __FUNCTION__ + DBG_871X("<=== %s return %d.............. in %dms\n", __func__ , ret, rtw_get_passing_time_ms(start_time)); _func_exit_; @@ -1106,7 +1106,7 @@ int rtw_resume_process(_adapter *padapter) #endif //#ifdef CONFIG_BT_COEXIST _func_enter_; - DBG_871X("==> %s (%s:%d)\n",__FUNCTION__, current->comm, current->pid); + DBG_871X("==> %s (%s:%d)\n",__func__, current->comm, current->pid); if (padapter) { pnetdev= padapter->pnetdev; @@ -1209,7 +1209,7 @@ exit: #endif //CONFIG_RESUME_IN_WORKQUEUE pwrpriv->bInSuspend = _FALSE; - DBG_871X("<=== %s return %d.............. in %dms\n", __FUNCTION__ + DBG_871X("<=== %s return %d.............. in %dms\n", __func__ , ret, rtw_get_passing_time_ms(start_time)); _func_exit_; @@ -1472,9 +1472,9 @@ _adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, //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)) - DBG_871X("%s...pm_usage_cnt(%d).....\n",__FUNCTION__,atomic_read(&(dvobj->pusbintf ->pm_usage_cnt))); + DBG_871X("%s...pm_usage_cnt(%d).....\n",__func__,atomic_read(&(dvobj->pusbintf ->pm_usage_cnt))); #else - DBG_871X("%s...pm_usage_cnt(%d).....\n",__FUNCTION__,dvobj->pusbintf ->pm_usage_cnt); + DBG_871X("%s...pm_usage_cnt(%d).....\n",__func__,dvobj->pusbintf ->pm_usage_cnt); #endif } } diff --git a/os_dep/usb_ops_linux.c b/os_dep/usb_ops_linux.c index 3c93105..506e186 100644 --- a/os_dep/usb_ops_linux.c +++ b/os_dep/usb_ops_linux.c @@ -386,7 +386,7 @@ _func_enter_; { RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete:bDriverStopped(%d) OR bSurpriseRemoved(%d)", padapter->bDriverStopped, padapter->bSurpriseRemoved)); DBG_8192C("%s(): TX Warning! bDriverStopped(%d) OR bSurpriseRemoved(%d) bWritePortCancel(%d) pxmitbuf->ext_tag(%x)\n", - __FUNCTION__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel,pxmitbuf->ext_tag); + __func__,padapter->bDriverStopped, padapter->bSurpriseRemoved,padapter->bReadPortCancel,pxmitbuf->ext_tag); goto check_completion; } @@ -475,7 +475,7 @@ _func_enter_; if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(padapter->pwrctrlpriv.pnp_bstop_trx)) { #ifdef DBG_TX - DBG_871X(" DBG_TX %s:%d bDriverStopped%d, bSurpriseRemoved:%d, pnp_bstop_trx:%d\n",__FUNCTION__, __LINE__ + DBG_871X(" DBG_TX %s:%d bDriverStopped%d, bSurpriseRemoved:%d, pnp_bstop_trx:%d\n",__func__, __LINE__ ,padapter->bDriverStopped, padapter->bSurpriseRemoved, padapter->pwrctrlpriv.pnp_bstop_trx ); #endif RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port:( padapter->bDriverStopped ||padapter->bSurpriseRemoved ||adapter->pwrctrlpriv.pnp_bstop_trx)!!!\n")); diff --git a/os_dep/xmit_linux.c b/os_dep/xmit_linux.c index 36eb4c5..4e4086c 100644 --- a/os_dep/xmit_linux.c +++ b/os_dep/xmit_linux.c @@ -110,12 +110,12 @@ void rtw_set_tx_chksum_offload(_pkt *pkt, struct pkt_attrib *pattrib) udp->check = 0; #endif } else { - DBG_871X("%s-%d TCP CSUM offload Error!!\n", __FUNCTION__, __LINE__); + DBG_871X("%s-%d TCP CSUM offload Error!!\n", __func__, __LINE__); WARN_ON(1); /* we need a WARN() */ } } else { // IP fragmentation case - DBG_871X("%s-%d nr_frags != 0, using skb_checksum_help(skb);!!\n", __FUNCTION__, __LINE__); + DBG_871X("%s-%d nr_frags != 0, using skb_checksum_help(skb);!!\n", __func__, __LINE__); skb_checksum_help(skb); } } @@ -293,7 +293,7 @@ static void rtw_check_xmit_resource(_adapter *padapter, _pkt *pkt) if (padapter->registrypriv.wifi_spec) { /* No free space for Tx, tx_worker is too slow */ if (pxmitpriv->hwxmits[queue].accnt > WMM_XMIT_THRESHOLD) { - //DBG_871X("%s(): stop netif_subqueue[%d]\n", __FUNCTION__, queue); + //DBG_871X("%s(): stop netif_subqueue[%d]\n", __func__, queue); netif_stop_subqueue(padapter->pnetdev, queue); } } else { @@ -343,13 +343,13 @@ int rtw_mlcst2unicst(_adapter *padapter, struct sk_buff *skb) memcpy(newskb->data, psta->hwaddr, 6); res = rtw_xmit(padapter, &newskb); if (res < 0) { - DBG_871X("%s()-%d: rtw_xmit() return error!\n", __FUNCTION__, __LINE__); + DBG_871X("%s()-%d: rtw_xmit() return error!\n", __func__, __LINE__); pxmitpriv->tx_drop++; dev_kfree_skb_any(newskb); } else pxmitpriv->tx_pkts++; } else { - DBG_871X("%s-%d: skb_copy() failed!\n", __FUNCTION__, __LINE__); + DBG_871X("%s-%d: skb_copy() failed!\n", __func__, __LINE__); pxmitpriv->tx_drop++; _exit_critical_bh(&pstapriv->asoc_list_lock, &irqL); @@ -385,7 +385,7 @@ _func_enter_; if (rtw_if_up(padapter) == _FALSE) { RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit_entry: rtw_if_up fail\n")); #ifdef DBG_TX_DROP_FRAME - DBG_871X("DBG_TX_DROP_FRAME %s if_up fail\n", __FUNCTION__); + DBG_871X("DBG_TX_DROP_FRAME %s if_up fail\n", __func__); #endif goto drop_packet; } @@ -415,7 +415,7 @@ _func_enter_; res = rtw_xmit(padapter, &pkt); if (res < 0) { #ifdef DBG_TX_DROP_FRAME - DBG_871X("DBG_TX_DROP_FRAME %s rtw_xmit fail\n", __FUNCTION__); + DBG_871X("DBG_TX_DROP_FRAME %s rtw_xmit fail\n", __func__); #endif goto drop_packet; }