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

rtl8188eu: Update logging

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-05-25 18:35:42 -05:00
parent d597e07a9e
commit 96adb823b9
54 changed files with 2268 additions and 2272 deletions
Download patch file Download diff file Expand all files Collapse all files

114
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", __func__);
//DBG_88E("%s\n", __func__);
//update TIM IE
//if (pstapriv->tim_bitmap)
@ -318,7 +318,7 @@ u8 chk_sta_is_alive(struct sta_info *psta)
{
u8 ret = _FALSE;
#ifdef DBG_EXPIRATION_CHK
DBG_871X("sta:"MAC_FMT", rssi:%d, rx:"STA_PKTS_FMT", expire_to:%u, %s%ssq_len:%u\n"
DBG_88E("sta:"MAC_FMT", rssi:%d, rx:"STA_PKTS_FMT", expire_to:%u, %s%ssq_len:%u\n"
, MAC_ARG(psta->hwaddr)
, psta->rssi_stat.UndecoratedSmoothedPWDB
//, STA_RX_PKTS_ARG(psta)
@ -362,7 +362,7 @@ void expire_timeout_chk(_adapter *padapter)
//check auth_queue
#ifdef DBG_EXPIRATION_CHK
if (rtw_end_of_queue_search(phead, plist) == _FALSE) {
DBG_871X(FUNC_NDEV_FMT" auth_list, cnt:%u\n"
DBG_88E(FUNC_NDEV_FMT" auth_list, cnt:%u\n"
, FUNC_NDEV_ARG(padapter->pnetdev), pstapriv->auth_list_cnt);
}
#endif
@ -379,7 +379,7 @@ void expire_timeout_chk(_adapter *padapter)
rtw_list_delete(&psta->auth_list);
pstapriv->auth_list_cnt--;
DBG_871X("auth expire %02X%02X%02X%02X%02X%02X\n",
DBG_88E("auth expire %02X%02X%02X%02X%02X%02X\n",
psta->hwaddr[0],psta->hwaddr[1],psta->hwaddr[2],psta->hwaddr[3],psta->hwaddr[4],psta->hwaddr[5]);
_exit_critical_bh(&pstapriv->auth_list_lock, &irqL);
@ -407,7 +407,7 @@ void expire_timeout_chk(_adapter *padapter)
//check asoc_queue
#ifdef DBG_EXPIRATION_CHK
if (rtw_end_of_queue_search(phead, plist) == _FALSE) {
DBG_871X(FUNC_NDEV_FMT" asoc_list, cnt:%u\n"
DBG_88E(FUNC_NDEV_FMT" asoc_list, cnt:%u\n"
, FUNC_NDEV_ARG(padapter->pnetdev), pstapriv->asoc_list_cnt);
}
#endif
@ -432,14 +432,14 @@ void expire_timeout_chk(_adapter *padapter)
if ( (psta->flags & WLAN_STA_HT) && (psta->htpriv.agg_enable_bitmap || psta->under_exist_checking) ) {
// check sta by delba(addba) for 11n STA
// ToDo: use CCX report to check for all STAs
//DBG_871X("asoc check by DELBA/ADDBA! (pstapriv->expire_to=%d s)(psta->expire_to=%d s), [%02x, %d]\n", pstapriv->expire_to*2, psta->expire_to*2, psta->htpriv.agg_enable_bitmap, psta->under_exist_checking);
//DBG_88E("asoc check by DELBA/ADDBA! (pstapriv->expire_to=%d s)(psta->expire_to=%d s), [%02x, %d]\n", pstapriv->expire_to*2, psta->expire_to*2, psta->htpriv.agg_enable_bitmap, psta->under_exist_checking);
if ( psta->expire_to <= (pstapriv->expire_to - 50 ) ) {
DBG_871X("asoc expire by DELBA/ADDBA! (%d s)\n", (pstapriv->expire_to-psta->expire_to)*2);
DBG_88E("asoc expire by DELBA/ADDBA! (%d s)\n", (pstapriv->expire_to-psta->expire_to)*2);
psta->under_exist_checking = 0;
psta->expire_to = 0;
} else if ( psta->expire_to <= (pstapriv->expire_to - 3) && (psta->under_exist_checking==0)) {
DBG_871X("asoc check by DELBA/ADDBA! (%d s)\n", (pstapriv->expire_to-psta->expire_to)*2);
DBG_88E("asoc check by DELBA/ADDBA! (%d s)\n", (pstapriv->expire_to-psta->expire_to)*2);
psta->under_exist_checking = 1;
//tear down TX AMPDU
send_delba(padapter, 1, psta->hwaddr);// // originator
@ -468,7 +468,7 @@ void expire_timeout_chk(_adapter *padapter)
psta->expire_to = pstapriv->expire_to;
psta->state |= WIFI_STA_ALIVE_CHK_STATE;
//DBG_871X("alive chk, sta:" MAC_FMT " is at ps mode!\n", MAC_ARG(psta->hwaddr));
//DBG_88E("alive chk, sta:" MAC_FMT " is at ps mode!\n", MAC_ARG(psta->hwaddr));
//to update bcn with tim_bitmap for this station
pstapriv->tim_bitmap |= BIT(psta->aid);
@ -494,7 +494,7 @@ void expire_timeout_chk(_adapter *padapter)
rtw_list_delete(&psta->asoc_list);
pstapriv->asoc_list_cnt--;
DBG_871X("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state);
DBG_88E("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state);
updated = ap_free_sta(padapter, psta, _TRUE, WLAN_REASON_DEAUTH_LEAVING);
}
else
@ -503,7 +503,7 @@ void expire_timeout_chk(_adapter *padapter)
if (psta->sleepq_len > (NR_XMITFRAME/pstapriv->asoc_list_cnt)
&& padapter->xmitpriv.free_xmitframe_cnt < (NR_XMITFRAME/pstapriv->asoc_list_cnt/2)
){
DBG_871X("%s sta:"MAC_FMT", sleepq_len:%u, free_xmitframe_cnt:%u, asoc_list_cnt:%u, clear sleep_q\n", __func__
DBG_88E("%s sta:"MAC_FMT", sleepq_len:%u, free_xmitframe_cnt:%u, asoc_list_cnt:%u, clear sleep_q\n", __func__
, MAC_ARG(psta->hwaddr)
, psta->sleepq_len, padapter->xmitpriv.free_xmitframe_cnt, pstapriv->asoc_list_cnt);
wakeup_sta_to_xmit(padapter, psta);
@ -539,21 +539,21 @@ if (chk_alive_num) {
psta->keep_alive_trycnt++;
if (ret == _SUCCESS)
{
DBG_871X("asoc check, sta(" MAC_FMT ") is alive\n", MAC_ARG(psta->hwaddr));
DBG_88E("asoc check, sta(" MAC_FMT ") is alive\n", MAC_ARG(psta->hwaddr));
psta->expire_to = pstapriv->expire_to;
psta->keep_alive_trycnt = 0;
continue;
}
else if (psta->keep_alive_trycnt <= 3)
{
DBG_871X("ack check for asoc expire, keep_alive_trycnt=%d\n", psta->keep_alive_trycnt);
DBG_88E("ack check for asoc expire, keep_alive_trycnt=%d\n", psta->keep_alive_trycnt);
psta->expire_to = 1;
continue;
}
psta->keep_alive_trycnt = 0;
DBG_871X("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state);
DBG_88E("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state);
_enter_critical_bh(&pstapriv->asoc_list_lock, &irqL);
rtw_list_delete(&psta->asoc_list);
pstapriv->asoc_list_cnt--;
@ -651,7 +651,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",
DBG_88E("%s=> mac_id:%d , raid:%d , bitmap=0x%x, arg=0x%x\n",
__func__ , psta->mac_id, raid ,tx_ra_bitmap, arg);
//bitmap[0:27] = tx_rate_bitmap
@ -671,7 +671,7 @@ void add_RATid(_adapter *padapter, struct sta_info *psta, u8 rssi_level)
}
else
{
DBG_871X("station aid %d exceed the max number\n", psta->aid);
DBG_88E("station aid %d exceed the max number\n", psta->aid);
}
}
@ -735,7 +735,7 @@ static void update_bmc_sta(_adapter *padapter)
raid = networktype_to_raid(network_type);
init_rate = get_highest_rate_idx(tx_ra_bitmap&0x0fffffff)&0x3f;
//DBG_871X("Add id %d val %08x to ratr for bmc sta\n", psta->aid, tx_ra_bitmap);
//DBG_88E("Add id %d val %08x to ratr for bmc sta\n", psta->aid, tx_ra_bitmap);
//ap mode
rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, _TRUE);
@ -752,7 +752,7 @@ static void update_bmc_sta(_adapter *padapter)
tx_ra_bitmap |= ((raid<<28)&0xf0000000);
DBG_871X("update_bmc_sta, mask=0x%x, arg=0x%x\n", tx_ra_bitmap, arg);
DBG_88E("update_bmc_sta, mask=0x%x, arg=0x%x\n", tx_ra_bitmap, arg);
//bitmap[0:27] = tx_rate_bitmap
//bitmap[28:31]= Rate Adaptive id
@ -775,7 +775,7 @@ static void update_bmc_sta(_adapter *padapter)
}
else
{
DBG_871X("add_RATid_bmc_sta error!\n");
DBG_88E("add_RATid_bmc_sta error!\n");
}
}
@ -802,7 +802,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",__func__);
DBG_88E("%s\n",__func__);
//ap mode
rtw_hal_set_odm_var(padapter,HAL_ODM_STA_INFO,psta,_TRUE);
@ -884,7 +884,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", __func__);
DBG_88E("%s\n", __func__);
//handle A-MPDU parameter field
@ -912,7 +912,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",__func__);
DBG_88E("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__func__);
}
//
@ -941,7 +941,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
#endif //CONFIG_P2P
//DBG_871X("%s\n", __func__);
//DBG_88E("%s\n", __func__);
bcn_interval = (u16)pnetwork->Configuration.BeaconPeriod;
cur_channel = pnetwork->Configuration.DSConfig;
@ -1098,9 +1098,9 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
//To sync cur_channel/cur_bwmode/cur_ch_offset with primary adapter
DBG_871X("primary iface is at linked state, sync cur_channel/cur_bwmode/cur_ch_offset\n");
DBG_871X("primary adapter, CH=%d, BW=%d, offset=%d\n", pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_bwmode, pbuddy_mlmeext->cur_ch_offset);
DBG_871X("second adapter, CH=%d, BW=%d, offset=%d\n", cur_channel, cur_bwmode, cur_ch_offset);
DBG_88E("primary iface is at linked state, sync cur_channel/cur_bwmode/cur_ch_offset\n");
DBG_88E("primary adapter, CH=%d, BW=%d, offset=%d\n", pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_bwmode, pbuddy_mlmeext->cur_ch_offset);
DBG_88E("second adapter, CH=%d, BW=%d, offset=%d\n", cur_channel, cur_bwmode, cur_ch_offset);
cur_channel = pbuddy_mlmeext->cur_channel;
if (cur_bwmode == HT_CHANNEL_WIDTH_40)
@ -1171,7 +1171,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode);
#endif //CONFIG_CONCURRENT_MODE
DBG_871X("CH=%d, BW=%d, offset=%d\n", cur_channel, cur_bwmode, cur_ch_offset);
DBG_88E("CH=%d, BW=%d, offset=%d\n", cur_channel, cur_bwmode, cur_ch_offset);
//
pmlmeext->cur_channel = cur_channel;
@ -1203,7 +1203,7 @@ static void start_bss_network(_adapter *padapter, u8 *pbuf)
//issue beacon frame
if (send_beacon(padapter)==_FAIL)
{
DBG_871X("issue_beacon, fail!\n");
DBG_88E("issue_beacon, fail!\n");
}
#endif
#endif //!CONFIG_INTERRUPT_BASED_TXBCN
@ -1252,7 +1252,7 @@ int rtw_check_beacon_data(_adapter *padapter, u8 *pbuf, int len)
/* ht_capab, ht_oper */
/* WPS IE */
DBG_871X("%s, len=%d\n", __func__, len);
DBG_88E("%s, len=%d\n", __func__, len);
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != _TRUE)
return _FAIL;
@ -1546,7 +1546,7 @@ void rtw_set_macaddr_acl(_adapter *padapter, int mode)
struct sta_priv *pstapriv = &padapter->stapriv;
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
DBG_871X("%s, mode=%d\n", __func__, mode);
DBG_88E("%s, mode=%d\n", __func__, mode);
pacl_list->mode = mode;
}
@ -1562,7 +1562,7 @@ int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
_queue *pacl_node_q =&pacl_list->acl_node_q;
DBG_871X("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr));
DBG_88E("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr));
if ((NUM_ACL-1) < pacl_list->num)
return (-1);
@ -1583,7 +1583,7 @@ int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
if (paclnode->valid == _TRUE)
{
added = _TRUE;
DBG_871X("%s, sta has been added\n", __func__);
DBG_88E("%s, sta has been added\n", __func__);
break;
}
}
@ -1618,7 +1618,7 @@ int rtw_acl_add_sta(_adapter *padapter, u8 *addr)
}
}
DBG_871X("%s, acl_num=%d\n", __func__, pacl_list->num);
DBG_88E("%s, acl_num=%d\n", __func__, pacl_list->num);
_exit_critical_bh(&(pacl_node_q->lock), &irqL);
@ -1635,7 +1635,7 @@ int rtw_acl_remove_sta(_adapter *padapter, u8 *addr)
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
_queue *pacl_node_q =&pacl_list->acl_node_q;
DBG_871X("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr));
DBG_88E("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr));
_enter_critical_bh(&(pacl_node_q->lock), &irqL);
@ -1662,7 +1662,7 @@ int rtw_acl_remove_sta(_adapter *padapter, u8 *addr)
_exit_critical_bh(&(pacl_node_q->lock), &irqL);
DBG_871X("%s, acl_num=%d\n", __func__, pacl_list->num);
DBG_88E("%s, acl_num=%d\n", __func__, pacl_list->num);
return ret;
@ -1672,7 +1672,7 @@ int rtw_acl_remove_sta(_adapter *padapter, u8 *addr)
static void update_bcn_fixed_ie(_adapter *padapter)
{
DBG_871X("%s\n", __func__);
DBG_88E("%s\n", __func__);
}
@ -1685,7 +1685,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", __func__, pmlmeinfo->ERP_enable);
DBG_88E("%s, ERP_enable=%d\n", __func__, pmlmeinfo->ERP_enable);
if (!pmlmeinfo->ERP_enable)
return;
@ -1713,31 +1713,31 @@ static void update_bcn_erpinfo_ie(_adapter *padapter)
static void update_bcn_htcap_ie(_adapter *padapter)
{
DBG_871X("%s\n", __func__);
DBG_88E("%s\n", __func__);
}
static void update_bcn_htinfo_ie(_adapter *padapter)
{
DBG_871X("%s\n", __func__);
DBG_88E("%s\n", __func__);
}
static void update_bcn_rsn_ie(_adapter *padapter)
{
DBG_871X("%s\n", __func__);
DBG_88E("%s\n", __func__);
}
static void update_bcn_wpa_ie(_adapter *padapter)
{
DBG_871X("%s\n", __func__);
DBG_88E("%s\n", __func__);
}
static void update_bcn_wmm_ie(_adapter *padapter)
{
DBG_871X("%s\n", __func__);
DBG_88E("%s\n", __func__);
}
@ -1753,7 +1753,7 @@ static void update_bcn_wps_ie(_adapter *padapter)
u32 ielen = pnetwork->IELength;
DBG_871X("%s\n", __func__);
DBG_88E("%s\n", __func__);
pwps_ie = rtw_get_wps_ie(ie+_FIXED_IE_LENGTH_, ielen-_FIXED_IE_LENGTH_, NULL, &wps_ielen);
@ -1804,7 +1804,7 @@ static void update_bcn_p2p_ie(_adapter *padapter)
static void update_bcn_vendor_spec_ie(_adapter *padapter, u8*oui)
{
DBG_871X("%s\n", __func__);
DBG_88E("%s\n", __func__);
if (_rtw_memcmp(RTW_WPA_OUI, oui, 4))
{
@ -1824,7 +1824,7 @@ static void update_bcn_vendor_spec_ie(_adapter *padapter, u8*oui)
}
else
{
DBG_871X("unknown OUI type!\n");
DBG_88E("unknown OUI type!\n");
}
@ -1837,7 +1837,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", __func__);
//DBG_88E("%s\n", __func__);
if (!padapter)
return;
@ -1946,7 +1946,7 @@ static int rtw_ht_operation_update(_adapter *padapter)
//if (!iface->conf->ieee80211n || iface->conf->ht_op_mode_fixed)
// return 0;
DBG_871X("%s current operation mode=0x%X\n",
DBG_88E("%s current operation mode=0x%X\n",
__func__, pmlmepriv->ht_op_mode);
if (!(pmlmepriv->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT)
@ -1997,7 +1997,7 @@ static int rtw_ht_operation_update(_adapter *padapter)
op_mode_changes++;
}
DBG_871X("%s new operation mode=0x%X changes=%d\n",
DBG_88E("%s new operation mode=0x%X changes=%d\n",
__func__, pmlmepriv->ht_op_mode, op_mode_changes);
return op_mode_changes;
@ -2152,7 +2152,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
{
u16 ht_capab = le16_to_cpu(psta->htpriv.ht_cap.cap_info);
DBG_871X("HT: STA " MAC_FMT " HT Capabilities "
DBG_88E("HT: STA " MAC_FMT " HT Capabilities "
"Info: 0x%04x\n", MAC_ARG(psta->hwaddr), ht_capab);
if (psta->no_ht_set) {
@ -2165,7 +2165,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
psta->no_ht_gf_set = 1;
pmlmepriv->num_sta_ht_no_gf++;
}
DBG_871X("%s STA " MAC_FMT " - no "
DBG_88E("%s STA " MAC_FMT " - no "
"greenfield, num of non-gf stations %d\n",
__func__, MAC_ARG(psta->hwaddr),
pmlmepriv->num_sta_ht_no_gf);
@ -2176,7 +2176,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
psta->ht_20mhz_set = 1;
pmlmepriv->num_sta_ht_20mhz++;
}
DBG_871X("%s STA " MAC_FMT " - 20 MHz HT, "
DBG_88E("%s STA " MAC_FMT " - 20 MHz HT, "
"num of 20MHz HT STAs %d\n",
__func__, MAC_ARG(psta->hwaddr),
pmlmepriv->num_sta_ht_20mhz);
@ -2190,7 +2190,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
pmlmepriv->num_sta_no_ht++;
}
if (pmlmepriv->htpriv.ht_option == _TRUE) {
DBG_871X("%s STA " MAC_FMT
DBG_88E("%s STA " MAC_FMT
" - no HT, num of non-HT stations %d\n",
__func__, MAC_ARG(psta->hwaddr),
pmlmepriv->num_sta_no_ht);
@ -2208,7 +2208,7 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta)
//update associcated stations cap.
associated_clients_update(padapter, beacon_updated);
DBG_871X("%s, updated=%d\n", __func__, beacon_updated);
DBG_88E("%s, updated=%d\n", __func__, beacon_updated);
}
@ -2281,7 +2281,7 @@ u8 bss_cap_update_on_sta_leave(_adapter *padapter, struct sta_info *psta)
//update associcated stations cap.
//associated_clients_update(padapter, beacon_updated); //move it to avoid deadlock
DBG_871X("%s, updated=%d\n", __func__, beacon_updated);
DBG_88E("%s, updated=%d\n", __func__, beacon_updated);
return beacon_updated;
@ -2364,7 +2364,7 @@ int rtw_ap_inform_ch_switch (_adapter *padapter, u8 new_ch, u8 ch_offset)
if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
return ret;
DBG_871X(FUNC_NDEV_FMT" with ch:%u, offset:%u\n",
DBG_88E(FUNC_NDEV_FMT" with ch:%u, offset:%u\n",
FUNC_NDEV_ARG(padapter->pnetdev), new_ch, ch_offset);
_enter_critical_bh(&pstapriv->asoc_list_lock, &irqL);
@ -2398,7 +2398,7 @@ int rtw_sta_flush(_adapter *padapter)
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
u8 bc_addr[ETH_ALEN] = {0xff,0xff,0xff,0xff,0xff,0xff};
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(padapter->pnetdev));
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(padapter->pnetdev));
if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
return ret;
@ -2579,7 +2579,7 @@ void stop_ap_mode(_adapter *padapter)
}
_exit_critical_bh(&(pacl_node_q->lock), &irqL);
DBG_871X("%s, free acl_node_queue, num=%d\n", __func__, pacl_list->num);
DBG_88E("%s, free acl_node_queue, num=%d\n", __func__, pacl_list->num);
rtw_sta_flush(padapter);

38
core/rtw_cmd.c
View file

@ -317,7 +317,7 @@ int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
struct drvextra_cmd_parm *pdrvextra_cmd_parm = (struct drvextra_cmd_parm *)cmd_obj->parmbuf;
if (pdrvextra_cmd_parm->ec_id == POWER_SAVING_CTRL_WK_CID)
{
//DBG_871X("==>enqueue POWER_SAVING_CTRL_WK_CID\n");
//DBG_88E("==>enqueue POWER_SAVING_CTRL_WK_CID\n");
bAllow = _TRUE;
}
}
@ -331,7 +331,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, __func__,
//DBG_88E("%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
@ -453,7 +453,7 @@ _func_enter_;
if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved == _TRUE))
{
DBG_871X("%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
DBG_88E("%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
__func__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__);
break;
}
@ -470,7 +470,7 @@ _func_enter_;
_next:
if ((padapter->bDriverStopped == _TRUE)||(padapter->bSurpriseRemoved== _TRUE))
{
DBG_871X("%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
DBG_88E("%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
__func__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__);
break;
}
@ -550,7 +550,7 @@ post_process:
if (pcmd==NULL)
break;
//DBG_871X("%s: leaving... drop cmdcode:%u\n", __func__, pcmd->cmdcode);
//DBG_88E("%s: leaving... drop cmdcode:%u\n", __func__, pcmd->cmdcode);
rtw_free_cmd_obj(pcmd);
}while (1);
@ -738,7 +738,7 @@ _func_enter_;
_rtw_memcpy(&psurveyPara->ssid[i], &ssid[i], sizeof(NDIS_802_11_SSID));
psurveyPara->ssid_num++;
if (0)
DBG_871X(FUNC_ADPT_FMT" ssid:(%s, %d)\n", FUNC_ADPT_ARG(padapter),
DBG_88E(FUNC_ADPT_FMT" ssid:(%s, %d)\n", FUNC_ADPT_ARG(padapter),
psurveyPara->ssid[i].Ssid, psurveyPara->ssid[i].SsidLength);
}
}
@ -752,7 +752,7 @@ _func_enter_;
_rtw_memcpy(&psurveyPara->ch[i], &ch[i], sizeof(struct rtw_ieee80211_channel));
psurveyPara->ch_num++;
if (0)
DBG_871X(FUNC_ADPT_FMT" ch:%u\n", FUNC_ADPT_ARG(padapter),
DBG_88E(FUNC_ADPT_FMT" ch:%u\n", FUNC_ADPT_ARG(padapter),
psurveyPara->ch[i].hw_value);
}
}
@ -1300,7 +1300,7 @@ _func_enter_;
else
padapter->pwrctrlpriv.smart_ps = padapter->registrypriv.smart_ps;
DBG_871X("%s: smart_ps=%d\n", __func__, padapter->pwrctrlpriv.smart_ps);
DBG_88E("%s: smart_ps=%d\n", __func__, padapter->pwrctrlpriv.smart_ps);
pcmd->cmdsz = get_WLAN_BSSID_EX_sz(psecnetwork);//get cmdsz before endian conversion
@ -1697,7 +1697,7 @@ _func_enter_;
init_h2fwcmd_w_parm_no_rsp(ph2c, paddbareq_parm, GEN_CMD_CODE(_AddBAReq));
//DBG_871X("rtw_addbareq_cmd, tid=%d\n", tid);
//DBG_88E("rtw_addbareq_cmd, tid=%d\n", tid);
//rtw_enqueue_cmd(pcmdpriv, ph2c);
res = rtw_enqueue_cmd(pcmdpriv, ph2c);
@ -1764,7 +1764,7 @@ u8 rtw_set_ch_cmd(_adapter*padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueue)
_func_enter_;
DBG_871X(FUNC_NDEV_FMT" ch:%u, bw:%u, ch_offset:%u\n",
DBG_88E(FUNC_NDEV_FMT" ch:%u, bw:%u, ch_offset:%u\n",
FUNC_NDEV_ARG(padapter->pnetdev), ch, bw, ch_offset);
/* check input parameter */
@ -1802,7 +1802,7 @@ _func_enter_;
exit:
DBG_871X(FUNC_NDEV_FMT" res:%u\n", FUNC_NDEV_ARG(padapter->pnetdev), res);
DBG_88E(FUNC_NDEV_FMT" res:%u\n", FUNC_NDEV_ARG(padapter->pnetdev), res);
_func_exit_;
@ -2039,7 +2039,7 @@ static void traffic_status_watchdog(_adapter *padapter)
}
#ifdef CONFIG_FTP_PROTECT
DBG_871X("RX in period:%d, TX in period:%d, ftp_lock_flag:%d\n",
DBG_88E("RX in period:%d, TX in period:%d, ftp_lock_flag:%d\n",
pmlmepriv->LinkDetectInfo.NumRxOkInPeriod,
pmlmepriv->LinkDetectInfo.NumTxOkInPeriod,
pmlmepriv->ftp_lock_flag);
@ -2071,7 +2071,7 @@ static void traffic_status_watchdog(_adapter *padapter)
if ( ((pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod + pmlmepriv->LinkDetectInfo.NumTxOkInPeriod) > 8 ) ||
(pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod > 2) )
{
//DBG_871X("Tx = %d, Rx = %d\n",pmlmepriv->LinkDetectInfo.NumTxOkInPeriod,pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod);
//DBG_88E("Tx = %d, Rx = %d\n",pmlmepriv->LinkDetectInfo.NumTxOkInPeriod,pmlmepriv->LinkDetectInfo.NumRxUnicastOkInPeriod);
bEnterPS= _FALSE;
}
else
@ -2168,7 +2168,7 @@ _func_enter_;
switch (lps_ctrl_type)
{
case LPS_CTRL_SCAN:
//DBG_871X("LPS_CTRL_SCAN\n");
//DBG_88E("LPS_CTRL_SCAN\n");
#ifdef CONFIG_BT_COEXIST
BT_WifiScanNotify(padapter, _TRUE);
if (BT_1Ant(padapter) == _FALSE)
@ -2181,11 +2181,11 @@ _func_enter_;
}
break;
case LPS_CTRL_JOINBSS:
//DBG_871X("LPS_CTRL_JOINBSS\n");
//DBG_88E("LPS_CTRL_JOINBSS\n");
LPS_Leave(padapter);
break;
case LPS_CTRL_CONNECT:
//DBG_871X("LPS_CTRL_CONNECT\n");
//DBG_88E("LPS_CTRL_CONNECT\n");
mstatus = 1;//connect
// Reset LPS Setting
padapter->pwrctrlpriv.LpsIdleCount = 0;
@ -2195,7 +2195,7 @@ _func_enter_;
#endif
break;
case LPS_CTRL_DISCONNECT:
//DBG_871X("LPS_CTRL_DISCONNECT\n");
//DBG_88E("LPS_CTRL_DISCONNECT\n");
mstatus = 0;//disconnect
#ifdef CONFIG_BT_COEXIST
BT_WifiMediaStatusNotify(padapter, mstatus);
@ -2207,7 +2207,7 @@ _func_enter_;
rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_JOINBSSRPT, (u8 *)(&mstatus));
break;
case LPS_CTRL_SPECIAL_PACKET:
//DBG_871X("LPS_CTRL_SPECIAL_PACKET\n");
//DBG_88E("LPS_CTRL_SPECIAL_PACKET\n");
pwrpriv->DelayLPSLastTimeStamp = rtw_get_current_time();
#ifdef CONFIG_BT_COEXIST
BT_SpecialPacketNotify(padapter);
@ -2218,7 +2218,7 @@ _func_enter_;
}
break;
case LPS_CTRL_LEAVE:
//DBG_871X("LPS_CTRL_LEAVE\n");
//DBG_88E("LPS_CTRL_LEAVE\n");
#ifdef CONFIG_BT_COEXIST
BT_LpsLeave(padapter);
if (BT_1Ant(padapter) == _FALSE)

22
core/rtw_debug.c
View file

@ -94,7 +94,7 @@ int proc_set_write_reg(struct file *file, const char __user *buffer,
if (count < 3)
{
DBG_871X("argument size is less than 3\n");
DBG_88E("argument size is less than 3\n");
return -EFAULT;
}
@ -103,7 +103,7 @@ int proc_set_write_reg(struct file *file, const char __user *buffer,
int num = sscanf(tmp, "%x %x %x", &addr, &val, &len);
if (num != 3) {
DBG_871X("invalid write_reg parameter!\n");
DBG_88E("invalid write_reg parameter!\n");
return count;
}
@ -119,7 +119,7 @@ int proc_set_write_reg(struct file *file, const char __user *buffer,
rtw_write32(padapter, addr, val);
break;
default:
DBG_871X("error write length=%d", len);
DBG_88E("error write length=%d", len);
break;
}
@ -176,7 +176,7 @@ int proc_set_read_reg(struct file *file, const char __user *buffer,
if (count < 2)
{
DBG_871X("argument size is less than 2\n");
DBG_88E("argument size is less than 2\n");
return -EFAULT;
}
@ -185,7 +185,7 @@ int proc_set_read_reg(struct file *file, const char __user *buffer,
int num = sscanf(tmp, "%x %x", &addr, &len);
if (num != 2) {
DBG_871X("invalid read_reg parameter!\n");
DBG_88E("invalid read_reg parameter!\n");
return count;
}
@ -678,9 +678,9 @@ int proc_set_rx_signal(struct file *file, const char __user *buffer,
padapter->recvpriv.signal_strength_dbg=signal_strength;
if (is_signal_dbg)
DBG_871X("set %s %u\n", "DBG_SIGNAL_STRENGTH", signal_strength);
DBG_88E("set %s %u\n", "DBG_SIGNAL_STRENGTH", signal_strength);
else
DBG_871X("set %s\n", "HW_SIGNAL_STRENGTH");
DBG_88E("set %s\n", "HW_SIGNAL_STRENGTH");
}
@ -921,7 +921,7 @@ int proc_set_rssi_disp(struct file *file, const char __user *buffer,
if (count < 1)
{
DBG_8192C("argument size is less than 1\n");
DBG_88E("argument size is less than 1\n");
return -EFAULT;
}
@ -930,18 +930,18 @@ int proc_set_rssi_disp(struct file *file, const char __user *buffer,
int num = sscanf(tmp, "%x", &enable);
if (num != 1) {
DBG_8192C("invalid set_rssi_disp parameter!\n");
DBG_88E("invalid set_rssi_disp parameter!\n");
return count;
}
if (enable)
{
DBG_8192C("Turn On Rx RSSI Display Function\n");
DBG_88E("Turn On Rx RSSI Display Function\n");
padapter->bRxRSSIDisplay = enable ;
}
else
{
DBG_8192C("Turn Off Rx RSSI Display Function\n");
DBG_88E("Turn Off Rx RSSI Display Function\n");
padapter->bRxRSSIDisplay = 0 ;
}

22
core/rtw_efuse.c
View file

@ -221,7 +221,7 @@ ReadEFuseByte(
value32 = rtw_read32(Adapter, EFUSE_CTRL);
*pbuf = (u8)(value32 & 0xff);
//DBG_871X("ReadEFuseByte _offset:%08u, in %d ms\n",_offset ,rtw_get_passing_time_ms(start));
//DBG_88E("ReadEFuseByte _offset:%08u, in %d ms\n",_offset ,rtw_get_passing_time_ms(start));
}
@ -769,12 +769,12 @@ u8 rtw_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
if (word_en != 0xF) {
ret = Efuse_PgPacketWrite(padapter, offset, word_en, newdata, _FALSE);
DBG_871X("offset=%x\n",offset);
DBG_871X("word_en=%x\n",word_en);
DBG_88E("offset=%x\n",offset);
DBG_88E("word_en=%x\n",word_en);
for (i=0;i<PGPKT_DATA_SIZE;i++)
{
DBG_871X("data=%x \t",newdata[i]);
DBG_88E("data=%x \t",newdata[i]);
}
if (ret == _FAIL) break;
}
@ -867,14 +867,14 @@ u8 rtw_BT_efuse_map_write(PADAPTER padapter, u16 addr, u16 cnts, u8 *data)
if (word_en != 0xF)
{
DBG_871X("%s: offset=%#X\n", __func__, offset);
DBG_871X("%s: word_en=%#X\n", __func__, word_en);
DBG_871X("%s: data=", __func__);
DBG_88E("%s: offset=%#X\n", __func__, offset);
DBG_88E("%s: word_en=%#X\n", __func__, word_en);
DBG_88E("%s: data=", __func__);
for (i=0; i<PGPKT_DATA_SIZE; i++)
{
DBG_871X("0x%02X ", newdata[i]);
DBG_88E("0x%02X ", newdata[i]);
}
DBG_871X("\n");
DBG_88E("\n");
ret = Efuse_PgPacketWrite_BT(padapter, offset, word_en, newdata, _FALSE);
if (ret == _FAIL) break;
@ -1242,7 +1242,7 @@ int storeAdaptorInfoFile(char *path, struct eeprom_priv * eeprom_priv)
else
ret = _FAIL;
} else {
DBG_871X("%s NULL pointer\n",__func__);
DBG_88E("%s NULL pointer\n",__func__);
ret = _FAIL;
}
return ret;
@ -1263,7 +1263,7 @@ int retriveAdaptorInfoFile(char *path, struct eeprom_priv * eeprom_priv)
else
ret = _FAIL;
} else {
DBG_871X("%s NULL pointer\n",__func__);
DBG_88E("%s NULL pointer\n",__func__);
ret = _FAIL;
}
return ret;

32
core/rtw_ieee80211.c
View file

@ -879,7 +879,7 @@ u8 rtw_is_wps_ie(u8 *ie_ptr, uint *wps_ielen)
if ((eid==_WPA_IE_ID_)&&(_rtw_memcmp(&ie_ptr[2], wps_oui, 4)==_TRUE))
{
//DBG_8192C("==> found WPS_IE.....\n");
//DBG_88E("==> found WPS_IE.....\n");
*wps_ielen = ie_ptr[1]+2;
match=_TRUE;
}
@ -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", __func__, attr_ptr, attr_id, attr_data_len);
//DBG_88E("%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;
@ -1040,7 +1040,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
* sub-type. */
if (elen < 4) {
if (show_errors) {
DBG_871X("short vendor specific "
DBG_88E("short vendor specific "
"information element ignored (len=%lu)\n",
(unsigned long) elen);
}
@ -1061,7 +1061,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
break;
case WME_OUI_TYPE: /* this is a Wi-Fi WME info. element */
if (elen < 5) {
DBG_871X("short WME "
DBG_88E("short WME "
"information element ignored "
"(len=%lu)\n",
(unsigned long) elen);
@ -1078,7 +1078,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
elems->wme_tspec_len = elen;
break;
default:
DBG_871X("unknown WME "
DBG_88E("unknown WME "
"information element ignored "
"(subtype=%d len=%lu)\n",
pos[4], (unsigned long) elen);
@ -1091,7 +1091,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
elems->wps_ie_len = elen;
break;
default:
DBG_871X("Unknown Microsoft "
DBG_88E("Unknown Microsoft "
"information element ignored "
"(type=%d len=%lu)\n",
pos[3], (unsigned long) elen);
@ -1106,7 +1106,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
elems->vendor_ht_cap_len = elen;
break;
default:
DBG_871X("Unknown Broadcom "
DBG_88E("Unknown Broadcom "
"information element ignored "
"(type=%d len=%lu)\n",
pos[3], (unsigned long) elen);
@ -1115,7 +1115,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
break;
default:
DBG_871X("unknown vendor specific information "
DBG_88E("unknown vendor specific information "
"element ignored (vendor OUI %02x:%02x:%02x "
"len=%lu)\n",
pos[0], pos[1], pos[2], (unsigned long) elen);
@ -1153,7 +1153,7 @@ ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len,
if (elen > left) {
if (show_errors) {
DBG_871X("IEEE 802.11 element "
DBG_88E("IEEE 802.11 element "
"parse failed (id=%d elen=%d "
"left=%lu)\n",
id, elen, (unsigned long) left);
@ -1244,7 +1244,7 @@ ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len,
unknown++;
if (!show_errors)
break;
DBG_871X("IEEE 802.11 element parse "
DBG_88E("IEEE 802.11 element parse "
"ignored unknown element (id=%d elen=%d)\n",
id, elen);
break;
@ -1325,10 +1325,10 @@ void rtw_macaddr_cfg(u8 *mac_addr)
mac[5] = 0x00;
// use default mac addresss
_rtw_memcpy(mac_addr, mac, ETH_ALEN);
DBG_871X("MAC Address from efuse error, assign default one !!!\n");
DBG_88E("MAC Address from efuse error, assign default one !!!\n");
}
DBG_871X("rtw_macaddr_cfg MAC Address = "MAC_FMT"\n", MAC_ARG(mac_addr));
DBG_88E("rtw_macaddr_cfg MAC Address = "MAC_FMT"\n", MAC_ARG(mac_addr));
}
void dump_ies(u8 *buf, u32 buf_len) {
@ -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", __func__, id, len);
DBG_88E("%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", __func__, id, len);
DBG_88E("%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", __func__, id, len);
DBG_88E("%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", __func__, attr_ptr, attr_id, attr_data_len);
//DBG_88E("%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;

14
core/rtw_io.c
View file

@ -425,7 +425,7 @@ u8 dbg_rtw_read8(_adapter *adapter, u32 addr, const char *caller, const int line
u8 val = _rtw_read8(adapter, addr);
if (match_read_sniff_ranges(addr, 1))
DBG_871X("DBG_IO %s:%d rtw_read8(0x%04x) return 0x%02x\n", caller, line, addr, val);
DBG_88E("DBG_IO %s:%d rtw_read8(0x%04x) return 0x%02x\n", caller, line, addr, val);
return val;
}
@ -435,7 +435,7 @@ u16 dbg_rtw_read16(_adapter *adapter, u32 addr, const char *caller, const int li
u16 val = _rtw_read16(adapter, addr);
if (match_read_sniff_ranges(addr, 2))
DBG_871X("DBG_IO %s:%d rtw_read16(0x%04x) return 0x%04x\n", caller, line, addr, val);
DBG_88E("DBG_IO %s:%d rtw_read16(0x%04x) return 0x%04x\n", caller, line, addr, val);
return val;
}
@ -445,7 +445,7 @@ u32 dbg_rtw_read32(_adapter *adapter, u32 addr, const char *caller, const int li
u32 val = _rtw_read32(adapter, addr);
if (match_read_sniff_ranges(addr, 4))
DBG_871X("DBG_IO %s:%d rtw_read32(0x%04x) return 0x%08x\n", caller, line, addr, val);
DBG_88E("DBG_IO %s:%d rtw_read32(0x%04x) return 0x%08x\n", caller, line, addr, val);
return val;
}
@ -453,28 +453,28 @@ u32 dbg_rtw_read32(_adapter *adapter, u32 addr, const char *caller, const int li
int dbg_rtw_write8(_adapter *adapter, u32 addr, u8 val, const char *caller, const int line)
{
if (match_write_sniff_ranges(addr, 1))
DBG_871X("DBG_IO %s:%d rtw_write8(0x%04x, 0x%02x)\n", caller, line, addr, val);
DBG_88E("DBG_IO %s:%d rtw_write8(0x%04x, 0x%02x)\n", caller, line, addr, val);
return _rtw_write8(adapter, addr, val);
}
int dbg_rtw_write16(_adapter *adapter, u32 addr, u16 val, const char *caller, const int line)
{
if (match_write_sniff_ranges(addr, 2))
DBG_871X("DBG_IO %s:%d rtw_write16(0x%04x, 0x%04x)\n", caller, line, addr, val);
DBG_88E("DBG_IO %s:%d rtw_write16(0x%04x, 0x%04x)\n", caller, line, addr, val);
return _rtw_write16(adapter, addr, val);
}
int dbg_rtw_write32(_adapter *adapter, u32 addr, u32 val, const char *caller, const int line)
{
if (match_write_sniff_ranges(addr, 4))
DBG_871X("DBG_IO %s:%d rtw_write32(0x%04x, 0x%08x)\n", caller, line, addr, val);
DBG_88E("DBG_IO %s:%d rtw_write32(0x%04x, 0x%08x)\n", caller, line, addr, val);
return _rtw_write32(adapter, addr, val);
}
int dbg_rtw_writeN(_adapter *adapter, u32 addr ,u32 length , u8 *data, const char *caller, const int line)
{
if (match_write_sniff_ranges(addr, length))
DBG_871X("DBG_IO %s:%d rtw_writeN(0x%04x, %u)\n", caller, line, addr, length);
DBG_88E("DBG_IO %s:%d rtw_writeN(0x%04x, %u)\n", caller, line, addr, length);
return _rtw_writeN(adapter, addr, length, data);
}

16
core/rtw_ioctl_set.c
View file

@ -315,7 +315,7 @@ u8 rtw_set_802_11_bssid(_adapter* padapter, u8 *bssid)
_func_enter_;
DBG_871X_LEVEL(_drv_always_, "set bssid:%pM\n", bssid);
DBG_88E_LEVEL(_drv_info_, "set bssid:%pM\n", bssid);
if ((bssid[0]==0x00 && bssid[1]==0x00 && bssid[2]==0x00 && bssid[3]==0x00 && bssid[4]==0x00 &&bssid[5]==0x00) ||
(bssid[0]==0xFF && bssid[1]==0xFF && bssid[2]==0xFF && bssid[3]==0xFF && bssid[4]==0xFF &&bssid[5]==0xFF))
@ -327,7 +327,7 @@ _func_enter_;
_enter_critical_bh(&pmlmepriv->lock, &irqL);
DBG_871X("Set BSSID under fw_state=0x%08x\n", get_fwstate(pmlmepriv));
DBG_88E("Set BSSID under fw_state=0x%08x\n", get_fwstate(pmlmepriv));
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) {
goto handle_tkip_countermeasure;
} else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) {
@ -414,7 +414,7 @@ u8 rtw_set_802_11_ssid(_adapter* padapter, NDIS_802_11_SSID *ssid)
_func_enter_;
DBG_871X_LEVEL(_drv_always_, "set ssid [%s] fw_state=0x%08x\n",
DBG_88E_LEVEL(_drv_info_, "set ssid [%s] fw_state=0x%08x\n",
ssid->Ssid, get_fwstate(pmlmepriv));
if (padapter->hw_init_completed==_FALSE){
@ -426,7 +426,7 @@ _func_enter_;
_enter_critical_bh(&pmlmepriv->lock, &irqL);
DBG_871X("Set SSID under fw_state=0x%08x\n", get_fwstate(pmlmepriv));
DBG_88E("Set SSID under fw_state=0x%08x\n", get_fwstate(pmlmepriv));
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == _TRUE) {
goto handle_tkip_countermeasure;
} else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == _TRUE) {
@ -587,7 +587,7 @@ _func_enter_;
_enter_critical_bh(&pmlmepriv->lock, &irqL);
RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,(" change mode!"));
//DBG_871X("change mode, old_mode=%d, new_mode=%d, fw_state=0x%x\n", *pold_state, networktype, get_fwstate(pmlmepriv));
//DBG_88E("change mode, old_mode=%d, new_mode=%d, fw_state=0x%x\n", *pold_state, networktype, get_fwstate(pmlmepriv));
if (*pold_state==Ndis802_11APMode)
{
@ -716,7 +716,7 @@ _func_enter_;
}
} else {
if (rtw_is_scan_deny(padapter)) {
DBG_871X(FUNC_ADPT_FMT": scan deny\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT": scan deny\n", FUNC_ADPT_ARG(padapter));
indicate_wx_scan_complete_event(padapter);
return _SUCCESS;
}
@ -1417,7 +1417,7 @@ int rtw_set_country(_adapter *adapter, const char *country_code)
{
int channel_plan = RT_CHANNEL_DOMAIN_WORLD_WIDE_5G;
DBG_871X("%s country_code:%s\n", __func__, country_code);
DBG_88E("%s country_code:%s\n", __func__, country_code);
//TODO: should have a table to match country code and RT_CHANNEL_DOMAIN
//TODO: should consider 2-character and 3-character country code
@ -1430,7 +1430,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", __func__, country_code);
DBG_88E("%s unknown country_code:%s\n", __func__, country_code);
return rtw_set_channel_plan(adapter, channel_plan);
}

32
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", __func__);
DBG_88E("%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", __func__);
DBG_88E("%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", __func__);
DBG_88E("%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", __func__
DBG_88E("%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", __func__, ori_len, cmd_len, buf_offset+pattrib->pktlen);
//DBG_88E("%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", __func__, addr,value,mask);
//DBG_88E("%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", __func__, addr,value,mask);
//DBG_88E("%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);
@ -191,7 +191,7 @@ int _rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value, u
cmd.mask = cpu_to_le32(mask);
}
//DBG_871X("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FU2NCTION__, addr,value,mask);
//DBG_88E("%s addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FU2NCTION__, addr,value,mask);
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, cmd.length);
@ -213,7 +213,7 @@ int _rtw_IOL_append_WRF_cmd(struct xmit_frame *xmit_frame, u8 rf_path, u16 addr,
cmd.mask = cpu_to_le32(mask);
}
//DBG_871X("%s rf_path:0x%02x addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FU2NCTION__,rf_path, addr,value,mask);
//DBG_88E("%s rf_path:0x%02x addr:0x%04x,value:0x%08x,mask:0x%08x\n", __FU2NCTION__,rf_path, 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", __func__, us);
//DBG_88E("%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", __func__, ms);
//DBG_88E("%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)
@ -323,7 +323,7 @@ int _rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value)
int dbg_rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, const char *caller, const int line)
{
if (match_write_sniff_ranges(addr, 1))
DBG_871X("DBG_IO %s:%d IOL_WB(0x%04x, 0x%02x)\n", caller, line, addr, value);
DBG_88E("DBG_IO %s:%d IOL_WB(0x%04x, 0x%02x)\n", caller, line, addr, value);
return _rtw_IOL_append_WB_cmd(xmit_frame, addr, value);
}
@ -331,7 +331,7 @@ int dbg_rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value,
int dbg_rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, const char *caller, const int line)
{
if (match_write_sniff_ranges(addr, 2))
DBG_871X("DBG_IO %s:%d IOL_WW(0x%04x, 0x%04x)\n", caller, line, addr, value);
DBG_88E("DBG_IO %s:%d IOL_WW(0x%04x, 0x%04x)\n", caller, line, addr, value);
return _rtw_IOL_append_WW_cmd(xmit_frame, addr, value);
}
@ -339,7 +339,7 @@ int dbg_rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value
int dbg_rtw_IOL_append_WD_cmd(struct xmit_frame *xmit_frame, u16 addr, u32 value, const char *caller, const int line)
{
if (match_write_sniff_ranges(addr, 4))
DBG_871X("DBG_IO %s:%d IOL_WD(0x%04x, 0x%08x)\n", caller, line, addr, value);
DBG_88E("DBG_IO %s:%d IOL_WD(0x%04x, 0x%08x)\n", caller, line, addr, value);
return _rtw_IOL_append_WD_cmd(xmit_frame, addr, value);
}
@ -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", __func__, us);
//DBG_88E("%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", __func__, ms);
//DBG_88E("%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", __func__);
//DBG_88E("%s\n", __func__);
if ( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE))
{
//DBG_871X("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __func__, padapter->bSurpriseRemoved, padapter->bDriverStopped);
//DBG_88E("%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",__func__, current->comm, current->pid);
//DBG_88E("%s (%s:%d)\n",__func__, current->comm, current->pid);
if ( (padapter->bSurpriseRemoved == _TRUE) || ( padapter->bDriverStopped == _TRUE))
{
//DBG_871X("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __func__, padapter->bSurpriseRemoved, padapter->bDriverStopped);
//DBG_88E("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __func__, padapter->bSurpriseRemoved, padapter->bDriverStopped);
return;
}

98
core/rtw_mlme.c
View file

@ -322,7 +322,7 @@ _func_enter_;
pmlmepriv->num_of_scanned --;
//DBG_871X("_rtw_free_network:SSID=%s\n", pnetwork->network.Ssid.Ssid);
//DBG_88E("_rtw_free_network:SSID=%s\n", pnetwork->network.Ssid.Ssid);
_exit_critical_bh(&free_queue->lock, &irqL);
@ -725,7 +725,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"
DBG_88E("%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"
, __func__
, src->Ssid.Ssid, MAC_ARG(src->MacAddress), src->Configuration.DSConfig
,ss_ori, sq_ori, rssi_ori
@ -768,7 +768,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"
DBG_88E("%s %s("MAC_FMT"), SignalStrength:%u, SignalQuality:%u, RawRSSI:%ld\n"
, __func__
, dst->Ssid.Ssid, MAC_ARG(dst->MacAddress), dst->PhyInfo.SignalStrength, dst->PhyInfo.SignalQuality, dst->Rssi);
}
@ -986,7 +986,7 @@ int rtw_is_desired_network(_adapter *adapter, struct wlan_network *pnetwork)
if ((desired_encmode != Ndis802_11EncryptionDisabled) && (privacy == 0)) {
DBG_871X("desired_encmode: %d, privacy: %d\n", desired_encmode, privacy);
DBG_88E("desired_encmode: %d, privacy: %d\n", desired_encmode, privacy);
bselected = _FALSE;
}
@ -1194,9 +1194,9 @@ _func_enter_;
else
{
#ifdef CONFIG_LAYER2_ROAMING
DBG_871X("try_to_join, but select scanning queue fail, to_roaming:%d\n", pmlmepriv->to_roaming);
DBG_88E("try_to_join, but select scanning queue fail, to_roaming:%d\n", pmlmepriv->to_roaming);
#else
DBG_871X("try_to_join, but select scanning queue fail\n");
DBG_88E("try_to_join, but select scanning queue fail\n");
#endif
#ifdef CONFIG_LAYER2_ROAMING
@ -1218,7 +1218,7 @@ _func_enter_;
}
indicate_wx_scan_complete_event(adapter);
//DBG_871X("scan complete in %dms\n",rtw_get_passing_time_ms(pmlmepriv->scan_start_time));
//DBG_88E("scan complete in %dms\n",rtw_get_passing_time_ms(pmlmepriv->scan_start_time));
_exit_critical_bh(&pmlmepriv->lock, &irqL);
@ -1456,7 +1456,7 @@ _func_enter_;
_clr_fwstate_(pmlmepriv, _FW_UNDER_LINKING|WIFI_UNDER_WPS);
//DBG_871X("clear wps when %s\n", __func__);
//DBG_88E("clear wps when %s\n", __func__);
#ifdef CONFIG_LAYER2_ROAMING
if (pmlmepriv->to_roaming > 0)
@ -1527,13 +1527,13 @@ void rtw_scan_abort(_adapter *adapter)
if (adapter->bDriverStopped || adapter->bSurpriseRemoved)
break;
DBG_871X(FUNC_NDEV_FMT"fw_state=_FW_UNDER_SURVEY!\n", FUNC_NDEV_ARG(adapter->pnetdev));
DBG_88E(FUNC_NDEV_FMT"fw_state=_FW_UNDER_SURVEY!\n", FUNC_NDEV_ARG(adapter->pnetdev));
rtw_msleep_os(20);
}
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) {
if (!adapter->bDriverStopped && !adapter->bSurpriseRemoved)
DBG_871X(FUNC_NDEV_FMT"waiting for scan_abort time out!\n", FUNC_NDEV_ARG(adapter->pnetdev));
DBG_88E(FUNC_NDEV_FMT"waiting for scan_abort time out!\n", FUNC_NDEV_ARG(adapter->pnetdev));
#ifdef CONFIG_PLATFORM_MSTAR_TITANIA12
//_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY);
set_survey_timer(pmlmeext, 0);
@ -1558,7 +1558,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(_adapter *padapter, struct wl
if (psta) //update ptarget_sta
{
DBG_871X("%s\n", __func__);
DBG_88E("%s\n", __func__);
psta->aid = pnetwork->join_res;
#ifdef CONFIG_CONCURRENT_MODE
@ -1613,7 +1613,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", __func__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __func__, __LINE__,
preorder_ctrl->indicate_seq);
#endif
preorder_ctrl->wend_b= 0xffff;
@ -1631,7 +1631,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", __func__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __func__, __LINE__,
preorder_ctrl->indicate_seq);
#endif
preorder_ctrl->wend_b= 0xffff;
@ -1656,7 +1656,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", __func__);
DBG_88E("%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)));
@ -1679,7 +1679,7 @@ static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network *
//the ptarget_wlan->network.Rssi is raw data, we use ptarget_wlan->network.PhyInfo.SignalStrength instead (has scaled)
padapter->recvpriv.rssi = translate_percentage_to_dbm(ptarget_wlan->network.PhyInfo.SignalStrength);
#if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1
DBG_871X("%s signal_strength:%3u, rssi:%3d, signal_qual:%3u"
DBG_88E("%s signal_strength:%3u, rssi:%3d, signal_qual:%3u"
"\n"
, __func__
, padapter->recvpriv.signal_strength
@ -2105,7 +2105,7 @@ _func_enter_;
psta->qos_option = 0;
psta->mac_id = (uint)pstassoc->cam_id;
//psta->aid = (uint)pstassoc->cam_id;
DBG_871X("%s\n",__func__);
DBG_88E("%s\n",__func__);
//for ad-hoc mode
rtw_hal_set_odm_var(adapter,HAL_ODM_STA_INFO,psta,_TRUE);
@ -2170,7 +2170,7 @@ _func_enter_;
else
mac_id = pstadel->mac_id;
DBG_871X("%s(mac_id=%d)=" MAC_FMT "\n", __func__, mac_id, MAC_ARG(pstadel->macaddr));
DBG_88E("%s(mac_id=%d)=" MAC_FMT "\n", __func__, mac_id, MAC_ARG(pstadel->macaddr));
if (mac_id>=0){
u16 media_status;
@ -2338,7 +2338,7 @@ _func_enter_;
#endif
DBG_871X("%s, fw_state=%x\n", __func__, get_fwstate(pmlmepriv));
DBG_88E("%s, fw_state=%x\n", __func__, get_fwstate(pmlmepriv));
if (adapter->bDriverStopped ||adapter->bSurpriseRemoved)
return;
@ -2351,14 +2351,14 @@ _func_enter_;
while (1) {
pmlmepriv->to_roaming--;
if (pmlmepriv->to_roaming!=0) { //try another ,
DBG_871X("%s try another roaming\n", __func__);
DBG_88E("%s try another roaming\n", __func__);
if ( _SUCCESS!=(do_join_r=rtw_do_join(adapter)) ) {
DBG_871X("%s roaming do_join return %d\n", __func__ ,do_join_r);
DBG_88E("%s roaming do_join return %d\n", __func__ ,do_join_r);
continue;
}
break;
} else {
DBG_871X("%s We've try roaming but fail\n", __func__);
DBG_88E("%s We've try roaming but fail\n", __func__);
rtw_indicate_disconnect(adapter);
break;
}
@ -2394,7 +2394,7 @@ void rtw_scan_timeout_handler (_adapter *adapter)
_irqL irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv;
DBG_871X(FUNC_ADPT_FMT" fw_state=%x\n", FUNC_ADPT_ARG(adapter), get_fwstate(pmlmepriv));
DBG_88E(FUNC_ADPT_FMT" fw_state=%x\n", FUNC_ADPT_ARG(adapter), get_fwstate(pmlmepriv));
_enter_critical_bh(&pmlmepriv->lock, &irqL);
@ -2420,13 +2420,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", __func__);
DBG_88E("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",__func__, pmlmepriv->sitesurveyctrl.traffic_busy);
DBG_88E("%s exit cause traffic_busy(%x)\n",__func__, pmlmepriv->sitesurveyctrl.traffic_busy);
return;
}
*/
@ -2437,13 +2437,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", __func__);
DBG_88E("%s, but buddy_intf is under scanning or linking or BusyTraffic\n", __func__);
return;
}
}
#endif
DBG_871X("%s\n", __func__);
DBG_88E("%s\n", __func__);
rtw_set_802_11_bssid_list_scan(padapter, NULL, 0);
@ -2564,7 +2564,7 @@ inline void rtw_clear_scan_deny(_adapter *adapter)
struct mlme_priv *mlmepriv = &adapter->mlmepriv;
ATOMIC_SET(&mlmepriv->set_scan_deny, 0);
if (0)
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter));
DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter));
}
void rtw_set_scan_deny_timer_hdl(_adapter *adapter)
@ -2580,7 +2580,7 @@ void rtw_set_scan_deny(_adapter *adapter, u32 ms)
#endif
if (0)
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter));
DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter));
ATOMIC_SET(&mlmepriv->set_scan_deny, 1);
_set_timer(&mlmepriv->set_scan_deny_timer, ms);
@ -2589,7 +2589,7 @@ void rtw_set_scan_deny(_adapter *adapter, u32 ms)
return;
if (0)
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter->pbuddy_adapter));
DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(adapter->pbuddy_adapter));
b_mlmepriv = &adapter->pbuddy_adapter->mlmepriv;
ATOMIC_SET(&b_mlmepriv->set_scan_deny, 1);
_set_timer(&b_mlmepriv->set_scan_deny_timer, ms);
@ -2649,7 +2649,7 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
updated = _TRUE;
}
if (updated){
DBG_871X("[by_bssid:%u][assoc_ssid:%s]"
DBG_88E("[by_bssid:%u][assoc_ssid:%s]"
#ifdef CONFIG_LAYER2_ROAMING
"[to_roaming:%u] "
#endif
@ -2711,14 +2711,14 @@ _func_enter_;
}
if (candidate == NULL) {
DBG_871X("%s: return _FAIL(candidate == NULL)\n", __func__);
DBG_88E("%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", __func__,
DBG_88E("%s: candidate: %s("MAC_FMT", ch:%u)\n", __func__,
candidate->network.Ssid.Ssid, MAC_ARG(candidate->network.MacAddress),
candidate->network.Configuration.DSConfig);
}
@ -2727,7 +2727,7 @@ _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", __func__);
DBG_88E("%s: _FW_LINKED while ask_for_joinbss!!!\n", __func__);
{
rtw_disassoc_cmd(adapter, 0, _TRUE);
@ -2742,7 +2742,7 @@ _func_enter_;
{
u8 CurrentAntenna;
rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(CurrentAntenna));
DBG_871X("#### Opt_Ant_(%s) , cur_Ant(%s)\n",
DBG_88E("#### Opt_Ant_(%s) , cur_Ant(%s)\n",
(2==candidate->network.PhyInfo.Optimum_antenna)?"A":"B",
(2==CurrentAntenna)?"A":"B"
);
@ -2842,7 +2842,7 @@ _func_enter_;
) {
roaming_candidate = pnetwork;
//RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,
DBG_871X
DBG_88E
("roaming_candidate???: %s("MAC_FMT")\n",
roaming_candidate->network.Ssid.Ssid, MAC_ARG(roaming_candidate->network.MacAddress) )
//)
@ -2858,7 +2858,7 @@ _func_enter_;
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("dst_ssid=%s, src_ssid=%s\n", dst_ssid, src_ssid));
#ifdef CONFIG_ANTENNA_DIVERSITY
rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(CurrentAntenna));
DBG_871X("#### dst_ssid=(%s) Opt_Ant_(%s) , cur_Ant(%s)\n", dst_ssid,
DBG_88E("#### dst_ssid=(%s) Opt_Ant_(%s) , cur_Ant(%s)\n", dst_ssid,
(2==pnetwork->network.PhyInfo.Optimum_antenna)?"A":"B",
(2==CurrentAntenna)?"A":"B");
#endif
@ -2898,7 +2898,7 @@ _func_enter_;
#ifdef CONFIG_LAYER2_ROAMING
if (pmlmepriv->to_roaming>0 && roaming_candidate ){
pnetwork=roaming_candidate;
DBG_871X("select_and_join_from_scanned_queue: roaming_candidate: %s("MAC_FMT")\n",
DBG_88E("select_and_join_from_scanned_queue: roaming_candidate: %s("MAC_FMT")\n",
pnetwork->network.Ssid.Ssid, MAC_ARG(pnetwork->network.MacAddress));
goto ask_for_joinbss;
}
@ -2907,12 +2907,12 @@ _func_enter_;
if ((pmlmepriv->assoc_by_rssi==_TRUE) && (pnetwork_max_rssi!=NULL))
{
pnetwork = pnetwork_max_rssi;
DBG_871X("select_and_join_from_scanned_queue: pnetwork_max_rssi: %s("MAC_FMT")\n",
DBG_88E("select_and_join_from_scanned_queue: pnetwork_max_rssi: %s("MAC_FMT")\n",
pnetwork->network.Ssid.Ssid, MAC_ARG(pnetwork->network.MacAddress));
goto ask_for_joinbss;
}
DBG_871X("(1)rtw_select_and_join_from_scanned_queue return _FAIL\n");
DBG_88E("(1)rtw_select_and_join_from_scanned_queue return _FAIL\n");
_func_exit_;
@ -3016,10 +3016,10 @@ _func_enter_;
if ( _TRUE == adapter->pwrctrlpriv.bInternalAutoSuspend)
{
adapter->pwrctrlpriv.wepkeymask = pmlmepriv->key_mask;
DBG_871X("....AutoSuspend pwrctrlpriv.wepkeymask(%x)\n",adapter->pwrctrlpriv.wepkeymask);
DBG_88E("....AutoSuspend pwrctrlpriv.wepkeymask(%x)\n",adapter->pwrctrlpriv.wepkeymask);
}
#endif
DBG_871X("==> rtw_set_key algorithm(%x),keyid(%x),key_mask(%x)\n",psetkeyparm->algorithm,psetkeyparm->keyid,pmlmepriv->key_mask);
DBG_88E("==> rtw_set_key algorithm(%x),keyid(%x),key_mask(%x)\n",psetkeyparm->algorithm,psetkeyparm->keyid,pmlmepriv->key_mask);
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,("\n rtw_set_key: psetkeyparm->algorithm=%d psetkeyparm->keyid=(u8)keyid=%d\n",psetkeyparm->algorithm, keyid));
switch (psetkeyparm->algorithm){
@ -3438,7 +3438,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", __func__);
// DBG_88E("%s IEEE80211_HT_CAP_MAX_AMSDU is set\n", __func__);
// ht_capie.cap_info = ht_capie.cap_info |IEEE80211_HT_CAP_MAX_AMSDU;
//}
}
@ -3511,7 +3511,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
if ((!pmlmeinfo->HT_info_enable) || (!pmlmeinfo->HT_caps_enable))
return;
DBG_871X("+rtw_update_ht_cap()\n");
DBG_88E("+rtw_update_ht_cap()\n");
//maybe needs check if ap supports rx ampdu.
if ((phtpriv->ampdu_enable==_FALSE) &&(pregistrypriv->ampdu_enable==1))
@ -3540,7 +3540,7 @@ void rtw_update_ht_cap(_adapter *padapter, u8 *pie, uint ie_len)
max_ampdu_sz = (pht_capie->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_FACTOR);
max_ampdu_sz = 1 << (max_ampdu_sz+3); // max_ampdu_sz (kbytes);
//DBG_871X("rtw_update_ht_cap(): max_ampdu_sz=%d\n", max_ampdu_sz);
//DBG_88E("rtw_update_ht_cap(): max_ampdu_sz=%d\n", max_ampdu_sz);
phtpriv->rx_ampdu_maxlen = max_ampdu_sz;
}
@ -3621,7 +3621,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",__func__);
DBG_88E("%s(): WLAN_HT_CAP_SM_PS_STATIC\n",__func__);
}
//
@ -3664,7 +3664,7 @@ void rtw_issue_addbareq_cmd(_adapter *padapter, struct xmit_frame *pxmitframe)
if (0==issued)
{
DBG_871X("rtw_issue_addbareq_cmd, p=%d\n", priority);
DBG_88E("rtw_issue_addbareq_cmd, p=%d\n", priority);
psta->htpriv.candidate_tid_bitmap |= BIT((u8)priority);
rtw_addbareq_cmd(padapter,(u8) priority, pattrib->ra);
}
@ -3697,7 +3697,7 @@ void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
pnetwork = &pmlmepriv->cur_network;
if (0 < pmlmepriv->to_roaming) {
DBG_871X("roaming from %s("MAC_FMT"), length:%d\n",
DBG_88E("roaming from %s("MAC_FMT"), length:%d\n",
pnetwork->network.Ssid.Ssid, MAC_ARG(pnetwork->network.MacAddress),
pnetwork->network.Ssid.SsidLength);
_rtw_memcpy(&pmlmepriv->assoc_ssid, &pnetwork->network.Ssid, sizeof(NDIS_802_11_SSID));
@ -3712,13 +3712,13 @@ void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network)
if ( _SUCCESS==(do_join_r=rtw_do_join(padapter)) ) {
break;
} else {
DBG_871X("roaming do_join return %d\n", do_join_r);
DBG_88E("roaming do_join return %d\n", do_join_r);
pmlmepriv->to_roaming--;
if (0< pmlmepriv->to_roaming) {
continue;
} else {
DBG_871X("%s(%d) -to roaming fail, indicate_disconnect\n", __func__,__LINE__);
DBG_88E("%s(%d) -to roaming fail, indicate_disconnect\n", __func__,__LINE__);
rtw_indicate_disconnect(padapter);
break;
}

460
core/rtw_mlme_ext.c
View file

File diff suppressed because it is too large Load diff

10
core/rtw_mp.c
View file

@ -966,7 +966,7 @@ static thread_return mp_xmit_packet_thread(thread_context context)
thread_enter("RTW_MP_THREAD");
//DBG_871X("%s:pkTx Start\n", __func__);
//DBG_88E("%s:pkTx Start\n", __func__);
while (1) {
pxmitframe = alloc_mp_xmitframe(pxmitpriv);
if (pxmitframe == NULL) {
@ -1001,7 +1001,7 @@ static thread_return mp_xmit_packet_thread(thread_context context)
}
exit:
//DBG_871X("%s:pkTx Exit\n", __func__);
//DBG_88E("%s:pkTx Exit\n", __func__);
rtw_mfree(pmptx->pallocated_buf, pmptx->buf_size);
pmptx->pallocated_buf = NULL;
pmptx->stop = 1;
@ -1058,7 +1058,7 @@ void SetPacketTx(PADAPTER padapter)
pmp_priv->tx.buf_size = pkt_size + XMITBUF_ALIGN_SZ;
pmp_priv->tx.pallocated_buf = rtw_zmalloc(pmp_priv->tx.buf_size);
if (pmp_priv->tx.pallocated_buf == NULL) {
DBG_871X("%s: malloc(%d) fail!!\n", __func__, pmp_priv->tx.buf_size);
DBG_88E("%s: malloc(%d) fail!!\n", __func__, pmp_priv->tx.buf_size);
return;
}
pmp_priv->tx.buf = (u8 *)N_BYTE_ALIGMENT((SIZE_PTR)(pmp_priv->tx.pallocated_buf), XMITBUF_ALIGN_SZ);
@ -1167,7 +1167,7 @@ void SetPacketTx(PADAPTER padapter)
#ifdef PLATFORM_LINUX
pmp_priv->tx.PktTxThread = kthread_run(mp_xmit_packet_thread, pmp_priv, "RTW_MP_THREAD");
if (IS_ERR(pmp_priv->tx.PktTxThread))
DBG_871X("Create PktTx Thread Fail !!!!!\n");
DBG_88E("Create PktTx Thread Fail !!!!!\n");
#endif
#ifdef PLATFORM_FREEBSD
{
@ -1177,7 +1177,7 @@ void SetPacketTx(PADAPTER padapter)
&p, &td, RFHIGHPID, 0, "MPXmitThread", "MPXmitThread");
if (pmp_priv->tx.PktTxThread < 0)
DBG_871X("Create PktTx Thread Fail !!!!!\n");
DBG_88E("Create PktTx Thread Fail !!!!!\n");
}
#endif
}

6
core/rtw_mp_ioctl.c
View file

@ -733,7 +733,7 @@ _func_enter_;
struct mp_priv *pmp_priv = &Adapter->mppriv;
if (pmp_priv->tx.stop == 0) {
pmp_priv->tx.stop = 1;
DBG_871X("%s: pkt tx is running...\n", __func__);
DBG_88E("%s: pkt tx is running...\n", __func__);
rtw_msleep_os(5);
}
pmp_priv->tx.stop = 0;
@ -771,7 +771,7 @@ _func_enter_;
struct mp_priv *pmp_priv = &Adapter->mppriv;
if (pmp_priv->tx.stop == 0) {
pmp_priv->tx.stop = 1;
DBG_871X("%s: pkt tx is running...\n", __func__);
DBG_88E("%s: pkt tx is running...\n", __func__);
rtw_msleep_os(5);
}
pmp_priv->tx.stop = 0;
@ -809,7 +809,7 @@ _func_enter_;
struct mp_priv *pmp_priv = &Adapter->mppriv;
if (pmp_priv->tx.stop == 0) {
pmp_priv->tx.stop = 1;
DBG_871X("%s: pkt tx is running...\n", __func__);
DBG_88E("%s: pkt tx is running...\n", __func__);
rtw_msleep_os(5);
}
pmp_priv->tx.stop = 0;

144
core/rtw_p2p.c
View file

@ -63,7 +63,7 @@ int is_any_client_associated( _adapter *padapter )
if ((intFound == _FALSE && pstapriv->asoc_list_cnt)
|| (intFound == _TRUE && !pstapriv->asoc_list_cnt)) {
DBG_871X("%s intFound:%d, asoc_list_cnt:%u mismatch\n", __func__
DBG_88E("%s intFound:%d, asoc_list_cnt:%u mismatch\n", __func__
, intFound, pstapriv->asoc_list_cnt);
}
@ -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", __func__);
DBG_88E("%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", __func__);
DBG_88E("[%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", __func__);
DBG_88E("[%s]\n", __func__);
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
{
@ -416,7 +416,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", __func__);
DBG_88E("[%s]\n", __func__);
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
{
@ -2361,12 +2361,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", __func__ );
DBG_88E( "[%s] P2P IE not Found!!\n", __func__ );
status_code = P2P_STATUS_FAIL_INVALID_PARAM;
}
else
{
DBG_8192C( "[%s] P2P IE Found!!\n", __func__ );
DBG_88E( "[%s] P2P IE Found!!\n", __func__ );
}
while ( p2p_ie )
@ -2374,7 +2374,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", __func__ );
DBG_88E( "[%s] Got P2P Capability Attr!!\n", __func__ );
cap_attr = le16_to_cpu(cap_attr);
psta->dev_cap = cap_attr&0xff;
}
@ -2385,7 +2385,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", __func__ );
DBG_88E( "[%s] Got P2P DEVICE INFO Attr!!\n", __func__ );
pattr_content = pbuf = rtw_zmalloc(attr_contentlen);
if (pattr_content)
{
@ -2590,7 +2590,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", __func__, pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req );
DBG_88E( "[%s] config method = %s\n", __func__, pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req );
return _TRUE;
}
@ -2713,7 +2713,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
}
else
{
DBG_871X( "[%s] WPS IE not Found!!\n", __func__ );
DBG_88E( "[%s] WPS IE not Found!!\n", __func__ );
result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
return( result );
@ -2733,7 +2733,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
if ( !p2p_ie )
{
DBG_871X( "[%s] P2P IE not Found!!\n", __func__ );
DBG_88E( "[%s] P2P IE not Found!!\n", __func__ );
result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
}
@ -2765,7 +2765,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", __func__, attr_content >> 1, attr_content & 0x01 );
DBG_88E( "[%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 ) )
@ -2822,7 +2822,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", __func__ );
DBG_88E( "[%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;
@ -2836,7 +2836,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", __func__ );
DBG_88E( "[%s] desired channel NOT Found!\n", __func__ );
result = P2P_STATUS_FAIL_NO_COMMON_CH;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
break;
@ -2859,13 +2859,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", __func__, pwdinfo->operating_channel);
DBG_88E( "[%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", __func__, pwdinfo->operating_channel);
DBG_88E( "[%s] Change op ch to %02x\n", __func__, pwdinfo->operating_channel);
}
}
@ -2885,12 +2885,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", __func__ );
DBG_88E( "[%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", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
DBG_88E( "[%s] Peer PORT NUM = %d\n", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
}
}
#endif // CONFIG_WFD
@ -2925,7 +2925,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
}
else
{
DBG_871X( "[%s] WPS IE not Found!!\n", __func__ );
DBG_88E( "[%s] WPS IE not Found!!\n", __func__ );
result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
}
@ -2968,7 +2968,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", __func__, attr_content );
DBG_88E( "[%s] Status = %d\n", __func__, attr_content );
if ( attr_content == P2P_STATUS_SUCCESS )
{
// Do nothing.
@ -3001,7 +3001,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", __func__, attr_content >> 1, attr_content & 0x01 );
DBG_88E( "[%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 ) )
@ -3054,21 +3054,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", __func__, operatingch_info[4] );
DBG_88E( "[%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", __func__, pwdinfo->channel_list_attr_len );
DBG_88E( "[%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", __func__ );
DBG_88E( "[%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;
@ -3082,7 +3082,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", __func__ );
DBG_88E( "[%s] desired channel NOT Found!\n", __func__ );
result = P2P_STATUS_FAIL_NO_COMMON_CH;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
break;
@ -3105,13 +3105,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", __func__, pwdinfo->operating_channel);
DBG_88E( "[%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", __func__, pwdinfo->operating_channel);
DBG_88E( "[%s] Change op ch to %02x\n", __func__, pwdinfo->operating_channel);
}
}
@ -3121,7 +3121,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
}
else
{
DBG_871X( "[%s] channel list attribute not found!\n", __func__);
DBG_88E( "[%s] channel list attribute not found!\n", __func__);
}
// Try to get the group id information if peer is GO
@ -3147,12 +3147,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", __func__ );
DBG_88E( "[%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", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
DBG_88E( "[%s] Peer PORT NUM = %d\n", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
}
}
#endif // CONFIG_WFD
@ -3182,7 +3182,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", __func__, attr_content );
DBG_88E( "[%s] Status = %d\n", __func__, attr_content );
result = attr_content;
if ( attr_content == P2P_STATUS_SUCCESS )
@ -3237,7 +3237,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", __func__, &groupid[ETH_ALEN], strlen(&groupid[ETH_ALEN]) );
DBG_88E( "[%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 );
}
@ -3245,7 +3245,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", __func__, operatingch_info[4] );
DBG_88E( "[%s] Peer's operating channel = %d\n", __func__, operatingch_info[4] );
pwdinfo->peer_operating_ch = operatingch_info[4];
}
@ -3404,7 +3404,7 @@ _func_enter_;
pwdinfo->operating_channel = pbuddy_mlmeext->cur_channel;
#ifdef CONFIG_IOCTL_CFG80211
DBG_871X("%s, switch ch back to buddy's cur_channel=%d\n", __func__, pbuddy_mlmeext->cur_channel);
DBG_88E("%s, switch ch back to buddy's cur_channel=%d\n", __func__, pbuddy_mlmeext->cur_channel);
set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode);
@ -3417,7 +3417,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", __func__, pwdinfo->ext_listen_period );
DBG_88E( "[%s] P2P_STATE_IDLE, ext_listen_period = %d\n", __func__, pwdinfo->ext_listen_period );
if ( pbuddy_mlmeext->cur_channel != pwdinfo->listen_channel )
{
@ -3440,7 +3440,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", __func__, pwdinfo->ext_listen_interval );
DBG_88E( "[%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
@ -3520,7 +3520,7 @@ _func_enter_;
PADAPTER pbuddy_adapter = padapter->pbuddy_adapter;
struct mlme_ext_priv *pbuddy_mlmeext = &pbuddy_adapter->mlmeextpriv;
DBG_871X("%s, switch ch back to buddy's cur_channel=%d\n", __func__, pbuddy_mlmeext->cur_channel);
DBG_88E("%s, switch ch back to buddy's cur_channel=%d\n", __func__, pbuddy_mlmeext->cur_channel);
set_channel_bwmode(padapter, pbuddy_mlmeext->cur_channel, pbuddy_mlmeext->cur_ch_offset, pbuddy_mlmeext->cur_bwmode);
@ -3538,13 +3538,13 @@ _func_enter_;
rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo));
#ifdef CONFIG_DEBUG_CFG80211
DBG_871X("%s, role=%d, p2p_state=%d\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo));
DBG_88E("%s, role=%d, p2p_state=%d\n", __func__, rtw_p2p_role(pwdinfo), rtw_p2p_state(pwdinfo));
#endif
}
pcfg80211_wdinfo->is_ro_ch = _FALSE;
DBG_871X("cfg80211_remain_on_channel_expired\n");
DBG_88E("cfg80211_remain_on_channel_expired\n");
cfg80211_remain_on_channel_expired(pcfg80211_wdinfo->remain_on_ch_dev,
pcfg80211_wdinfo->remain_on_ch_cookie,
@ -3705,7 +3705,7 @@ void rtw_append_wfd_ie(_adapter *padapter, u8 *buf, u32* len)
dialogToken = frame_body[6];
#ifdef CONFIG_DEBUG_CFG80211
DBG_871X("ACTION_CATEGORY_P2P: OUI=0x%x, OUI_Subtype=%d, dialogToken=%d\n",
DBG_88E("ACTION_CATEGORY_P2P: OUI=0x%x, OUI_Subtype=%d, dialogToken=%d\n",
cpu_to_be32( *( ( u32* ) ( frame_body + 1 ) ) ), OUI_Subtype, dialogToken);
#endif
@ -3731,7 +3731,7 @@ void rtw_append_wfd_ie(_adapter *padapter, u8 *buf, u32* len)
}
else
{
DBG_871X("%s, action frame category=%d\n", __func__, category);
DBG_88E("%s, action frame category=%d\n", __func__, category);
//is_p2p_frame = (-1);
}
@ -3762,7 +3762,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
dialogToken = frame_body[7];
is_p2p_frame = OUI_Subtype;
#ifdef CONFIG_DEBUG_CFG80211
DBG_871X("ACTION_CATEGORY_PUBLIC: ACT_PUBLIC_VENDOR, OUI=0x%x, OUI_Subtype=%d, dialogToken=%d\n",
DBG_88E("ACTION_CATEGORY_PUBLIC: ACT_PUBLIC_VENDOR, OUI=0x%x, OUI_Subtype=%d, dialogToken=%d\n",
cpu_to_be32( *( ( u32* ) ( frame_body + 2 ) ) ), OUI_Subtype, dialogToken);
#endif
@ -3776,7 +3776,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
u8 *cont;
uint cont_len;
case P2P_GO_NEGO_REQ:
DBG_871X("RTW_%s:P2P_GO_NEGO_REQ, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken);
DBG_88E("RTW_%s:P2P_GO_NEGO_REQ, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken);
if (tx)
{
@ -3796,7 +3796,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
break;
case P2P_GO_NEGO_RESP:
cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, NULL, &cont_len);
DBG_871X("RTW_%s:P2P_GO_NEGO_RESP, dialogToken=%d, status:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, cont?*cont:-1);
DBG_88E("RTW_%s:P2P_GO_NEGO_RESP, dialogToken=%d, status:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, cont?*cont:-1);
if (!tx)
{
@ -3812,7 +3812,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
break;
case P2P_GO_NEGO_CONF:
cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, NULL, &cont_len);
DBG_871X("RTW_%s:P2P_GO_NEGO_CONF, dialogToken=%d, status:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, cont?*cont:-1);
DBG_88E("RTW_%s:P2P_GO_NEGO_CONF, dialogToken=%d, status:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, cont?*cont:-1);
#ifdef CONFIG_CONCURRENT_MODE
if (tx)
@ -3848,7 +3848,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
invit_info->flags = (flags==-1) ? 0x0 : flags;
invit_info->req_op_ch= op_ch;
DBG_871X("RTW_%s:P2P_INVIT_REQ, dialogToken=%d, flags:0x%02x, op_ch:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, flags, op_ch);
DBG_88E("RTW_%s:P2P_INVIT_REQ, dialogToken=%d, flags:0x%02x, op_ch:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, flags, op_ch);
break;
}
case P2P_INVIT_RESP:
@ -3878,15 +3878,15 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
invit_info->rsp_op_ch= op_ch;
}
DBG_871X("RTW_%s:P2P_INVIT_RESP, dialogToken=%d, status:%d, op_ch:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, status, op_ch);
DBG_88E("RTW_%s:P2P_INVIT_RESP, dialogToken=%d, status:%d, op_ch:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, status, op_ch);
break;
}
case P2P_DEVDISC_REQ:
DBG_871X("RTW_%s:P2P_DEVDISC_REQ, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken);
DBG_88E("RTW_%s:P2P_DEVDISC_REQ, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken);
break;
case P2P_DEVDISC_RESP:
cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, NULL, &cont_len);
DBG_871X("RTW_%s:P2P_DEVDISC_RESP, dialogToken=%d, status:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, cont?*cont:-1);
DBG_88E("RTW_%s:P2P_DEVDISC_RESP, dialogToken=%d, status:%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken, cont?*cont:-1);
break;
case P2P_PROVISION_DISC_REQ:
{
@ -3895,7 +3895,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
uint p2p_ielen = 0;
uint contentlen = 0;
DBG_871X("RTW_%s:P2P_PROVISION_DISC_REQ, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken);
DBG_88E("RTW_%s:P2P_PROVISION_DISC_REQ, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken);
//if (tx)
{
@ -3911,7 +3911,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
else
{
#ifdef CONFIG_DEBUG_CFG80211
DBG_871X("provdisc_req_issued is _TRUE\n");
DBG_88E("provdisc_req_issued is _TRUE\n");
#endif //CONFIG_DEBUG_CFG80211
pwdev_priv->provdisc_req_issued = _TRUE;//case: p2p_devices connection before Nego req.
}
@ -3921,10 +3921,10 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
}
break;
case P2P_PROVISION_DISC_RESP:
DBG_871X("RTW_%s:P2P_PROVISION_DISC_RESP, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken);
DBG_88E("RTW_%s:P2P_PROVISION_DISC_RESP, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", dialogToken);
break;
default:
DBG_871X("RTW_%s:OUI_Subtype=%d, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", OUI_Subtype, dialogToken);
DBG_88E("RTW_%s:OUI_Subtype=%d, dialogToken=%d\n", (tx==_TRUE)?"Tx":"Rx", OUI_Subtype, dialogToken);
break;
}
@ -3937,7 +3937,7 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
dialogToken = frame_body[6];
#ifdef CONFIG_DEBUG_CFG80211
DBG_871X("ACTION_CATEGORY_P2P: OUI=0x%x, OUI_Subtype=%d, dialogToken=%d\n",
DBG_88E("ACTION_CATEGORY_P2P: OUI=0x%x, OUI_Subtype=%d, dialogToken=%d\n",
cpu_to_be32( *( ( u32* ) ( frame_body + 1 ) ) ), OUI_Subtype, dialogToken);
#endif
@ -3946,26 +3946,26 @@ int rtw_p2p_check_frames(_adapter *padapter, const u8 *buf, u32 len, u8 tx)
switch (OUI_Subtype)
{
case P2P_NOTICE_OF_ABSENCE:
DBG_871X("RTW_%s:P2P_NOTICE_OF_ABSENCE, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken);
DBG_88E("RTW_%s:P2P_NOTICE_OF_ABSENCE, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken);
break;
case P2P_PRESENCE_REQUEST:
DBG_871X("RTW_%s:P2P_PRESENCE_REQUEST, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken);
DBG_88E("RTW_%s:P2P_PRESENCE_REQUEST, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken);
break;
case P2P_PRESENCE_RESPONSE:
DBG_871X("RTW_%s:P2P_PRESENCE_RESPONSE, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken);
DBG_88E("RTW_%s:P2P_PRESENCE_RESPONSE, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken);
break;
case P2P_GO_DISC_REQUEST:
DBG_871X("RTW_%s:P2P_GO_DISC_REQUEST, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken);
DBG_88E("RTW_%s:P2P_GO_DISC_REQUEST, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", dialogToken);
break;
default:
DBG_871X("RTW_%s:OUI_Subtype=%d, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", OUI_Subtype, dialogToken);
DBG_88E("RTW_%s:OUI_Subtype=%d, dialogToken=%d\n", (tx==_TRUE)?"TX":"RX", OUI_Subtype, dialogToken);
break;
}
}
else
{
DBG_871X("RTW_%s:action frame category=%d\n", (tx==_TRUE)?"TX":"RX", category);
DBG_88E("RTW_%s:action frame category=%d\n", (tx==_TRUE)?"TX":"RX", category);
//is_p2p_frame = (-1);
}
@ -4220,7 +4220,7 @@ _func_enter_;
if (pwrpriv->smart_ps != 0)
{
pwrpriv->smart_ps = 0;
DBG_871X("%s(): Enter CTW, change SmartPS\n", __func__);
DBG_88E("%s(): Enter CTW, change SmartPS\n", __func__);
rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&(padapter->pwrctrlpriv.pwr_mode)));
}
}
@ -4306,7 +4306,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", __func__ );
DBG_88E( "[%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;
@ -4320,7 +4320,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", __func__ );
DBG_88E( "[%s] In\n", __func__ );
// Reset the operation channel information
pwdinfo->p2p_info.operation_ch[0] = 0;
pwdinfo->p2p_info.scan_op_ch_only = 0;
@ -4376,7 +4376,7 @@ static void pre_tx_scan_timer_process (void *FunctionContext)
}
else
{
DBG_8192C( "[%s] p2p_state is %d, ignore!!\n", __func__, rtw_p2p_state(pwdinfo) );
DBG_88E( "[%s] p2p_state is %d, ignore!!\n", __func__, rtw_p2p_state(pwdinfo) );
}
_exit_critical_bh(&pmlmepriv->lock, &irqL);
@ -4583,7 +4583,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", __func__, pwdinfo->listen_dwell );
//DBG_88E( "[%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;
@ -4665,11 +4665,11 @@ void dbg_rtw_p2p_set_state(struct wifidirect_info *wdinfo, enum P2P_STATE state,
if (!_rtw_p2p_chk_state(wdinfo, state)) {
enum P2P_STATE old_state = _rtw_p2p_state(wdinfo);
_rtw_p2p_set_state(wdinfo, state);
DBG_871X("[CONFIG_DBG_P2P]%s:%d set_state from %s to %s\n", caller, line
DBG_88E("[CONFIG_DBG_P2P]%s:%d set_state from %s to %s\n", caller, line
, p2p_state_str[old_state], p2p_state_str[_rtw_p2p_state(wdinfo)]
);
} else {
DBG_871X("[CONFIG_DBG_P2P]%s:%d set_state to same state %s\n", caller, line
DBG_88E("[CONFIG_DBG_P2P]%s:%d set_state to same state %s\n", caller, line
, p2p_state_str[_rtw_p2p_state(wdinfo)]
);
}
@ -4679,11 +4679,11 @@ void dbg_rtw_p2p_set_pre_state(struct wifidirect_info *wdinfo, enum P2P_STATE st
if (_rtw_p2p_pre_state(wdinfo) != state) {
enum P2P_STATE old_state = _rtw_p2p_pre_state(wdinfo);
_rtw_p2p_set_pre_state(wdinfo, state);
DBG_871X("[CONFIG_DBG_P2P]%s:%d set_pre_state from %s to %s\n", caller, line
DBG_88E("[CONFIG_DBG_P2P]%s:%d set_pre_state from %s to %s\n", caller, line
, p2p_state_str[old_state], p2p_state_str[_rtw_p2p_pre_state(wdinfo)]
);
} else {
DBG_871X("[CONFIG_DBG_P2P]%s:%d set_pre_state to same state %s\n", caller, line
DBG_88E("[CONFIG_DBG_P2P]%s:%d set_pre_state to same state %s\n", caller, line
, p2p_state_str[_rtw_p2p_pre_state(wdinfo)]
);
}
@ -4694,11 +4694,11 @@ void dbg_rtw_p2p_set_role(struct wifidirect_info *wdinfo, enum P2P_ROLE role, co
if (wdinfo->role != role) {
enum P2P_ROLE old_role = wdinfo->role;
_rtw_p2p_set_role(wdinfo, role);
DBG_871X("[CONFIG_DBG_P2P]%s:%d set_role from %s to %s\n", caller, line
DBG_88E("[CONFIG_DBG_P2P]%s:%d set_role from %s to %s\n", caller, line
, p2p_role_str[old_role], p2p_role_str[wdinfo->role]
);
} else {
DBG_871X("[CONFIG_DBG_P2P]%s:%d set_role to same role %s\n", caller, line
DBG_88E("[CONFIG_DBG_P2P]%s:%d set_role to same role %s\n", caller, line
, p2p_role_str[wdinfo->role]
);
}

120
core/rtw_pwrctrl.c
View file

@ -43,8 +43,8 @@ void ips_enter(_adapter * padapter)
if (pxmit_priv->free_xmitbuf_cnt != NR_XMITBUFF ||
pxmit_priv->free_xmit_extbuf_cnt != NR_XMIT_EXTBUFF) {
DBG_871X_LEVEL(_drv_always_, "There are some pkts to transmit\n");
DBG_871X_LEVEL(_drv_info_, "free_xmitbuf_cnt: %d, free_xmit_extbuf_cnt: %d\n",
DBG_88E_LEVEL(_drv_info_, "There are some pkts to transmit\n");
DBG_88E_LEVEL(_drv_info_, "free_xmitbuf_cnt: %d, free_xmit_extbuf_cnt: %d\n",
pxmit_priv->free_xmitbuf_cnt, pxmit_priv->free_xmit_extbuf_cnt);
return;
}
@ -57,14 +57,14 @@ void ips_enter(_adapter * padapter)
pwrpriv->ips_mode = pwrpriv->ips_mode_req;
pwrpriv->ips_enter_cnts++;
DBG_871X("==>ips_enter cnts:%d\n",pwrpriv->ips_enter_cnts);
DBG_88E("==>ips_enter cnts:%d\n",pwrpriv->ips_enter_cnts);
#ifdef CONFIG_BT_COEXIST
BTDM_TurnOffBtCoexistBeforeEnterIPS(padapter);
#endif
if (rf_off == pwrpriv->change_rfpwrstate )
{
pwrpriv->bpower_saving = _TRUE;
DBG_871X_LEVEL(_drv_always_, "nolinked power save enter\n");
DBG_88E_LEVEL(_drv_info_, "nolinked power save enter\n");
if (pwrpriv->ips_mode == IPS_LEVEL_2)
pwrpriv->bkeepfwalive = _TRUE;
@ -94,16 +94,16 @@ int ips_leave(_adapter * padapter)
pwrpriv->bips_processing = _TRUE;
pwrpriv->change_rfpwrstate = rf_on;
pwrpriv->ips_leave_cnts++;
DBG_871X("==>ips_leave cnts:%d\n",pwrpriv->ips_leave_cnts);
DBG_88E("==>ips_leave cnts:%d\n",pwrpriv->ips_leave_cnts);
if ((result = rtw_ips_pwr_up(padapter)) == _SUCCESS) {
pwrpriv->rf_pwrstate = rf_on;
}
DBG_871X_LEVEL(_drv_always_, "nolinked power save leave\n");
DBG_88E_LEVEL(_drv_info_, "nolinked power save leave\n");
if ((_WEP40_ == psecuritypriv->dot11PrivacyAlgrthm) ||(_WEP104_ == psecuritypriv->dot11PrivacyAlgrthm))
{
DBG_871X("==>%s,channel(%d),processing(%x)\n",__func__,padapter->mlmeextpriv.cur_channel,pwrpriv->bips_processing);
DBG_88E("==>%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)){
@ -115,7 +115,7 @@ int ips_leave(_adapter * padapter)
}
}
DBG_871X("==> ips_leave.....LED(0x%08x)...\n",rtw_read32(padapter,0x4c));
DBG_88E("==> ips_leave.....LED(0x%08x)...\n",rtw_read32(padapter,0x4c));
pwrpriv->bips_processing = _FALSE;
pwrpriv->bkeepfwalive = _FALSE;
@ -154,7 +154,7 @@ bool rtw_pwr_unassociated_idle(_adapter *adapter)
bool ret = _FALSE;
if (adapter->pwrctrlpriv.ips_deny_time >= rtw_get_current_time()) {
//DBG_871X("%s ips_deny_time\n", __func__);
//DBG_88E("%s ips_deny_time\n", __func__);
goto exit;
}
@ -218,7 +218,7 @@ void rtw_ps_processor(_adapter*padapter)
if (pwrpriv->bips_processing == _TRUE)
goto exit;
//DBG_871X("==> fw report state(0x%x)\n",rtw_read8(padapter,0x1ca));
//DBG_88E("==> fw report state(0x%x)\n",rtw_read8(padapter,0x1ca));
if (padapter->pwrctrlpriv.bHWPwrPindetect)
{
#ifdef CONFIG_AUTOSUSPEND
@ -230,7 +230,7 @@ void rtw_ps_processor(_adapter*padapter)
pwrpriv->ps_flag = _TRUE;
rfpwrstate = RfOnOffDetect(padapter);
DBG_871X("@@@@- #1 %s==> rfstate:%s\n",__func__,(rfpwrstate==rf_on)?"rf_on":"rf_off");
DBG_88E("@@@@- #1 %s==> rfstate:%s\n",__func__,(rfpwrstate==rf_on)?"rf_on":"rf_off");
if (rfpwrstate!= pwrpriv->rf_pwrstate)
{
if (rfpwrstate == rf_off)
@ -249,7 +249,7 @@ void rtw_ps_processor(_adapter*padapter)
#endif //CONFIG_AUTOSUSPEND
{
rfpwrstate = RfOnOffDetect(padapter);
DBG_871X("@@@@- #2 %s==> rfstate:%s\n",__func__,(rfpwrstate==rf_on)?"rf_on":"rf_off");
DBG_88E("@@@@- #2 %s==> rfstate:%s\n",__func__,(rfpwrstate==rf_on)?"rf_on":"rf_off");
if (rfpwrstate!= pwrpriv->rf_pwrstate)
{
@ -265,7 +265,7 @@ void rtw_ps_processor(_adapter*padapter)
pwrpriv->change_rfpwrstate = rf_on;
rtw_hw_resume(padapter );
}
DBG_871X("current rf_pwrstate(%s)\n",(pwrpriv->rf_pwrstate == rf_off)?"rf_off":"rf_on");
DBG_88E("current rf_pwrstate(%s)\n",(pwrpriv->rf_pwrstate == rf_off)?"rf_off":"rf_on");
}
}
pwrpriv->pwr_state_check_cnts ++;
@ -284,7 +284,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",__func__,get_fwstate(pmlmepriv));
DBG_88E("==>%s .fw_state(%x)\n",__func__,get_fwstate(pmlmepriv));
#if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND)
#else
pwrpriv->change_rfpwrstate = rf_off;
@ -300,11 +300,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",__func__,pwrpriv->bInternalAutoSuspend);
DBG_88E("<==%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",__func__,pwrpriv->bInternalAutoSuspend);
DBG_88E("<==%s .pwrpriv->bInternalAutoSuspend)(%x) call autosuspend_enter\n",__func__,pwrpriv->bInternalAutoSuspend);
autosuspend_enter(padapter);
}
#else
@ -370,7 +370,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", __func__, pslv);
DBG_88E("%s: RPWM timeout, force to set RPWM(0x%02X) again!\n", __func__, pslv);
}
else
#endif // CONFIG_LPS_RPWM_TIMER
@ -474,7 +474,7 @@ u8 PS_RDY_CHECK(_adapter * padapter)
#endif
if ( (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) && (padapter->securitypriv.binstallGrpkey == _FALSE) )
{
DBG_871X("Group handshake still in progress !!!\n");
DBG_88E("Group handshake still in progress !!!\n");
return _FALSE;
}
#ifdef CONFIG_IOCTL_CFG80211
@ -532,7 +532,7 @@ _func_enter_;
if (pwdinfo->opp_ps == 0)
#endif //CONFIG_P2P_PS
{
DBG_871X("rtw_set_ps_mode: Leave 802.11 power save\n");
DBG_88E("rtw_set_ps_mode: Leave 802.11 power save\n");
#ifdef CONFIG_TDLS
_enter_critical_bh(&pstapriv->sta_hash_lock, &irqL);
@ -569,7 +569,7 @@ _func_enter_;
#endif
)
{
DBG_871X("%s: Enter 802.11 power save\n", __func__);
DBG_88E("%s: Enter 802.11 power save\n", __func__);
#ifdef CONFIG_TDLS
_enter_critical_bh(&pstapriv->sta_hash_lock, &irqL);
@ -643,14 +643,14 @@ s32 LPS_RF_ON_check(PADAPTER padapter, u32 delay_ms)
if (_TRUE == padapter->bSurpriseRemoved)
{
err = -2;
DBG_871X("%s: device surprise removed!!\n", __func__);
DBG_88E("%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", __func__, delay_ms);
DBG_88E("%s: Wait for FW LPS leave more than %u ms!!!\n", __func__, delay_ms);
break;
}
rtw_usleep_os(100);
@ -671,7 +671,7 @@ void LPS_Enter(PADAPTER padapter)
_func_enter_;
// DBG_871X("+LeisurePSEnter\n");
// DBG_88E("+LeisurePSEnter\n");
#ifdef CONFIG_CONCURRENT_MODE
if (padapter->iface_type != IFACE_PORT0)
@ -714,7 +714,7 @@ _func_enter_;
if (pwrpriv->pwr_mode == PS_MODE_ACTIVE)
{
pwrpriv->bpower_saving = _TRUE;
DBG_871X("%s smart_ps:%d\n", __func__, pwrpriv->smart_ps);
DBG_88E("%s smart_ps:%d\n", __func__, pwrpriv->smart_ps);
//For Tenda W311R IOT issue
rtw_set_ps_mode(padapter, pwrpriv->power_mgnt, pwrpriv->smart_ps, 0);
}
@ -723,7 +723,7 @@ _func_enter_;
pwrpriv->LpsIdleCount++;
}
// DBG_871X("-LeisurePSEnter\n");
// DBG_88E("-LeisurePSEnter\n");
_func_exit_;
}
@ -747,7 +747,7 @@ _func_enter_;
return; /* Skip power saving for concurrent mode port 1*/
#endif
// DBG_871X("+LeisurePSLeave\n");
// DBG_88E("+LeisurePSLeave\n");
if (pwrpriv->bLeisurePs)
{
@ -762,7 +762,7 @@ _func_enter_;
pwrpriv->bpower_saving = _FALSE;
// DBG_871X("-LeisurePSLeave\n");
// DBG_88E("-LeisurePSLeave\n");
_func_exit_;
}
@ -779,7 +779,7 @@ void LeaveAllPowerSaveMode(IN PADAPTER Adapter)
_func_enter_;
//DBG_871X("%s.....\n",__func__);
//DBG_88E("%s.....\n",__func__);
if (check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE)
{ //connect
#ifdef CONFIG_LPS_LCLK
@ -818,7 +818,7 @@ _func_enter_;
#ifdef CONFIG_IPS
if (_FALSE == ips_leave(Adapter))
{
DBG_871X("======> ips_leave fail.............\n");
DBG_88E("======> ips_leave fail.............\n");
}
#endif
#endif //CONFIG_PLATFORM_SPRD && CONFIG_RTL8188E
@ -868,7 +868,7 @@ _func_enter_;
if (rtw_get_passing_time_ms(start_time)>100)
{
DBG_871X("Wait for cpwm event than 100 ms!!!\n");
DBG_88E("Wait for cpwm event than 100 ms!!!\n");
break;
}
rtw_msleep_os(1);
@ -898,7 +898,7 @@ _func_enter_;
#ifdef CONFIG_LPS_RPWM_TIMER
if (pwrpriv->rpwm < PS_STATE_S2)
{
DBG_871X("%s: Redundant CPWM Int. RPWM=0x%02X CPWM=0x%02x\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm);
DBG_88E("%s: Redundant CPWM Int. RPWM=0x%02X CPWM=0x%02x\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm);
_exit_pwrlock(&pwrpriv->lock);
goto exit;
}
@ -931,7 +931,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",__func__);
//DBG_88E("%s\n",__func__);
report.state = PS_STATE_S2;
cpwm_int_hdl(adapter, &report);
@ -946,12 +946,12 @@ static void rpwmtimeout_workitem_callback(struct work_struct *work)
pwrpriv = container_of(work, struct pwrctrl_priv, rpwmtimeoutwi);
padapter = container_of(pwrpriv, _adapter, pwrctrlpriv);
// DBG_871X("+%s: rpwm=0x%02X cpwm=0x%02X\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm);
// DBG_88E("+%s: rpwm=0x%02X cpwm=0x%02X\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm);
_enter_pwrlock(&pwrpriv->lock);
if ((pwrpriv->rpwm == pwrpriv->cpwm) || (pwrpriv->cpwm >= PS_STATE_S2))
{
DBG_871X("%s: rpwm=0x%02X cpwm=0x%02X CPWM done!\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm);
DBG_88E("%s: rpwm=0x%02X cpwm=0x%02X CPWM done!\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm);
goto exit;
}
_exit_pwrlock(&pwrpriv->lock);
@ -962,10 +962,10 @@ static void rpwmtimeout_workitem_callback(struct work_struct *work)
struct reportpwrstate_parm report;
report.state = PS_STATE_S2;
DBG_871X("\n%s: FW already leave 32K!\n\n", __func__);
DBG_88E("\n%s: FW already leave 32K!\n\n", __func__);
cpwm_int_hdl(padapter, &report);
#else
DBG_871X("\n%s: FW already leave 32K!\n\n", __func__);
DBG_88E("\n%s: FW already leave 32K!\n\n", __func__);
cpwm_event_callback(&pwrpriv->cpwm_event);
#endif
return;
@ -975,7 +975,7 @@ static void rpwmtimeout_workitem_callback(struct work_struct *work)
if ((pwrpriv->rpwm == pwrpriv->cpwm) || (pwrpriv->cpwm >= PS_STATE_S2))
{
DBG_871X("%s: cpwm=%d, nothing to do!\n", __func__, pwrpriv->cpwm);
DBG_88E("%s: cpwm=%d, nothing to do!\n", __func__, pwrpriv->cpwm);
goto exit;
}
pwrpriv->brpwmtimeout = _TRUE;
@ -997,11 +997,11 @@ static void pwr_rpwm_timeout_handler(void *FunctionContext)
padapter = (PADAPTER)FunctionContext;
pwrpriv = &padapter->pwrctrlpriv;
// DBG_871X("+%s: rpwm=0x%02X cpwm=0x%02X\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm);
// DBG_88E("+%s: rpwm=0x%02X cpwm=0x%02X\n", __func__, pwrpriv->rpwm, pwrpriv->cpwm);
if ((pwrpriv->rpwm == pwrpriv->cpwm) || (pwrpriv->cpwm >= PS_STATE_S2))
{
DBG_871X("+%s: cpwm=%d, nothing to do!\n", __func__, pwrpriv->cpwm);
DBG_88E("+%s: cpwm=%d, nothing to do!\n", __func__, pwrpriv->cpwm);
return;
}
@ -1440,7 +1440,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",__func__);
DBG_88E("%s\n",__func__);
#if defined(CONFIG_USB_HCI) || defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
rtw_resume_process(adapter);
@ -1468,7 +1468,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",__func__);
DBG_88E("%s\n",__func__);
//jeff: do nothing but set do_late_resume to false
pwrpriv->do_late_resume = _FALSE;
@ -1479,7 +1479,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",__func__);
DBG_88E("%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);
@ -1490,7 +1490,7 @@ static void rtw_late_resume(struct early_suspend *h)
void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv)
{
DBG_871X("%s\n", __func__);
DBG_88E("%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;
@ -1503,7 +1503,7 @@ void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv)
void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
{
DBG_871X("%s\n", __func__);
DBG_88E("%s\n", __func__);
pwrpriv->do_late_resume = _FALSE;
@ -1522,7 +1522,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",__func__);
DBG_88E("%s\n",__func__);
//jeff: do nothing but set do_late_resume to false
pwrpriv->do_late_resume = _FALSE;
@ -1533,7 +1533,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",__func__);
DBG_88E("%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);
@ -1544,7 +1544,7 @@ static void rtw_late_resume(android_early_suspend_t *h)
void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv)
{
DBG_871X("%s\n", __func__);
DBG_88E("%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;
@ -1555,7 +1555,7 @@ void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv)
void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
{
DBG_871X("%s\n", __func__);
DBG_88E("%s\n", __func__);
pwrpriv->do_late_resume = _FALSE;
@ -1612,13 +1612,13 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
{
u32 start = rtw_get_current_time();
if (pwrpriv->ps_processing) {
DBG_871X("%s wait ps_processing...\n", __func__);
DBG_88E("%s wait ps_processing...\n", __func__);
while (pwrpriv->ps_processing && rtw_get_passing_time_ms(start) <= 3000)
rtw_msleep_os(10);
if (pwrpriv->ps_processing)
DBG_871X("%s wait ps_processing timeout\n", __func__);
DBG_88E("%s wait ps_processing timeout\n", __func__);
else
DBG_871X("%s wait ps_processing done\n", __func__);
DBG_88E("%s wait ps_processing done\n", __func__);
}
}
@ -1643,7 +1643,7 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
if (usb_autopm_get_interface(adapter_to_dvobj(padapter)->pusbintf) < 0)
{
DBG_871X( "can't get autopm:\n");
DBG_88E( "can't get autopm:\n");
}
#elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,20))
usb_autopm_disable(adapter_to_dvobj(padapter)->pusbintf);
@ -1665,16 +1665,16 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
#ifdef CONFIG_AUTOSUSPEND
if (pwrpriv->brfoffbyhw==_TRUE)
{
DBG_8192C("hw still in rf_off state ...........\n");
DBG_88E("hw still in rf_off state ...........\n");
ret = _FAIL;
goto exit;
}
else if (padapter->registrypriv.usbss_enable)
{
DBG_8192C("%s call autoresume_enter....\n",__func__);
DBG_88E("%s call autoresume_enter....\n",__func__);
if (_FAIL == autoresume_enter(padapter))
{
DBG_8192C("======> autoresume fail.............\n");
DBG_88E("======> autoresume fail.............\n");
ret = _FAIL;
goto exit;
}
@ -1684,10 +1684,10 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
#endif
{
#ifdef CONFIG_IPS
DBG_8192C("%s call ips_leave....\n",__func__);
DBG_88E("%s call ips_leave....\n",__func__);
if (_FAIL == ips_leave(padapter))
{
DBG_8192C("======> ips_leave fail.............\n");
DBG_88E("======> ips_leave fail.............\n");
ret = _FAIL;
goto exit;
}
@ -1700,7 +1700,7 @@ int _rtw_pwr_wakeup(_adapter *padapter, u32 ips_deffer_ms, const char *caller)
|| !padapter->bup
|| !padapter->hw_init_completed
){
DBG_8192C("%s: bDriverStopped=%d, bup=%d, hw_init_completed=%u\n"
DBG_88E("%s: bDriverStopped=%d, bup=%d, hw_init_completed=%u\n"
, caller
, padapter->bDriverStopped
, padapter->bup
@ -1751,12 +1751,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", __func__, mode == IPS_NORMAL?"IPS_NORMAL":"IPS_LEVEL_2");
DBG_88E("%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", __func__, "IPS_NONE");
DBG_88E("%s %s\n", __func__, "IPS_NONE");
if ((padapter->bSurpriseRemoved ==0)&&(_FAIL == rtw_pwr_wakeup(padapter)) )
return -EFAULT;
}

186
core/rtw_recv.c
View file

@ -400,7 +400,7 @@ u32 rtw_free_uc_swdec_pending_queue(_adapter *adapter)
union recv_frame *pending_frame;
while ((pending_frame=rtw_alloc_recvframe(&adapter->recvpriv.uc_swdec_pending_queue))) {
rtw_free_recvframe(pending_frame, &adapter->recvpriv.free_recv_queue);
DBG_871X("%s: dequeue uc_swdec_pending_queue\n", __func__);
DBG_88E("%s: dequeue uc_swdec_pending_queue\n", __func__);
cnt++;
}
@ -518,14 +518,14 @@ _func_enter_;
mickey=&psecuritypriv->dot118021XGrprxmickey[prxattrib->key_index].skey[0];
RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("\n recvframe_chkmic: bcmc key\n"));
//DBG_871X("\n recvframe_chkmic: bcmc key psecuritypriv->dot118021XGrpKeyid(%d),pmlmeinfo->key_index(%d) ,recv key_id(%d)\n",
//DBG_88E("\n recvframe_chkmic: bcmc key psecuritypriv->dot118021XGrpKeyid(%d),pmlmeinfo->key_index(%d) ,recv key_id(%d)\n",
// psecuritypriv->dot118021XGrpKeyid,pmlmeinfo->key_index,rxdata_key_idx);
if (psecuritypriv->binstallGrpkey==_FALSE)
{
res=_FAIL;
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n"));
DBG_871X("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n");
DBG_88E("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n");
goto exit;
}
}
@ -590,12 +590,12 @@ _func_enter_;
{
rtw_handle_tkip_mic_err(adapter,(u8)IS_MCAST(prxattrib->ra));
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" mic error :prxattrib->bdecrypted=%d ",prxattrib->bdecrypted));
DBG_871X(" mic error :prxattrib->bdecrypted=%d\n",prxattrib->bdecrypted);
DBG_88E(" mic error :prxattrib->bdecrypted=%d\n",prxattrib->bdecrypted);
}
else
{
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" mic error :prxattrib->bdecrypted=%d ",prxattrib->bdecrypted));
DBG_871X(" mic error :prxattrib->bdecrypted=%d\n",prxattrib->bdecrypted);
DBG_88E(" mic error :prxattrib->bdecrypted=%d\n",prxattrib->bdecrypted);
}
res=_FAIL;
@ -647,7 +647,7 @@ _func_enter_;
if (prxattrib->key_index > WEP_KEYS)
{
DBG_871X("prxattrib->key_index(%d) > WEP_KEYS\n", prxattrib->key_index);
DBG_88E("prxattrib->key_index(%d) > WEP_KEYS\n", prxattrib->key_index);
switch (prxattrib->encrypt){
case _WEP40_:
@ -672,7 +672,7 @@ _func_enter_;
psecuritypriv->hw_decrypted=_FALSE;
#ifdef DBG_RX_DECRYPTOR
DBG_871X("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n"
DBG_88E("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n"
, prxattrib->bdecrypted ,prxattrib->encrypt, psecuritypriv->hw_decrypted);
#endif
@ -703,14 +703,14 @@ _func_enter_;
{
psecuritypriv->hw_decrypted=_TRUE;
#ifdef DBG_RX_DECRYPTOR
DBG_871X("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n"
DBG_88E("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, Setting psecuritypriv->hw_decrypted = %d\n"
, prxattrib->bdecrypted ,prxattrib->encrypt, psecuritypriv->hw_decrypted);
#endif
}
else {
#ifdef DBG_RX_DECRYPTOR
DBG_871X("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, psecuritypriv->hw_decrypted:%d\n"
DBG_88E("prxstat->bdecrypted:%d, prxattrib->encrypt:%d, psecuritypriv->hw_decrypted:%d\n"
, prxattrib->bdecrypted ,prxattrib->encrypt, psecuritypriv->hw_decrypted);
#endif
}
@ -878,7 +878,7 @@ void process_pwrbit_data(_adapter *padapter, union recv_frame *precv_frame)
stop_sta_xmit(padapter, psta);
//DBG_871X("to sleep, sta_dz_bitmap=%x\n", pstapriv->sta_dz_bitmap);
//DBG_88E("to sleep, sta_dz_bitmap=%x\n", pstapriv->sta_dz_bitmap);
}
}
else
@ -890,7 +890,7 @@ void process_pwrbit_data(_adapter *padapter, union recv_frame *precv_frame)
wakeup_sta_to_xmit(padapter, psta);
//DBG_871X("to wakeup, sta_dz_bitmap=%x\n", pstapriv->sta_dz_bitmap);
//DBG_88E("to wakeup, sta_dz_bitmap=%x\n", pstapriv->sta_dz_bitmap);
}
}
@ -994,7 +994,7 @@ sint OnTDLS(_adapter *adapter, union recv_frame *precv_frame)
if (ptdlsinfo->enable == 0)
{
DBG_871X("recv tdls frame, "
DBG_88E("recv tdls frame, "
"but tdls haven't enabled\n");
ret = _FAIL;
return ret;
@ -1002,35 +1002,35 @@ sint OnTDLS(_adapter *adapter, union recv_frame *precv_frame)
switch (*paction){
case TDLS_SETUP_REQUEST:
DBG_871X("recv tdls setup request frame\n");
DBG_88E("recv tdls setup request frame\n");
ret=On_TDLS_Setup_Req(adapter, precv_frame);
break;
case TDLS_SETUP_RESPONSE:
DBG_871X("recv tdls setup response frame\n");
DBG_88E("recv tdls setup response frame\n");
ret=On_TDLS_Setup_Rsp(adapter, precv_frame);
break;
case TDLS_SETUP_CONFIRM:
DBG_871X("recv tdls setup confirm frame\n");
DBG_88E("recv tdls setup confirm frame\n");
ret=On_TDLS_Setup_Cfm(adapter, precv_frame);
break;
case TDLS_TEARDOWN:
DBG_871X("recv tdls teardown, free sta_info\n");
DBG_88E("recv tdls teardown, free sta_info\n");
ret=On_TDLS_Teardown(adapter, precv_frame);
break;
case TDLS_DISCOVERY_REQUEST:
DBG_871X("recv tdls discovery request frame\n");
DBG_88E("recv tdls discovery request frame\n");
ret=On_TDLS_Dis_Req(adapter, precv_frame);
break;
case TDLS_PEER_TRAFFIC_RESPONSE:
DBG_871X("recv tdls peer traffic response frame\n");
DBG_88E("recv tdls peer traffic response frame\n");
ret=On_TDLS_Peer_Traffic_Rsp(adapter, precv_frame);
break;
case TDLS_CHANNEL_SWITCH_REQUEST:
DBG_871X("recv tdls channel switch request frame\n");
DBG_88E("recv tdls channel switch request frame\n");
ret=On_TDLS_Ch_Switch_Req(adapter, precv_frame);
break;
case TDLS_CHANNEL_SWITCH_RESPONSE:
DBG_871X("recv tdls channel switch response frame\n");
DBG_88E("recv tdls channel switch response frame\n");
ret=On_TDLS_Ch_Switch_Rsp(adapter, precv_frame);
break;
#ifdef CONFIG_WFD
@ -1041,20 +1041,20 @@ sint OnTDLS(_adapter *adapter, union recv_frame *precv_frame)
{
//WFDTDLS: for sigma test, do not setup direct link automatically
ptdlsinfo->dev_discovered = 1;
DBG_871X("recv tunneled probe request frame\n");
DBG_88E("recv tunneled probe request frame\n");
issue_tunneled_probe_rsp(adapter, precv_frame);
}
if ( *(paction + 3) == 0x05) //Probe response frame
{
//WFDTDLS: for sigma test, do not setup direct link automatically
ptdlsinfo->dev_discovered = 1;
DBG_871X("recv tunneled probe response frame\n");
DBG_88E("recv tunneled probe response frame\n");
}
}
break;
#endif //CONFIG_WFD
default:
DBG_871X("receive TDLS frame but not supported\n");
DBG_88E("receive TDLS frame but not supported\n");
ret=_FAIL;
break;
}
@ -1175,7 +1175,7 @@ _func_enter_;
{
if (GetFrameSubType(ptr)&(BIT(4)|BIT(5)|BIT(6)))
{
DBG_871X("drop QoS-Sybtype Data\n");
DBG_88E("drop QoS-Sybtype Data\n");
ret= _FAIL;
goto exit;
}
@ -1209,7 +1209,7 @@ _func_enter_;
//NULL-frame with pwrbit=1, buffer_STA should buffer frames for sleep_STA
if (GetPwrMgt(ptr))
{
DBG_871X("TDLS: recv peer null frame with pwr bit 1\n");
DBG_88E("TDLS: recv peer null frame with pwr bit 1\n");
ptdls_sta->tdls_sta_state|=TDLS_PEER_SLEEP_STATE;
// it would be triggered when we are off channel and receiving NULL DATA
// we can confirm that peer STA is at off channel
@ -1351,7 +1351,7 @@ _func_enter_;
if (_rtw_memcmp(myhwaddr, pattrib->src, ETH_ALEN)){
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",
DBG_88E("DBG_RX_DROP_FRAME %s SA="MAC_FMT", myhwaddr="MAC_FMT"\n",
__func__, MAC_ARG(pattrib->src), MAC_ARG(myhwaddr));
#endif
ret= _FAIL;
@ -1364,7 +1364,7 @@ _func_enter_;
RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,
(" ap2sta_data_frame: compare DA fail; DA="MAC_FMT"\n", MAC_ARG(pattrib->dst)));
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s DA="MAC_FMT"\n", __func__, MAC_ARG(pattrib->dst));
DBG_88E("DBG_RX_DROP_FRAME %s DA="MAC_FMT"\n", __func__, MAC_ARG(pattrib->dst));
#endif
ret= _FAIL;
goto exit;
@ -1380,14 +1380,14 @@ _func_enter_;
(" ap2sta_data_frame: compare BSSID fail ; BSSID="MAC_FMT"\n", MAC_ARG(pattrib->bssid)));
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",
DBG_88E("DBG_RX_DROP_FRAME %s BSSID="MAC_FMT", mybssid="MAC_FMT"\n",
__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 );
DBG_88E( "this adapter = %d, buddy adapter = %d\n", adapter->adapter_type, adapter->pbuddy_adapter->adapter_type );
#endif
if (!bmcast)
{
DBG_871X("issue_deauth to the nonassociated ap=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->bssid));
DBG_88E("issue_deauth to the nonassociated ap=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->bssid));
issue_deauth(adapter, pattrib->bssid, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
}
@ -1403,7 +1403,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", __func__);
DBG_88E("DBG_RX_DROP_FRAME %s can't get psta under STATION_MODE ; drop pkt\n", __func__);
#endif
ret= _FAIL;
goto exit;
@ -1437,7 +1437,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", __func__);
DBG_88E("DBG_RX_DROP_FRAME %s can't get psta under WIFI_MP_STATE ; drop pkt\n", __func__);
#endif
ret= _FAIL;
goto exit;
@ -1458,7 +1458,7 @@ _func_enter_;
*psta = rtw_get_stainfo(pstapriv, pattrib->bssid); // get sta_info
if (*psta == NULL)
{
DBG_871X("issue_deauth to the ap=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->bssid));
DBG_88E("issue_deauth to the ap=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->bssid));
issue_deauth(adapter, pattrib->bssid, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
}
@ -1466,7 +1466,7 @@ _func_enter_;
ret = _FAIL;
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s fw_state:0x%x\n", __func__, get_fwstate(pmlmepriv));
DBG_88E("DBG_RX_DROP_FRAME %s fw_state:0x%x\n", __func__, get_fwstate(pmlmepriv));
#endif
}
@ -1509,7 +1509,7 @@ _func_enter_;
if (*psta == NULL)
{
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("can't get psta under AP_MODE; drop pkt\n"));
DBG_871X("issue_deauth to sta=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->src));
DBG_88E("issue_deauth to sta=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->src));
issue_deauth(adapter, pattrib->src, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
@ -1536,7 +1536,7 @@ _func_enter_;
ret = RTW_RX_HANDLED;
goto exit;
}
DBG_871X("issue_deauth to sta=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->src));
DBG_88E("issue_deauth to sta=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->src));
issue_deauth(adapter, pattrib->src, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
ret = RTW_RX_HANDLED;
goto exit;
@ -1559,7 +1559,7 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
u8 *pframe = precv_frame->u.hdr.rx_data;
//uint len = precv_frame->u.hdr.len;
//DBG_871X("+validate_recv_ctrl_frame\n");
//DBG_88E("+validate_recv_ctrl_frame\n");
if (GetFrameType(pframe) != WIFI_CTRL_TYPE)
{
@ -1616,7 +1616,7 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
if (psta->state & WIFI_STA_ALIVE_CHK_STATE)
{
DBG_871X("%s alive check-rx ps-poll\n", __func__);
DBG_88E("%s alive check-rx ps-poll\n", __func__);
psta->expire_to = pstapriv->expire_to;
psta->state ^= WIFI_STA_ALIVE_CHK_STATE;
}
@ -1649,7 +1649,7 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
pxmitframe->attrib.triggered = 1;
//DBG_871X("handling ps-poll, q_len=%d, tim=%x\n", psta->sleepq_len, pstapriv->tim_bitmap);
//DBG_88E("handling ps-poll, q_len=%d, tim=%x\n", psta->sleepq_len, pstapriv->tim_bitmap);
_exit_critical_bh(&psta->sleep_q.lock, &irqL);
if (rtw_hal_xmit(padapter, pxmitframe) == _TRUE)
@ -1662,7 +1662,7 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
{
pstapriv->tim_bitmap &= ~BIT(psta->aid);
//DBG_871X("after handling ps-poll, tim=%x\n", pstapriv->tim_bitmap);
//DBG_88E("after handling ps-poll, tim=%x\n", pstapriv->tim_bitmap);
//upate BCN for TIM IE
//update_BCNTIM(padapter);
@ -1672,19 +1672,19 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
}
else
{
//DBG_871X("no buffered packets to xmit\n");
//DBG_88E("no buffered packets to xmit\n");
if (pstapriv->tim_bitmap&BIT(psta->aid))
{
if (psta->sleepq_len==0)
{
DBG_871X("no buffered packets to xmit\n");
DBG_88E("no buffered packets to xmit\n");
//issue nulldata with More data bit = 0 to indicate we have no buffered packets
issue_nulldata(padapter, psta->hwaddr, 0, 0, 0);
}
else
{
DBG_871X("error!psta->sleepq_len=%d\n", psta->sleepq_len);
DBG_88E("error!psta->sleepq_len=%d\n", psta->sleepq_len);
psta->sleepq_len=0;
}
@ -1824,7 +1824,7 @@ _func_enter_;
if (pbssid == NULL){
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s pbssid == NULL\n", __func__);
DBG_88E("DBG_RX_DROP_FRAME %s pbssid == NULL\n", __func__);
#endif
ret= _FAIL;
goto exit;
@ -1870,7 +1870,7 @@ _func_enter_;
if (ret ==_FAIL){
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s case:%d, res:%d\n", __func__, pattrib->to_fr_ds, ret);
DBG_88E("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) {
@ -1881,7 +1881,7 @@ _func_enter_;
if (psta==NULL){
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" after to_fr_ds_chk; psta==NULL\n"));
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s psta == NULL\n", __func__);
DBG_88E("DBG_RX_DROP_FRAME %s psta == NULL\n", __func__);
#endif
ret= _FAIL;
goto exit;
@ -1926,7 +1926,7 @@ _func_enter_;
{
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("decache : drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s recv_decache return _FAIL\n", __func__);
DBG_88E("DBG_RX_DROP_FRAME %s recv_decache return _FAIL\n", __func__);
#endif
ret= _FAIL;
goto exit;
@ -2013,15 +2013,15 @@ _func_enter_;
#ifdef RTK_DMP_PLATFORM
if ( 0 )
{
DBG_871X("++\n");
DBG_88E("++\n");
{
int i;
for (i=0; i<64;i=i+8)
DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:", *(ptr+i),
DBG_88E("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:", *(ptr+i),
*(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7));
}
DBG_871X("--\n");
DBG_88E("--\n");
}
#endif //RTK_DMP_PLATFORM
@ -2055,33 +2055,33 @@ _func_enter_;
rtw_hal_get_def_var(adapter, HAL_DEF_DBG_DUMP_RXPKT, &(bDumpRxPkt));
if (bDumpRxPkt ==1){//dump all rx packets
int i;
DBG_871X("#############################\n");
DBG_88E("#############################\n");
for (i=0; i<64;i=i+8)
DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i),
DBG_88E("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i),
*(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7));
DBG_871X("#############################\n");
DBG_88E("#############################\n");
}
else if (bDumpRxPkt ==2){
if (type== WIFI_MGT_TYPE){
int i;
DBG_871X("#############################\n");
DBG_88E("#############################\n");
for (i=0; i<64;i=i+8)
DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i),
DBG_88E("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i),
*(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7));
DBG_871X("#############################\n");
DBG_88E("#############################\n");
}
}
else if (bDumpRxPkt ==3){
if (type== WIFI_DATA_TYPE){
int i;
DBG_871X("#############################\n");
DBG_88E("#############################\n");
for (i=0; i<64;i=i+8)
DBG_871X("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i),
DBG_88E("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:\n", *(ptr+i),
*(ptr+i+1), *(ptr+i+2) ,*(ptr+i+3) ,*(ptr+i+4),*(ptr+i+5), *(ptr+i+6), *(ptr+i+7));
DBG_871X("#############################\n");
DBG_88E("#############################\n");
}
}
}
@ -2150,7 +2150,7 @@ _func_enter_;
default:
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("validate_recv_data_frame fail! type=0x%x\n", type));
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME validate_recv_data_frame fail! type=0x%x\n", type);
DBG_88E("DBG_RX_DROP_FRAME validate_recv_data_frame fail! type=0x%x\n", type);
#endif
retval = _FAIL;
break;
@ -2700,7 +2700,7 @@ int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
nSubframe_Length = RTW_GET_BE16(pdata + 12);
if ( a_len < (ETHERNET_HEADER_SIZE + nSubframe_Length) ) {
DBG_871X("nRemain_Length is %d and nSubframe_Length is : %d\n",a_len,nSubframe_Length);
DBG_88E("nRemain_Length is %d and nSubframe_Length is : %d\n",a_len,nSubframe_Length);
goto exit;
}
@ -2730,7 +2730,7 @@ int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
}
else
{
DBG_871X("skb_clone() Fail!!! , nr_subframes = %d\n",nr_subframes);
DBG_88E("skb_clone() Fail!!! , nr_subframes = %d\n",nr_subframes);
break;
}
}
@ -2755,7 +2755,7 @@ int amsdu_to_msdu(_adapter *padapter, union recv_frame *prframe)
#endif //PLATFORM_FREEBSD
if (nr_subframes >= MAX_SUBFRAME_COUNT) {
DBG_871X("ParseSubframe(): Too many Subframes! Packets dropped!\n");
DBG_88E("ParseSubframe(): Too many Subframes! Packets dropped!\n");
break;
}
@ -3138,7 +3138,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", __func__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d init IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, seq_num);
#endif
@ -3154,7 +3154,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", __func__,
DBG_88E("%s IndicateSeq: %d > NewSeq: %d\n", __func__,
preorder_ctrl->indicate_seq, seq_num);
#endif
@ -3171,7 +3171,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", __func__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d SN_EQUAL IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, seq_num);
#endif
}
@ -3187,7 +3187,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", __func__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d SN_LESS(wend, seq_num) IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, seq_num);
#endif
}
@ -3290,7 +3290,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", __func__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif
}
@ -3315,7 +3315,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", __func__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif
}
@ -3371,7 +3371,7 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
// Set new pending timer.
//pTS->RxIndicateState = RXTS_INDICATE_REORDER;
//PlatformSetTimer(Adapter, &pTS->RxPktPendingTimer, pHTInfo->RxReorderPendingTime);
//DBG_871X("_set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME)\n");
//DBG_88E("_set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME)\n");
_set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME);
}
else
@ -3414,7 +3414,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", __func__);
DBG_88E("DBG_RX_DROP_FRAME %s pattrib->qos !=1\n", __func__);
#endif
return _FAIL;
@ -3426,7 +3426,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", __func__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif
@ -3434,7 +3434,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", __func__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif
@ -3454,7 +3454,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", __func__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif
@ -3462,13 +3462,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", __func__, __LINE__,
DBG_88E("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", __func__);
DBG_88E("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __func__);
#endif
}
@ -3496,7 +3496,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", __func__);
DBG_88E("DBG_RX_DROP_FRAME %s check_indicate_seq fail\n", __func__);
#endif
rtw_recv_indicatepkt(padapter, prframe);
@ -3514,7 +3514,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", __func__);
DBG_88E("DBG_RX_DROP_FRAME %s enqueue_reorder_recvframe fail\n", __func__);
#endif
goto _err_exit;
}
@ -3568,7 +3568,7 @@ void rtw_reordering_ctrl_timeout_handler(void *pcontext)
return;
}
//DBG_871X("+rtw_reordering_ctrl_timeout_handler()=>\n");
//DBG_88E("+rtw_reordering_ctrl_timeout_handler()=>\n");
_enter_critical_bh(&ppending_recvframe_queue->lock, &irql);
@ -3610,7 +3610,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", __func__);
DBG_88E("DBG_RX_DROP_FRAME %s recv_indicatepkt_reorder error!\n", __func__);
#endif
if ((padapter->bDriverStopped == _FALSE) &&
@ -3629,7 +3629,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", __func__);
DBG_88E("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __func__);
#endif
return retval;
}
@ -3723,7 +3723,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", __func__);
DBG_88E("DBG_RX_DROP_FRAME %s decryptor: drop pkt\n", __func__);
#endif
ret = _FAIL;
goto _recv_data_drop;
@ -3746,7 +3746,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", __func__);
DBG_88E("DBG_RX_DROP_FRAME %s recvframe_chk_defrag: drop pkt\n", __func__);
#endif
goto _recv_data_drop;
}
@ -3755,7 +3755,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", __func__);
DBG_88E("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n", __func__);
#endif
ret = _FAIL;
goto _recv_data_drop;
@ -3779,7 +3779,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", __func__);
DBG_88E("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;
@ -3792,7 +3792,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", __func__);
DBG_88E("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;
@ -3806,7 +3806,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", __func__);
DBG_88E("DBG_RX_DROP_FRAME %s rtw_recv_indicatepkt fail!\n", __func__);
#endif
goto _recv_data_drop;
}
@ -3816,7 +3816,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", __func__,
DBG_88E("DBG_RX_DROP_FRAME %s ecv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n", __func__,
padapter->bDriverStopped, padapter->bSurpriseRemoved);
#endif
ret = _FAIL;
@ -3831,7 +3831,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", __func__);
DBG_88E("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __func__);
#endif
rtw_free_recvframe(orig_prframe, pfree_recv_queue);
goto _recv_data_drop;
@ -3840,7 +3840,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", __func__);
DBG_88E("DBG_RX_DROP_FRAME %s what is this condition??\n", __func__);
#endif
goto _recv_data_drop;
}
@ -3872,7 +3872,7 @@ int recv_func(_adapter *padapter, union recv_frame *rframe)
while ((pending_frame=rtw_alloc_recvframe(&padapter->recvpriv.uc_swdec_pending_queue))) {
if (recv_func_posthandle(padapter, pending_frame) == _SUCCESS)
DBG_871X("%s: dequeue uc_swdec_pending_queue\n", __func__);
DBG_88E("%s: dequeue uc_swdec_pending_queue\n", __func__);
}
}
@ -3887,7 +3887,7 @@ int recv_func(_adapter *padapter, union recv_frame *rframe)
!is_wep_enc(psecuritypriv->dot11PrivacyAlgrthm) &&
!psecuritypriv->busetkipkey) {
rtw_enqueue_recvframe(rframe, &padapter->recvpriv.uc_swdec_pending_queue);
DBG_871X("%s: no key, enqueue uc_swdec_pending_queue\n", __func__);
DBG_88E("%s: no key, enqueue uc_swdec_pending_queue\n", __func__);
goto exit;
}
@ -3996,7 +3996,7 @@ void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS){
recvpriv->signal_qual = tmp_q;
#if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1
DBG_871X("%s signal_strength:%3u, rssi:%3d, signal_qual:%3u"
DBG_88E("%s signal_strength:%3u, rssi:%3d, signal_qual:%3u"
", num_signal_strength:%u, num_signal_qual:%u"
"\n"
, __func__

18
core/rtw_security.c
View file

@ -795,10 +795,10 @@ _func_enter_;
if (psecuritypriv->binstallGrpkey==_FALSE)
{
res=_FAIL;
DBG_8192C("%s:rx bc/mc packets,but didn't install group key!!!!!!!!!!\n",__func__);
DBG_88E("%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");
//DBG_88E("rx bc/mc packets, to perform sw rtw_tkip_decrypt\n");
//prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;
prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey;
prwskeylen=16;
@ -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", __func__);
DBG_88E("[%s] for tdls link\n", __func__);
prwskey=&ptdls_sta->tpk.tk[0];
}
}
@ -1874,7 +1874,7 @@ _func_enter_;
{
RT_TRACE(_module_rtl871x_security_c_,_drv_err_,("aes_decipher:mic check error mic[%d]: pframe(%x) != message(%x)\n",
i,pframe[hdrlen+8+plen-8+i],message[hdrlen+8+plen-8+i]));
DBG_871X("aes_decipher:mic check error mic[%d]: pframe(%x) != message(%x)\n",
DBG_88E("aes_decipher:mic check error mic[%d]: pframe(%x) != message(%x)\n",
i,pframe[hdrlen+8+plen-8+i],message[hdrlen+8+plen-8+i]);
res = _FAIL;
}
@ -1913,18 +1913,18 @@ _func_enter_;
if (IS_MCAST(prxattrib->ra))
{
//in concurrent we should use sw descrypt in group key, so we remove this message
//DBG_871X("rx bc/mc packets, to perform sw rtw_aes_decrypt\n");
//DBG_88E("rx bc/mc packets, to perform sw rtw_aes_decrypt\n");
//prwskey = psecuritypriv->dot118021XGrpKey[psecuritypriv->dot118021XGrpKeyid].skey;
if (psecuritypriv->binstallGrpkey==_FALSE)
{
res=_FAIL;
DBG_8192C("%s:rx bc/mc packets,but didn't install group key!!!!!!!!!!\n",__func__);
DBG_88E("%s:rx bc/mc packets,but didn't install group key!!!!!!!!!!\n",__func__);
goto exit;
}
prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey;
if (psecuritypriv->dot118021XGrpKeyid != prxattrib->key_index)
{
DBG_871X("not match packet_index=%d, install_index=%d\n"
DBG_88E("not match packet_index=%d, install_index=%d\n"
, prxattrib->key_index, psecuritypriv->dot118021XGrpKeyid);
res=_FAIL;
goto exit;
@ -2737,7 +2737,7 @@ int wpa_tdls_ftie_mic(u8 *kck, u8 trans_seq,
2 + timeoutie[1] + 2 + ftie[1];
buf = rtw_zmalloc(len);
if (!buf) {
DBG_871X("TDLS: No memory for MIC calculation\n");
DBG_88E("TDLS: No memory for MIC calculation\n");
return -1;
}
@ -2829,7 +2829,7 @@ int tdls_verify_mic(u8 *kck, u8 trans_seq,
}
//Invalid MIC
DBG_871X( "[%s] Invalid MIC\n", __func__);
DBG_88E( "[%s] Invalid MIC\n", __func__);
return 0;
}

6
core/rtw_sreset.c
View file

@ -60,16 +60,16 @@ u8 sreset_get_wifi_status(_adapter *padapter)
psrtpriv->Wifi_Error_Status = WIFI_IF_NOT_EXIST;
}
else if (val32!=0){
DBG_8192C("txdmastatu(%x)\n",val32);
DBG_88E("txdmastatu(%x)\n",val32);
psrtpriv->Wifi_Error_Status = WIFI_MAC_TXDMA_ERROR;
}
if (WIFI_STATUS_SUCCESS !=psrtpriv->Wifi_Error_Status)
{
DBG_8192C("==>%s error_status(0x%x)\n",__func__,psrtpriv->Wifi_Error_Status);
DBG_88E("==>%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",__func__,status);
DBG_88E("==> %s wifi_status(0x%x)\n",__func__,status);
//status restore
psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;

6
core/rtw_sta_mgt.c
View file

@ -168,7 +168,7 @@ inline int rtw_stainfo_offset(struct sta_priv *stapriv, struct sta_info *sta)
int offset = (((u8 *)sta) - stapriv->pstainfo_buf)/sizeof(struct sta_info);
if (!stainfo_offset_valid(offset))
DBG_871X("%s invalid offset(%d), out of range!!!", __func__, offset);
DBG_88E("%s invalid offset(%d), out of range!!!", __func__, offset);
return offset;
}
@ -176,7 +176,7 @@ inline int rtw_stainfo_offset(struct sta_priv *stapriv, struct sta_info *sta)
inline struct sta_info *rtw_get_stainfo_by_offset(struct sta_priv *stapriv, int offset)
{
if (!stainfo_offset_valid(offset))
DBG_871X("%s invalid offset(%d), out of range!!!", __func__, offset);
DBG_88E("%s invalid offset(%d), out of range!!!", __func__, offset);
return (struct sta_info *)(stapriv->pstainfo_buf + offset * sizeof(struct sta_info));
}
@ -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", __func__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq);
#endif
preorder_ctrl->wend_b= 0xffff;

58
core/rtw_tdls.c
View file

@ -271,7 +271,7 @@ void free_tdls_sta(_adapter *padapter, struct sta_info *ptdls_sta)
ptdlsinfo->setup_state=TDLS_STATE_NONE;
}
else
DBG_871X("Remain tdls sta:%02x\n", ptdlsinfo->sta_cnt);
DBG_88E("Remain tdls sta:%02x\n", ptdlsinfo->sta_cnt);
rtw_free_stainfo(padapter, ptdls_sta);
@ -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", __func__ );
DBG_88E( "[%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", __func__, ptdlsinfo->wfd_info->peer_rtsp_ctrlport );
DBG_88E( "[%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", __func__,
DBG_88E( "[%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", __func__);
DBG_88E("[%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", __func__);
DBG_88E("[%s]\n", __func__);
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
{
@ -631,7 +631,7 @@ void issue_tdls_teardown(_adapter *padapter, u8 *mac_addr)
ptdls_sta = rtw_get_stainfo(pstapriv, mac_addr);
if (ptdls_sta==NULL){
DBG_871X("issue tdls teardown unsuccessful\n");
DBG_88E("issue tdls teardown unsuccessful\n");
return;
}else{
ptdls_sta->tdls_sta_state=TDLS_STATE_NONE;
@ -721,7 +721,7 @@ void issue_tdls_dis_req(_adapter *padapter, u8 *mac_addr)
goto exit;
}
rtw_dump_xframe(padapter, pmgntframe);
DBG_871X("issue tdls dis req\n");
DBG_88E("issue tdls dis req\n");
exit:
@ -1076,7 +1076,7 @@ sint On_TDLS_Dis_Rsp(_adapter *adapter, union recv_frame *precv_frame)
if ( pattrib->RxPWDBAll + TDLS_SIGNAL_THRESH >= UndecoratedSmoothedPWDB);
{
DBG_871X("pattrib->RxPWDBAll=%d, pdmpriv->UndecoratedSmoothedPWDB=%d\n", pattrib->RxPWDBAll, UndecoratedSmoothedPWDB);
DBG_88E("pattrib->RxPWDBAll=%d, pdmpriv->UndecoratedSmoothedPWDB=%d\n", pattrib->RxPWDBAll, UndecoratedSmoothedPWDB);
issue_tdls_setup_req(adapter, psa);
}
}
@ -1133,17 +1133,17 @@ sint On_TDLS_Setup_Req(_adapter *adapter, union recv_frame *precv_frame)
if (ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE){
//If the direct link is already set up
//Process as re-setup after tear down
DBG_871X("re-setup a direct link\n");
DBG_88E("re-setup a direct link\n");
}
//already receiving TDLS setup request
else if (ptdls_sta->tdls_sta_state & TDLS_INITIATOR_STATE){
DBG_871X("receive duplicated TDLS setup request frame in handshaking\n");
DBG_88E("receive duplicated TDLS setup request frame in handshaking\n");
goto exit;
}
//When receiving and sending setup_req to the same link at the same time, STA with higher MAC_addr would be initiator
//following is to check out MAC_addr
else if (ptdls_sta->tdls_sta_state & TDLS_RESPONDER_STATE){
DBG_871X("receive setup_req after sending setup_req\n");
DBG_88E("receive setup_req after sending setup_req\n");
for (i=0;i<6;i++){
if (*(pmyid+i)==*(psa+i)){
}
@ -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", __func__, stat_code );
DBG_88E( "[%s] status_code = %d, free_tdls_sta\n", __func__, stat_code );
free_tdls_sta(adapter, ptdls_sta);
return _FAIL;
}
@ -1448,7 +1448,7 @@ sint On_TDLS_Setup_Rsp(_adapter *adapter, union recv_frame *precv_frame)
}
}
DBG_871X("issue_tdls_setup_cfm\n");
DBG_88E("issue_tdls_setup_cfm\n");
issue_tdls_setup_cfm(adapter, precv_frame);
if (ptdls_sta->stat_code==0)
@ -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", __func__, stat_code );
DBG_88E( "[%s] stat_code = %d\n, free_tdls_sta", __func__, stat_code );
free_tdls_sta(adapter, ptdls_sta);
return _FAIL;
}
@ -1740,7 +1740,7 @@ sint On_TDLS_Peer_Traffic_Rsp(_adapter *adapter, union recv_frame *precv_frame)
if (ptdls_sta->sleepq_len==0)
{
DBG_871X("no buffered packets for tdls to xmit\n");
DBG_88E("no buffered packets for tdls to xmit\n");
//on U-APSD + CH. switch state, when there is no buffered date to xmit,
// we should go back to base channel
if (state==2){
@ -1749,13 +1749,13 @@ sint On_TDLS_Peer_Traffic_Rsp(_adapter *adapter, union recv_frame *precv_frame)
ptdls_sta->tdls_sta_state &= ~(TDLS_SW_OFF_STATE);
ptdlsinfo->candidate_ch= pmlmeext->cur_channel;
issue_tdls_ch_switch_req(adapter, pattrib->src);
DBG_871X("issue tdls ch switch req back to base channel\n");
DBG_88E("issue tdls ch switch req back to base channel\n");
}
}
else
{
DBG_871X("error!psta->sleepq_len=%d\n", ptdls_sta->sleepq_len);
DBG_88E("error!psta->sleepq_len=%d\n", ptdls_sta->sleepq_len);
ptdls_sta->sleepq_len=0;
}
@ -1828,10 +1828,10 @@ sint On_TDLS_Ch_Switch_Req(_adapter *adapter, union recv_frame *precv_frame)
issue_tdls_ch_switch_rsp(adapter, psa);
DBG_871X("issue tdls channel switch response\n");
DBG_88E("issue tdls channel switch response\n");
if ((ptdls_sta->tdls_sta_state & TDLS_CH_SWITCH_ON_STATE) && ptdls_sta->off_ch==pmlmeext->cur_channel){
DBG_871X("back to base channel %x\n", pmlmeext->cur_channel);
DBG_88E("back to base channel %x\n", pmlmeext->cur_channel);
ptdls_sta->option=7;
rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_BASE_CH);
}else{
@ -1861,11 +1861,11 @@ sint On_TDLS_Ch_Switch_Rsp(_adapter *adapter, union recv_frame *precv_frame)
//it will go back to base channel and terminate this channel switch procedure
if (ptdls_sta->tdls_sta_state & TDLS_CH_SWITCH_ON_STATE ){
if (pmlmeext->cur_channel==ptdls_sta->off_ch){
DBG_871X("back to base channel %x\n", pmlmeext->cur_channel);
DBG_88E("back to base channel %x\n", pmlmeext->cur_channel);
ptdls_sta->option=7;
rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_OFF_CH);
}else{
DBG_871X("receive unsolicited channel switch response\n");
DBG_88E("receive unsolicited channel switch response\n");
rtw_tdls_cmd(adapter, ptdls_sta->hwaddr, TDLS_CS_OFF);
}
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", __func__, __LINE__);
DBG_88E("[%s] %d\n", __func__, __LINE__);
return;
}
@ -2185,7 +2185,7 @@ void rtw_build_tdls_setup_rsp_ies(_adapter * padapter, struct xmit_frame * pxmit
if (ptdls_sta->stat_code!=0) //invalid setup request
{
DBG_871X("ptdls_sta->stat_code:%04x\n", ptdls_sta->stat_code);
DBG_88E("ptdls_sta->stat_code:%04x\n", ptdls_sta->stat_code);
return;
}
@ -2770,7 +2770,7 @@ void _tdls_handshake_timer_hdl(void *FunctionContext)
{
if ( !(ptdls_sta->tdls_sta_state & TDLS_LINKED_STATE) )
{
DBG_871X("tdls handshake time out\n");
DBG_88E("tdls handshake time out\n");
free_tdls_sta(ptdls_sta->padapter, ptdls_sta);
}
}
@ -2796,7 +2796,7 @@ void _tdls_alive_timer_phase1_hdl(void *FunctionContext)
ptdls_sta->tdls_sta_state &= (~TDLS_ALIVE_STATE);
DBG_871X("issue_tdls_dis_req to check alive\n");
DBG_88E("issue_tdls_dis_req to check alive\n");
issue_tdls_dis_req( padapter, ptdls_sta->hwaddr);
rtw_tdls_cmd(padapter, ptdls_sta->hwaddr, TDLS_CKALV_PH1);
sta_update_last_rx_pkts(ptdls_sta);
@ -2826,7 +2826,7 @@ void _tdls_alive_timer_phase2_hdl(void *FunctionContext)
if ( (ptdls_sta->tdls_sta_state & TDLS_ALIVE_STATE) &&
(sta_last_rx_pkts(ptdls_sta) + 3 <= sta_rx_pkts(ptdls_sta)) )
{
DBG_871X("TDLS STA ALIVE, ptdls_sta->sta_stats.last_rx_pkts:%llu, ptdls_sta->sta_stats.rx_pkts:%llu\n",
DBG_88E("TDLS STA ALIVE, ptdls_sta->sta_stats.last_rx_pkts:%llu, ptdls_sta->sta_stats.rx_pkts:%llu\n",
sta_last_rx_pkts(ptdls_sta), sta_rx_pkts(ptdls_sta));
ptdls_sta->alive_count = 0;
@ -2835,9 +2835,9 @@ void _tdls_alive_timer_phase2_hdl(void *FunctionContext)
else
{
if ( !(ptdls_sta->tdls_sta_state & TDLS_ALIVE_STATE) )
DBG_871X("TDLS STA TOO FAR\n");
DBG_88E("TDLS STA TOO FAR\n");
if ( !(sta_last_rx_pkts(ptdls_sta) + 3 <= sta_rx_pkts(ptdls_sta)))
DBG_871X("TDLS LINK WITH LOW TRAFFIC, ptdls_sta->sta_stats.last_rx_pkts:%llu, ptdls_sta->sta_stats.rx_pkts:%llu\n",
DBG_88E("TDLS LINK WITH LOW TRAFFIC, ptdls_sta->sta_stats.last_rx_pkts:%llu, ptdls_sta->sta_stats.rx_pkts:%llu\n",
sta_last_rx_pkts(ptdls_sta), sta_rx_pkts(ptdls_sta));
ptdls_sta->alive_count++;

76
core/rtw_wlan_util.c
View file

@ -551,7 +551,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", __func__, channel, channel_offset, bwmode );
DBG_88E( "[%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))
@ -756,7 +756,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",__func__, cmd, val);
//DBG_88E("%s=> cam write: %x, %x\n",__func__, cmd, val);
}
@ -858,18 +858,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", __func__ );
DBG_88E( "[%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", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
DBG_88E( "[%s] Peer PORT NUM = %d\n", __func__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
return( _TRUE );
}
}
else
{
DBG_871X( "[%s] NO WFD IE\n", __func__ );
DBG_88E( "[%s] NO WFD IE\n", __func__ );
}
return( _FAIL );
@ -981,7 +981,7 @@ void WMMOnAssocRsp(_adapter *padapter)
break;
}
DBG_871X("WMM(%x): %x, %x\n", ACI, ACM, acParm);
DBG_88E("WMM(%x): %x, %x\n", ACI, ACM, acParm);
}
if (padapter->registrypriv.acm_method == 1)
@ -1030,7 +1030,7 @@ void WMMOnAssocRsp(_adapter *padapter)
for (i=0; i<4; i++) {
pxmitpriv->wmm_para_seq[i] = inx[i];
DBG_871X("wmm_para_seq(%d): %d\n", i, pxmitpriv->wmm_para_seq[i]);
DBG_88E("wmm_para_seq(%d): %d\n", i, pxmitpriv->wmm_para_seq[i]);
}
return;
@ -1252,7 +1252,7 @@ void HTOnAssocRsp(_adapter *padapter)
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
DBG_871X("%s\n", __func__);
DBG_88E("%s\n", __func__);
if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable))
{
@ -1387,12 +1387,12 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
len = packet_len - sizeof(struct rtw_ieee80211_hdr_3addr);
if (len > MAX_IE_SZ) {
DBG_871X("%s IE too long for survey event\n", __func__);
DBG_88E("%s IE too long for survey event\n", __func__);
return _FAIL;
}
if (_rtw_memcmp(cur_network->network.MacAddress, pbssid, 6) == _FALSE) {
DBG_871X("Oops: rtw_check_network_encrypt linked but recv other bssid bcn\n" MAC_FMT MAC_FMT,
DBG_88E("Oops: rtw_check_network_encrypt linked but recv other bssid bcn\n" MAC_FMT MAC_FMT,
MAC_ARG(pbssid), MAC_ARG(cur_network->network.MacAddress));
return _TRUE;
}
@ -1429,11 +1429,11 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
}
if (ht_cap_info != cur_network->BcnInfo.ht_cap_info ||
((ht_info_infos_0&0x03) != (cur_network->BcnInfo.ht_info_infos_0&0x03))) {
DBG_871X("%s bcn now: ht_cap_info:%x ht_info_infos_0:%x\n", __func__,
DBG_88E("%s bcn now: ht_cap_info:%x ht_info_infos_0:%x\n", __func__,
ht_cap_info, ht_info_infos_0);
DBG_871X("%s bcn link: ht_cap_info:%x ht_info_infos_0:%x\n", __func__,
DBG_88E("%s bcn link: ht_cap_info:%x ht_info_infos_0:%x\n", __func__,
cur_network->BcnInfo.ht_cap_info, cur_network->BcnInfo.ht_info_infos_0);
DBG_871X("%s bw mode change, disconnect\n", __func__);
DBG_88E("%s bw mode change, disconnect\n", __func__);
{
//bcn_info_update
cur_network->BcnInfo.ht_cap_info = ht_cap_info;
@ -1452,19 +1452,19 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
if (pht_info) {
bcn_channel = pht_info->primary_channel;
} else { /* we don't find channel IE, so don't check it */
DBG_871X("Oops: %s we don't find channel IE, so don't check it\n", __func__);
DBG_88E("Oops: %s we don't find channel IE, so don't check it\n", __func__);
bcn_channel = Adapter->mlmeextpriv.cur_channel;
}
}
if (bcn_channel != Adapter->mlmeextpriv.cur_channel) {
DBG_871X("%s beacon channel:%d cur channel:%d disconnect\n", __func__,
DBG_88E("%s beacon channel:%d cur channel:%d disconnect\n", __func__,
bcn_channel, Adapter->mlmeextpriv.cur_channel);
goto _mismatch;
}
/* checking SSID */
if ((p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _SSID_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_)) == NULL) {
DBG_871X("%s marc: cannot find SSID for survey event\n", __func__);
DBG_88E("%s marc: cannot find SSID for survey event\n", __func__);
hidden_ssid = _TRUE;
} else {
hidden_ssid = _FALSE;
@ -1486,7 +1486,7 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
if (_rtw_memcmp(bssid->Ssid.Ssid, cur_network->network.Ssid.Ssid, 32) == _FALSE ||
bssid->Ssid.SsidLength != cur_network->network.Ssid.SsidLength) {
if (bssid->Ssid.Ssid[0] != '\0' && bssid->Ssid.SsidLength != 0) { /* not hidden ssid */
DBG_871X("%s(), SSID is not match return FAIL\n", __func__);
DBG_88E("%s(), SSID is not match return FAIL\n", __func__);
goto _mismatch;
}
}
@ -1503,7 +1503,7 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
("%s(): cur_network->network.Privacy is %d, bssid.Privacy is %d\n",
__func__, cur_network->network.Privacy,bssid->Privacy));
if (cur_network->network.Privacy != bssid->Privacy) {
DBG_871X("%s(), privacy is not match return FAIL\n",__func__);
DBG_88E("%s(), privacy is not match return FAIL\n",__func__);
goto _mismatch;
}
@ -1519,7 +1519,7 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
}
if (cur_network->BcnInfo.encryp_protocol != encryp_protocol) {
DBG_871X("%s(): enctyp is not match ,return FAIL\n",__func__);
DBG_88E("%s(): enctyp is not match ,return FAIL\n",__func__);
goto _mismatch;
}
@ -1546,14 +1546,14 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len)
RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_,
("%s cur_network->group_cipher is %d: %d\n",__func__, cur_network->BcnInfo.group_cipher, group_cipher));
if (pairwise_cipher != cur_network->BcnInfo.pairwise_cipher || group_cipher != cur_network->BcnInfo.group_cipher) {
DBG_871X("%s pairwise_cipher(%x:%x) or group_cipher(%x:%x) is not match ,return FAIL\n",__func__,
DBG_88E("%s pairwise_cipher(%x:%x) or group_cipher(%x:%x) is not match ,return FAIL\n",__func__,
pairwise_cipher, cur_network->BcnInfo.pairwise_cipher,
group_cipher, cur_network->BcnInfo.group_cipher);
goto _mismatch;
}
if (is_8021x != cur_network->BcnInfo.is_8021x) {
DBG_871X("%s authentication is not match ,return FAIL\n", __func__);
DBG_88E("%s authentication is not match ,return FAIL\n", __func__);
goto _mismatch;
}
}
@ -2000,19 +2000,19 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
case _VENDOR_SPECIFIC_IE_:
if ((_rtw_memcmp(pIE->data, ARTHEROS_OUI1, 3)) || (_rtw_memcmp(pIE->data, ARTHEROS_OUI2, 3)))
{
DBG_871X("link to Artheros AP\n");
DBG_88E("link to Artheros AP\n");
return HT_IOT_PEER_ATHEROS;
}
else if ((_rtw_memcmp(pIE->data, BROADCOM_OUI1, 3))
|| (_rtw_memcmp(pIE->data, BROADCOM_OUI2, 3))
|| (_rtw_memcmp(pIE->data, BROADCOM_OUI2, 3)))
{
DBG_871X("link to Broadcom AP\n");
DBG_88E("link to Broadcom AP\n");
return HT_IOT_PEER_BROADCOM;
}
else if (_rtw_memcmp(pIE->data, MARVELL_OUI, 3))
{
DBG_871X("link to Marvell AP\n");
DBG_88E("link to Marvell AP\n");
return HT_IOT_PEER_MARVELL;
}
else if (_rtw_memcmp(pIE->data, RALINK_OUI, 3))
@ -2020,33 +2020,33 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
if (!ralink_vendor_flag) {
ralink_vendor_flag = 1;
} else {
DBG_871X("link to Ralink AP\n");
DBG_88E("link to Ralink AP\n");
return HT_IOT_PEER_RALINK;
}
}
else if (_rtw_memcmp(pIE->data, CISCO_OUI, 3))
{
DBG_871X("link to Cisco AP\n");
DBG_88E("link to Cisco AP\n");
return HT_IOT_PEER_CISCO;
}
else if (_rtw_memcmp(pIE->data, REALTEK_OUI, 3))
{
DBG_871X("link to Realtek 96B\n");
DBG_88E("link to Realtek 96B\n");
return HT_IOT_PEER_REALTEK;
}
else if (_rtw_memcmp(pIE->data, AIRGOCAP_OUI,3))
{
DBG_871X("link to Airgo Cap\n");
DBG_88E("link to Airgo Cap\n");
return HT_IOT_PEER_AIRGO;
}
else if (_rtw_memcmp(pIE->data, EPIGRAM_OUI, 3))
{
epigram_vendor_flag = 1;
if (ralink_vendor_flag) {
DBG_871X("link to Tenda W311R AP\n");
DBG_88E("link to Tenda W311R AP\n");
return HT_IOT_PEER_TENDA;
} else {
DBG_871X("Capture EPIGRAM_OUI\n");
DBG_88E("Capture EPIGRAM_OUI\n");
}
}
else
@ -2062,13 +2062,13 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
}
if (ralink_vendor_flag && !epigram_vendor_flag) {
DBG_871X("link to Ralink AP\n");
DBG_88E("link to Ralink AP\n");
return HT_IOT_PEER_RALINK;
} else if (ralink_vendor_flag && epigram_vendor_flag){
DBG_871X("link to Tenda W311R AP\n");
DBG_88E("link to Tenda W311R AP\n");
return HT_IOT_PEER_TENDA;
} else {
DBG_871X("link to new AP\n");
DBG_88E("link to new AP\n");
return HT_IOT_PEER_UNKNOWN;
}
}
@ -2313,7 +2313,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", __func__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, start_seq: %d\n", __func__, __LINE__,
preorder_ctrl->indicate_seq, start_seq);
#endif
#else
@ -2360,13 +2360,13 @@ int rtw_handle_dualmac(_adapter *adapter, bool init)
if (init) {
if (pbuddy_padapter == NULL) {
pbuddy_padapter = adapter;
DBG_871X("%s(): pbuddy_padapter == NULL, Set pbuddy_padapter\n",__func__);
DBG_88E("%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",__func__);
DBG_88E("%s(): pbuddy_padapter exist, Exchange Information\n",__func__);
}
#ifdef CONFIG_DUALMAC_CONCURRENT
if (dvobj->InterfaceNumber == 0) {
@ -2374,13 +2374,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",__func__);
DBG_88E("%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",__func__);
DBG_88E("%s(): SECONDARY_ADAPTER\n",__func__);
}
#endif
}else {

80
core/rtw_xmit.c
View file

@ -573,7 +573,7 @@ u8 qos_acm(u8 acm_mask, u8 priority)
change_priority = 5;
break;
default:
DBG_871X("qos_acm(): invalid pattrib->priority: %d!!!\n", priority);
DBG_88E("qos_acm(): invalid pattrib->priority: %d!!!\n", priority);
break;
}
@ -677,7 +677,7 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr
}
}
} else if (0x888e == pattrib->ether_type) {
DBG_871X_LEVEL(_drv_always_, "send eapol packet\n");
DBG_88E_LEVEL(_drv_info_, "send eapol packet\n");
}
if ( (pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1) )
@ -707,7 +707,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", __func__, MAC_ARG(pattrib->ra));
DBG_88E("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __func__, MAC_ARG(pattrib->ra));
#endif
res =_FAIL;
goto exit;
@ -722,7 +722,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",__func__,pattrib->mac_id );
//DBG_88E("%s ==> mac_id(%d)\n",__func__,pattrib->mac_id );
pattrib->psta = psta;
}
else
@ -730,7 +730,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", __func__, MAC_ARG(pattrib->ra));
DBG_88E("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __func__, MAC_ARG(pattrib->ra));
#endif
res = _FAIL;
goto exit;
@ -774,7 +774,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", __func__,pattrib->ether_type);
DBG_88E("DBG_TX_DROP_FRAME %s psta->ieee8021x_blocked == _TRUE, pattrib->ether_type(%04x) != 0x888e\n", __func__,pattrib->ether_type);
#endif
res = _FAIL;
goto exit;
@ -826,7 +826,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", __func__, padapter->securitypriv.busetkipkey);
DBG_88E("DBG_TX_DROP_FRAME %s padapter->securitypriv.busetkipkey(%d)==_FAIL drop packet\n", __func__, padapter->securitypriv.busetkipkey);
#endif
res =_FAIL;
goto exit;
@ -1037,7 +1037,7 @@ _func_enter_;
//if ((psecuritypriv->sw_encrypt)||(pattrib->bswenc))
if (pattrib->bswenc)
{
//DBG_871X("start xmitframe_swencrypt\n");
//DBG_88E("start xmitframe_swencrypt\n");
RT_TRACE(_module_rtl871x_xmit_c_,_drv_alert_,("### xmitframe_swencrypt\n"));
switch (pattrib->encrypt){
case _WEP40_:
@ -1221,7 +1221,7 @@ _func_enter_;
//check BA_starting_seqctrl
if (SN_LESS(pattrib->seqnum, tx_seq))
{
//DBG_871X("tx ampdu seqnum(%d) < tx_seq(%d)\n", pattrib->seqnum, tx_seq);
//DBG_88E("tx ampdu seqnum(%d) < tx_seq(%d)\n", pattrib->seqnum, tx_seq);
pattrib->ampdu_en = _FALSE;//AGG BK
}
else if (SN_EQUAL(pattrib->seqnum, tx_seq))
@ -1232,7 +1232,7 @@ _func_enter_;
}
else
{
//DBG_871X("tx ampdu over run\n");
//DBG_88E("tx ampdu over run\n");
psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (pattrib->seqnum+1)&0xfff;
pattrib->ampdu_en = _TRUE;//AGG EN
}
@ -1651,7 +1651,7 @@ _func_enter_;
return _FAIL;
if (pxmitframe->buf_addr == NULL){
DBG_8192C("==> %s buf_addr==NULL\n",__func__);
DBG_88E("==> %s buf_addr==NULL\n",__func__);
return _FAIL;
}
@ -1671,7 +1671,7 @@ _func_enter_;
if (rtw_make_wlanhdr(padapter, mem_start, pattrib) == _FAIL) {
RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("rtw_xmitframe_coalesce: rtw_make_wlanhdr fail; drop pkt\n"));
DBG_8192C("rtw_xmitframe_coalesce: rtw_make_wlanhdr fail; drop pkt\n");
DBG_88E("rtw_xmitframe_coalesce: rtw_make_wlanhdr fail; drop pkt\n");
res = _FAIL;
goto exit;
}
@ -1793,7 +1793,7 @@ _func_enter_;
if (xmitframe_addmic(padapter, pxmitframe) == _FAIL)
{
RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("xmitframe_addmic(padapter, pxmitframe)==_FAIL\n"));
DBG_8192C("xmitframe_addmic(padapter, pxmitframe)==_FAIL\n");
DBG_88E("xmitframe_addmic(padapter, pxmitframe)==_FAIL\n");
res = _FAIL;
goto exit;
}
@ -1954,7 +1954,7 @@ _func_enter_;
{
pxmitpriv->free_xmit_extbuf_cnt--;
#ifdef DBG_XMIT_BUF_EXT
DBG_871X("DBG_XMIT_BUF_EXT ALLOC no=%d, free_xmit_extbuf_cnt=%d\n",pxmitbuf->no, pxmitpriv->free_xmit_extbuf_cnt);
DBG_88E("DBG_XMIT_BUF_EXT ALLOC no=%d, free_xmit_extbuf_cnt=%d\n",pxmitbuf->no, pxmitpriv->free_xmit_extbuf_cnt);
#endif
@ -1970,7 +1970,7 @@ _func_enter_;
#endif
if (pxmitbuf->sctx) {
DBG_871X("%s pxmitbuf->sctx is not NULL\n", __func__);
DBG_88E("%s pxmitbuf->sctx is not NULL\n", __func__);
rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_ALLOC);
}
@ -2002,7 +2002,7 @@ _func_enter_;
rtw_list_insert_tail(&(pxmitbuf->list), get_list_head(pfree_queue));
pxmitpriv->free_xmit_extbuf_cnt++;
#ifdef DBG_XMIT_BUF_EXT
DBG_871X("DBG_XMIT_BUF_EXT FREE no=%d, free_xmit_extbuf_cnt=%d\n",pxmitbuf->no ,pxmitpriv->free_xmit_extbuf_cnt);
DBG_88E("DBG_XMIT_BUF_EXT FREE no=%d, free_xmit_extbuf_cnt=%d\n",pxmitbuf->no ,pxmitpriv->free_xmit_extbuf_cnt);
#endif
_exit_critical(&pfree_queue->lock, &irqL);
@ -2021,7 +2021,7 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)
_func_enter_;
//DBG_871X("+rtw_alloc_xmitbuf\n");
//DBG_88E("+rtw_alloc_xmitbuf\n");
_enter_critical(&pfree_xmitbuf_queue->lock, &irqL);
@ -2042,9 +2042,9 @@ _func_enter_;
{
pxmitpriv->free_xmitbuf_cnt--;
#ifdef DBG_XMIT_BUF
DBG_871X("DBG_XMIT_BUF ALLOC no=%d, free_xmitbuf_cnt=%d\n",pxmitbuf->no, pxmitpriv->free_xmitbuf_cnt);
DBG_88E("DBG_XMIT_BUF ALLOC no=%d, free_xmitbuf_cnt=%d\n",pxmitbuf->no, pxmitpriv->free_xmitbuf_cnt);
#endif
//DBG_871X("alloc, free_xmitbuf_cnt=%d\n", pxmitpriv->free_xmitbuf_cnt);
//DBG_88E("alloc, free_xmitbuf_cnt=%d\n", pxmitpriv->free_xmitbuf_cnt);
pxmitbuf->priv_data = NULL;
//pxmitbuf->ext_tag = _FALSE;
@ -2059,14 +2059,14 @@ _func_enter_;
#endif
if (pxmitbuf->sctx) {
DBG_871X("%s pxmitbuf->sctx is not NULL\n", __func__);
DBG_88E("%s pxmitbuf->sctx is not NULL\n", __func__);
rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_ALLOC);
}
}
#ifdef DBG_XMIT_BUF
else
{
DBG_871X("DBG_XMIT_BUF rtw_alloc_xmitbuf return NULL\n");
DBG_88E("DBG_XMIT_BUF rtw_alloc_xmitbuf return NULL\n");
}
#endif
@ -2084,7 +2084,7 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
_func_enter_;
//DBG_871X("+rtw_free_xmitbuf\n");
//DBG_88E("+rtw_free_xmitbuf\n");
if (pxmitbuf==NULL)
{
@ -2092,7 +2092,7 @@ _func_enter_;
}
if (pxmitbuf->sctx) {
DBG_871X("%s pxmitbuf->sctx is not NULL\n", __func__);
DBG_88E("%s pxmitbuf->sctx is not NULL\n", __func__);
rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_FREE);
}
@ -2109,9 +2109,9 @@ _func_enter_;
rtw_list_insert_tail(&(pxmitbuf->list), get_list_head(pfree_xmitbuf_queue));
pxmitpriv->free_xmitbuf_cnt++;
//DBG_871X("FREE, free_xmitbuf_cnt=%d\n", pxmitpriv->free_xmitbuf_cnt);
//DBG_88E("FREE, free_xmitbuf_cnt=%d\n", pxmitpriv->free_xmitbuf_cnt);
#ifdef DBG_XMIT_BUF
DBG_871X("DBG_XMIT_BUF FREE no=%d, free_xmitbuf_cnt=%d\n",pxmitbuf->no ,pxmitpriv->free_xmitbuf_cnt);
DBG_88E("DBG_XMIT_BUF FREE no=%d, free_xmitbuf_cnt=%d\n",pxmitbuf->no ,pxmitpriv->free_xmitbuf_cnt);
#endif
_exit_critical(&pfree_xmitbuf_queue->lock, &irqL);
}
@ -2545,7 +2545,7 @@ _func_enter_;
if (psta == NULL) {
res = _FAIL;
DBG_8192C("rtw_xmit_classifier: psta == NULL\n");
DBG_88E("rtw_xmit_classifier: psta == NULL\n");
RT_TRACE(_module_rtl871x_xmit_c_,_drv_err_,("rtw_xmit_classifier: psta == NULL\n"));
goto exit;
}
@ -2907,7 +2907,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", __func__);
DBG_88E("DBG_TX_DROP_FRAME %s no more pxmitframe\n", __func__);
//#endif
return -1;
}
@ -2949,7 +2949,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", __func__);
DBG_88E("DBG_TX_DROP_FRAME %s update attrib fail\n", __func__);
#endif
rtw_free_xmitframe(pxmitpriv, pxmitframe);
return -1;
@ -3089,7 +3089,7 @@ sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *p
if (pattrib->triggered==1)
{
//DBG_871X("directly xmit pspoll_triggered packet\n");
//DBG_88E("directly xmit pspoll_triggered packet\n");
//pattrib->triggered=0;
@ -3120,7 +3120,7 @@ sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *p
pstapriv->tim_bitmap |= BIT(0);//
pstapriv->sta_dz_bitmap |= BIT(0);
//DBG_871X("enqueue, sq_len=%d, tim=%x\n", psta->sleepq_len, pstapriv->tim_bitmap);
//DBG_88E("enqueue, sq_len=%d, tim=%x\n", psta->sleepq_len, pstapriv->tim_bitmap);
update_beacon(padapter, _TIM_IE_, NULL, _FALSE);//tx bc/mc packets after upate bcn
@ -3181,11 +3181,11 @@ sint xmitframe_enqueue_for_sleeping_sta(_adapter *padapter, struct xmit_frame *p
{
pstapriv->tim_bitmap |= BIT(psta->aid);
//DBG_871X("enqueue, sq_len=%d, tim=%x\n", psta->sleepq_len, pstapriv->tim_bitmap);
//DBG_88E("enqueue, sq_len=%d, tim=%x\n", psta->sleepq_len, pstapriv->tim_bitmap);
if (psta->sleepq_len==1)
{
//DBG_871X("sleepq_len==1, update BCNTIM\n");
//DBG_88E("sleepq_len==1, update BCNTIM\n");
//upate BCN for TIM IE
update_beacon(padapter, _TIM_IE_, NULL, _FALSE);
}
@ -3392,7 +3392,7 @@ void wakeup_sta_to_xmit(_adapter *padapter, struct sta_info *psta)
#endif //CONFIG_TDLS
pstapriv->tim_bitmap &= ~BIT(psta->aid);
//DBG_871X("wakeup to xmit, qlen==0, update_BCNTIM, tim=%x\n", pstapriv->tim_bitmap);
//DBG_88E("wakeup to xmit, qlen==0, update_BCNTIM, tim=%x\n", pstapriv->tim_bitmap);
//upate BCN for TIM IE
//update_BCNTIM(padapter);
update_mask = BIT(0);
@ -3456,7 +3456,7 @@ void wakeup_sta_to_xmit(_adapter *padapter, struct sta_info *psta)
pstapriv->tim_bitmap &= ~BIT(0);
pstapriv->sta_dz_bitmap &= ~BIT(0);
//DBG_871X("wakeup to xmit, qlen==0, update_BCNTIM, tim=%x\n", pstapriv->tim_bitmap);
//DBG_88E("wakeup to xmit, qlen==0, update_BCNTIM, tim=%x\n", pstapriv->tim_bitmap);
//upate BCN for TIM IE
//update_BCNTIM(padapter);
update_mask |= BIT(1);
@ -3552,7 +3552,7 @@ void xmit_delivery_enabled_frames(_adapter *padapter, struct sta_info *psta)
#endif //CONFIG_TDLS
pstapriv->tim_bitmap &= ~BIT(psta->aid);
//DBG_871X("wakeup to xmit, qlen==0, update_BCNTIM, tim=%x\n", pstapriv->tim_bitmap);
//DBG_88E("wakeup to xmit, qlen==0, update_BCNTIM, tim=%x\n", pstapriv->tim_bitmap);
//upate BCN for TIM IE
//update_BCNTIM(padapter);
update_beacon(padapter, _TIM_IE_, NULL, _FALSE);
@ -3658,7 +3658,7 @@ struct xmit_buf* dequeue_pending_xmitbuf_under_survey(
}
else
{
DBG_871X("%s, !!!ERROR!!! For USB, TODO ITEM\n", __func__);
DBG_88E("%s, !!!ERROR!!! For USB, TODO ITEM\n", __func__);
}
#else
type = GetFrameSubType(pxmitbuf->pbuf + TXDESC_OFFSET);
@ -3736,7 +3736,7 @@ int rtw_sctx_wait(struct submit_ctx *sctx)
if (!wait_for_completion_timeout(&sctx->done, expire)) {
/* timeout, do something?? */
status = RTW_SCTX_DONE_TIMEOUT;
DBG_871X("%s timeout\n", __func__);
DBG_88E("%s timeout\n", __func__);
} else {
status = sctx->status;
}
@ -3768,7 +3768,7 @@ void rtw_sctx_done_err(struct submit_ctx **sctx, int status)
{
if (*sctx) {
if (rtw_sctx_chk_waring_status(status))
DBG_871X("%s status:%d\n", __func__, status);
DBG_88E("%s status:%d\n", __func__, status);
(*sctx)->status = status;
#ifdef PLATFORM_LINUX
complete(&((*sctx)->done));
@ -3825,7 +3825,7 @@ int rtw_ack_tx_polling(struct xmit_priv *pxmitpriv, u32 timeout_ms)
if (pack_tx_ops->status == RTW_SCTX_SUBMITTED) {
pack_tx_ops->status = RTW_SCTX_DONE_TIMEOUT;
DBG_871X("%s timeout\n", __func__);
DBG_88E("%s timeout\n", __func__);
}
if (pack_tx_ops->status == RTW_SCTX_DONE_SUCCESS)
@ -3857,7 +3857,7 @@ void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status)
if (pxmitpriv->ack_tx) {
rtw_sctx_done_err(&pack_tx_ops, status);
} else {
DBG_871X("%s ack_tx not set\n", __func__);
DBG_88E("%s ack_tx not set\n", __func__);
}
}
#endif //CONFIG_XMIT_ACK