skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2025-05-08 14:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Replace __FUNCTION__ with __func__

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-05-09 11:23:32 -05:00
parent 4620c2a956
commit d4fa4d178f
56 changed files with 865 additions and 865 deletions
Download patch file Download diff file Expand all files Collapse all files

44
core/rtw_ap.c
View file

@ -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);
}
}

14
core/rtw_cmd.c
View file

@ -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));

10
core/rtw_efuse.c
View file

@ -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<PGPKT_DATA_SIZE; i++)
{
DBG_871X("0x%02X ", newdata[i]);
@ -1242,7 +1242,7 @@ int storeAdaptorInfoFile(char *path, struct eeprom_priv * eeprom_priv)
else
ret = _FAIL;
} else {
DBG_871X("%s NULL pointer\n",__FUNCTION__);
DBG_871X("%s NULL pointer\n",__func__);
ret = _FAIL;
}
return ret;
@ -1272,7 +1272,7 @@ int retriveAdaptorInfoFile(char *path, struct eeprom_priv * eeprom_priv)
#endif
} else {
DBG_871X("%s NULL pointer\n",__FUNCTION__);
DBG_871X("%s NULL pointer\n",__func__);
ret = _FAIL;
}
return ret;

26
core/rtw_ieee80211.c
View file

@ -628,7 +628,7 @@ int rtw_parse_wpa_ie(u8* wpa_ie, int wpa_ie_len, int *group_cipher, int *pairwis
}
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;
}
@ -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;

2
core/rtw_ioctl_set.c
View file

@ -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);
}

26
core/rtw_iol.c
View file

@ -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);
}

8
core/rtw_led.c
View file

@ -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;
}

52
core/rtw_mlme.c
View file

@ -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;
}

158
core/rtw_mlme_ext.c
View file

@ -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:

82
core/rtw_p2p.c
View file

@ -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;

64
core/rtw_pwrctrl.c
View file

@ -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;
}

68
core/rtw_recv.c
View file

@ -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

8
core/rtw_security.c
View file

@ -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;
}

4
core/rtw_sreset.c
View file

@ -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;

2
core/rtw_sta_mgt.c
View file

@ -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;

16
core/rtw_tdls.c
View file

@ -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;
}

26
core/rtw_wlan_util.c
View file

@ -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 {

24
core/rtw_xmit.c
View file

@ -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);