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: Replace degub macro DBG_871X with DBG_88E

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2015-08-15 16:38:30 -05:00
parent 1e6accffc4
commit 3a3339b715
46 changed files with 1548 additions and 1548 deletions
Download patch file Download diff file Expand all files Collapse all files

98
core/rtw_ap.c
View file

@ -85,7 +85,7 @@ static void update_BCNTIM(struct adapter *padapter)
struct wlan_bssid_ex *pnetwork_mlmeext = &(pmlmeinfo->network);
unsigned char *pie = pnetwork_mlmeext->IEs;
/* DBG_871X("%s\n", __FUNCTION__); */
/* DBG_88E("%s\n", __FUNCTION__); */
/* update TIM IE */
/* if (pstapriv->tim_bitmap) */
@ -322,7 +322,7 @@ void expire_timeout_chk(struct 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]);
spin_unlock_bh(&pstapriv->auth_list_lock);
@ -372,7 +372,7 @@ void expire_timeout_chk(struct 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);
@ -396,14 +396,14 @@ void expire_timeout_chk(struct 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, false, WLAN_REASON_DEAUTH_LEAVING);
} else {
/* TODO: Aging mechanism to digest frames in sleep_q to avoid running out of xmitframe */
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);
@ -437,19 +437,19 @@ void expire_timeout_chk(struct adapter *padapter)
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);
spin_lock_bh(&pstapriv->asoc_list_lock);
if (rtw_is_list_empty(&psta->asoc_list) ==false) {
rtw_list_delete(&psta->asoc_list);
@ -544,7 +544,7 @@ void add_RATid(struct 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",
__FUNCTION__ , psta->mac_id, raid , tx_ra_bitmap, arg);
/* bitmap[0:27] = tx_rate_bitmap */
@ -560,7 +560,7 @@ void add_RATid(struct adapter *padapter, struct sta_info *psta, u8 rssi_level)
psta->raid = raid;
psta->init_rate = init_rate;
} 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);
}
}
@ -616,7 +616,7 @@ void update_bmc_sta(struct 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);
{
@ -628,7 +628,7 @@ void update_bmc_sta(struct 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);
rtw_hal_add_ra_tid(padapter, tx_ra_bitmap, arg, 0);
}
@ -643,7 +643,7 @@ void update_bmc_sta(struct adapter *padapter)
psta->state = _FW_LINKED;
spin_unlock_bh(&psta->lock);
} else {
DBG_871X("add_RATid_bmc_sta error!\n");
DBG_88E("add_RATid_bmc_sta error!\n");
}
}
@ -668,7 +668,7 @@ void update_sta_info_apmode(struct adapter *padapter, struct sta_info *psta)
/* psta->mac_id = psta->aid+4; */
psta->mac_id = psta->aid+1;
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
/* ap mode */
rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true);
@ -732,7 +732,7 @@ static void update_hw_ht_param(struct adapter *padapter)
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
/* handle A-MPDU parameter field */
/*
@ -752,7 +752,7 @@ static void update_hw_ht_param(struct adapter *padapter)
/* */
pmlmeinfo->SM_PS = (le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) & 0x0C) >> 2;
if (pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC)
DBG_871X("%s(): WLAN_HT_CAP_SM_PS_STATIC\n", __FUNCTION__);
DBG_88E("%s(): WLAN_HT_CAP_SM_PS_STATIC\n", __FUNCTION__);
/* */
/* Config current HT Protection mode. */
@ -780,7 +780,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
#endif /* CONFIG_P2P */
/* DBG_871X("%s\n", __FUNCTION__); */
/* DBG_88E("%s\n", __FUNCTION__); */
bcn_interval = (u16)pnetwork->Configuration.BeaconPeriod;
cur_channel = pnetwork->Configuration.DSConfig;
@ -876,7 +876,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
/* set_channel_bwmode(padapter, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); */
set_channel_bwmode(padapter, cur_channel, cur_ch_offset, cur_bwmode);
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;
@ -903,7 +903,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
/* issue beacon frame */
if (send_beacon(padapter) ==_FAIL)
DBG_871X("issue_beacon, fail!\n");
DBG_88E("issue_beacon, fail!\n");
}
/* update bc/mc sta_info */
@ -943,7 +943,7 @@ int rtw_check_beacon_data(struct adapter *padapter, u8 *pbuf, int len)
/* ht_capab, ht_oper */
/* WPS IE */
DBG_871X("%s, len =%d\n", __FUNCTION__, len);
DBG_88E("%s, len =%d\n", __FUNCTION__, len);
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != true)
return _FAIL;
@ -1192,7 +1192,7 @@ void rtw_set_macaddr_acl(struct 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;
}
@ -1208,7 +1208,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
struct __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);
@ -1225,7 +1225,7 @@ int rtw_acl_add_sta(struct adapter *padapter, u8 *addr)
if (_rtw_memcmp(paclnode->addr, addr, ETH_ALEN)) {
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;
}
}
@ -1256,7 +1256,7 @@ int rtw_acl_add_sta(struct 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);
spin_unlock_bh(&(pacl_node_q->lock));
@ -1273,7 +1273,7 @@ int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list;
struct __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));
spin_lock_bh(&(pacl_node_q->lock));
@ -1297,7 +1297,7 @@ int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)
spin_unlock_bh(&(pacl_node_q->lock));
DBG_871X("%s, acl_num =%d\n", __func__, pacl_list->num);
DBG_88E("%s, acl_num =%d\n", __func__, pacl_list->num);
return ret;
@ -1305,7 +1305,7 @@ int rtw_acl_remove_sta(struct adapter *padapter, u8 *addr)
static void update_bcn_fixed_ie(struct adapter *padapter)
{
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
}
@ -1318,7 +1318,7 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter)
unsigned char *p, *ie = pnetwork->IEs;
u32 len = 0;
DBG_871X("%s, ERP_enable =%d\n", __FUNCTION__, pmlmeinfo->ERP_enable);
DBG_88E("%s, ERP_enable =%d\n", __FUNCTION__, pmlmeinfo->ERP_enable);
if (!pmlmeinfo->ERP_enable)
return;
@ -1345,31 +1345,31 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter)
static void update_bcn_htcap_ie(struct adapter *padapter)
{
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
}
static void update_bcn_htinfo_ie(struct adapter *padapter)
{
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
}
static void update_bcn_rsn_ie(struct adapter *padapter)
{
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
}
static void update_bcn_wpa_ie(struct adapter *padapter)
{
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
}
static void update_bcn_wmm_ie(struct adapter *padapter)
{
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
}
@ -1384,7 +1384,7 @@ static void update_bcn_wps_ie(struct adapter *padapter)
unsigned char *ie = pnetwork->IEs;
u32 ielen = pnetwork->IELength;
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
pwps_ie = rtw_get_wps_ie(ie+_FIXED_IE_LENGTH_, ielen-_FIXED_IE_LENGTH_, NULL, &wps_ielen);
@ -1431,7 +1431,7 @@ static void update_bcn_p2p_ie(struct adapter *padapter)
static void update_bcn_vendor_spec_ie(struct adapter *padapter, u8*oui)
{
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
if (_rtw_memcmp(RTW_WPA_OUI, oui, 4)) {
update_bcn_wpa_ie(padapter);
@ -1442,7 +1442,7 @@ static void update_bcn_vendor_spec_ie(struct adapter *padapter, u8*oui)
} else if (_rtw_memcmp(P2P_OUI, oui, 4)) {
update_bcn_p2p_ie(padapter);
} else {
DBG_871X("unknown OUI type!\n");
DBG_88E("unknown OUI type!\n");
}
}
@ -1454,7 +1454,7 @@ void update_beacon(struct adapter *padapter, u8 ie_id, u8 *oui, u8 tx)
struct mlme_ext_priv *pmlmeext;
/* struct mlme_ext_info *pmlmeinfo; */
/* DBG_871X("%s\n", __FUNCTION__); */
/* DBG_88E("%s\n", __FUNCTION__); */
if (!padapter)
return;
@ -1548,7 +1548,7 @@ static int rtw_ht_operation_update(struct 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",
__FUNCTION__, pmlmepriv->ht_op_mode);
if (!(pmlmepriv->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT)
@ -1599,7 +1599,7 @@ static int rtw_ht_operation_update(struct 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",
__FUNCTION__, pmlmepriv->ht_op_mode, op_mode_changes);
return op_mode_changes;
@ -1724,7 +1724,7 @@ void bss_cap_update_on_sta_join(struct adapter *padapter, struct sta_info *psta)
if (psta->flags & WLAN_STA_HT) {
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) {
@ -1737,7 +1737,7 @@ void bss_cap_update_on_sta_join(struct 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",
__FUNCTION__, MAC_ARG(psta->hwaddr),
pmlmepriv->num_sta_ht_no_gf);
@ -1748,7 +1748,7 @@ void bss_cap_update_on_sta_join(struct 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",
__FUNCTION__, MAC_ARG(psta->hwaddr),
pmlmepriv->num_sta_ht_20mhz);
@ -1759,7 +1759,7 @@ void bss_cap_update_on_sta_join(struct 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",
__FUNCTION__, MAC_ARG(psta->hwaddr),
pmlmepriv->num_sta_no_ht);
@ -1774,7 +1774,7 @@ void bss_cap_update_on_sta_join(struct 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);
}
@ -1836,7 +1836,7 @@ u8 bss_cap_update_on_sta_leave(struct adapter *padapter, struct sta_info *psta)
update_beacon(padapter, _HT_ADD_INFO_IE_, NULL, true);
}
DBG_871X("%s, updated =%d\n", __func__, beacon_updated);
DBG_88E("%s, updated =%d\n", __func__, beacon_updated);
return beacon_updated;
@ -1902,7 +1902,7 @@ int rtw_ap_inform_ch_switch (struct 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);
spin_lock_bh(&pstapriv->asoc_list_lock);
@ -1938,7 +1938,7 @@ int rtw_sta_flush(struct adapter *padapter)
char chk_alive_list[NUM_STA];
int i;
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;
@ -2066,7 +2066,7 @@ void rtw_ap_restore_network(struct adapter *padapter)
psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]);
if (psta == NULL) {
DBG_871X(FUNC_ADPT_FMT" sta_info is null\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT" sta_info is null\n", FUNC_ADPT_ARG(padapter));
} else if (psta->state &_FW_LINKED) {
Update_RA_Entry(padapter, psta);
/* pairwise key */
@ -2166,7 +2166,7 @@ void stop_ap_mode(struct adapter *padapter)
}
spin_unlock_bh(&(pacl_node_q->lock));
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);

36
core/rtw_cmd.c
View file

@ -248,7 +248,7 @@ static int rtw_cmd_filter(struct cmd_priv *pcmdpriv, struct cmd_obj *cmd_obj)
if ((pcmdpriv->padapter->hw_init_completed ==false && bAllow == false) ||
pcmdpriv->cmdthd_running == false) { /* com_thread not running */
/* DBG_871X("%s:%s: drop cmdcode:%u, hw_init_completed:%u, cmdthd_running:%u\n", caller_func, __FUNCTION__, */
/* DBG_88E("%s:%s: drop cmdcode:%u, hw_init_completed:%u, cmdthd_running:%u\n", caller_func, __FUNCTION__, */
/* cmd_obj->cmdcode, */
/* pcmdpriv->padapter->hw_init_completed, */
/* pcmdpriv->cmdthd_running */
@ -359,32 +359,32 @@ int rtw_cmd_thread(void * context)
while (1) {
if (_rtw_down_sema(&pcmdpriv->cmd_queue_sema) == _FAIL) {
DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" _rtw_down_sema(&pcmdpriv->cmd_queue_sema) return _FAIL, break\n", FUNC_ADPT_ARG(padapter));
DBG_88E_LEVEL(_drv_always_, FUNC_ADPT_FMT" _rtw_down_sema(&pcmdpriv->cmd_queue_sema) return _FAIL, break\n", FUNC_ADPT_ARG(padapter));
break;
}
if ((padapter->bDriverStopped == true)||(padapter->bSurpriseRemoved == true))
{
DBG_871X_LEVEL(_drv_always_, "%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
DBG_88E_LEVEL(_drv_always_, "%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
__FUNCTION__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__);
break;
}
if (pcmdpriv->stop_req) {
DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" stop_req:%u, break\n", FUNC_ADPT_ARG(padapter), pcmdpriv->stop_req);
DBG_88E_LEVEL(_drv_always_, FUNC_ADPT_FMT" stop_req:%u, break\n", FUNC_ADPT_ARG(padapter), pcmdpriv->stop_req);
break;
}
if (rtw_is_list_empty(&(pcmdpriv->cmd_queue.queue)))
{
/* DBG_871X("%s: cmd queue is empty!\n", __func__); */
/* DBG_88E("%s: cmd queue is empty!\n", __func__); */
continue;
}
_next:
if ((padapter->bDriverStopped == true)||(padapter->bSurpriseRemoved == true))
{
DBG_871X_LEVEL(_drv_always_, "%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
DBG_88E_LEVEL(_drv_always_, "%s: DriverStopped(%d) SurpriseRemoved(%d) break at line %d\n",
__FUNCTION__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__);
break;
}
@ -461,7 +461,7 @@ post_process:
break;
}
/* DBG_871X("%s: leaving... drop cmdcode:%u\n", __FUNCTION__, pcmd->cmdcode); */
/* DBG_88E("%s: leaving... drop cmdcode:%u\n", __FUNCTION__, pcmd->cmdcode); */
rtw_free_cmd_obj(pcmd);
}while (1);
@ -1067,7 +1067,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network* pnetwork)
else
adapter_to_pwrctl(padapter)->smart_ps = padapter->registrypriv.smart_ps;
DBG_871X("%s: smart_ps =%d\n", __func__, adapter_to_pwrctl(padapter)->smart_ps);
DBG_88E("%s: smart_ps =%d\n", __func__, adapter_to_pwrctl(padapter)->smart_ps);
pcmd->cmdsz = get_wlan_bssid_ex_sz(psecnetwork);/* get cmdsz before endian conversion */
@ -1439,7 +1439,7 @@ u8 rtw_addbareq_cmd(struct adapter*padapter, u8 tid, u8 *addr)
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);
@ -1576,7 +1576,7 @@ u8 rtw_set_ch_cmd(struct adapter*padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueu
;
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 */
@ -1614,7 +1614,7 @@ u8 rtw_set_ch_cmd(struct adapter*padapter, u8 ch, u8 bw, u8 ch_offset, u8 enqueu
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);
;
@ -1811,7 +1811,7 @@ static void traffic_status_watchdog(struct adapter *padapter)
if (link_detect->NumTxOkInPeriod > TX_ACTIVE_TH
|| link_detect->NumRxUnicastOkInPeriod > RX_ACTIVE_TH) {
DBG_871X_LEVEL(_drv_info_, FUNC_ADPT_FMT" acqiure wake_lock for %u ms(tx:%d, rx_unicast:%d)\n",
DBG_88E_LEVEL(_drv_info_, FUNC_ADPT_FMT" acqiure wake_lock for %u ms(tx:%d, rx_unicast:%d)\n",
FUNC_ADPT_ARG(padapter),
TRAFFIC_PROTECT_PERIOD_MS,
link_detect->NumTxOkInPeriod,
@ -1894,7 +1894,7 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
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)
@ -1907,11 +1907,11 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
}
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 */
pwrpriv->LpsIdleCount = 0;
@ -1921,7 +1921,7 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
#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);
@ -1933,7 +1933,7 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
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 = jiffies;
#ifdef CONFIG_BT_COEXIST
BT_SpecialPacketNotify(padapter);
@ -1942,7 +1942,7 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
LPS_Leave(padapter);
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)

16
core/rtw_debug.c
View file

@ -71,7 +71,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;
}
@ -80,7 +80,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;
}
@ -96,7 +96,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;
}
@ -153,7 +153,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;
}
@ -162,7 +162,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;
}
@ -654,9 +654,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");
}
@ -1073,7 +1073,7 @@ int proc_set_best_channel(struct file *file, const char __user *buffer,
pmlmeext->channel_set[i].rx_count = 0;
}
DBG_871X("set %s\n", "Clean Best Channel Count");
DBG_88E("set %s\n", "Clean Best Channel Count");
}
return count;

18
core/rtw_efuse.c
View file

@ -217,7 +217,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)); */
}
@ -762,12 +762,12 @@ u8 rtw_efuse_map_write(struct adapter *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;
}
@ -859,14 +859,14 @@ u8 rtw_BT_efuse_map_write(struct adapter *padapter, u16 addr, u16 cnts, u8 *data
if (word_en != 0xF)
{
DBG_871X("%s: offset =%#X\n", __FUNCTION__, offset);
DBG_871X("%s: word_en =%#X\n", __FUNCTION__, word_en);
DBG_871X("%s: data =", __FUNCTION__);
DBG_88E("%s: offset =%#X\n", __FUNCTION__, offset);
DBG_88E("%s: word_en =%#X\n", __FUNCTION__, word_en);
DBG_88E("%s: data =", __FUNCTION__);
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;

38
core/rtw_ieee80211.c
View file

@ -820,7 +820,7 @@ u8 *rtw_get_wps_ie_from_scan_queue(u8 *in_ie, uint in_len, u8 *wps_ie, uint *wps
{
u8* wps = NULL;
DBG_871X( "[%s] frame_type = %d\n", __FUNCTION__, frame_type );
DBG_88E( "[%s] frame_type = %d\n", __FUNCTION__, frame_type );
switch ( frame_type )
{
case 1:
@ -924,7 +924,7 @@ u8 *rtw_get_wps_attr(u8 *wps_ie, uint wps_ielen, u16 target_attr_id , u8 *buf_at
u16 attr_data_len = RTW_GET_BE16(attr_ptr + 2);
u16 attr_len = attr_data_len + 4;
/* DBG_871X("%s attr_ptr:%p, id:%u, length:%u\n", __FUNCTION__, attr_ptr, attr_id, attr_data_len); */
/* DBG_88E("%s attr_ptr:%p, id:%u, length:%u\n", __FUNCTION__, attr_ptr, attr_id, attr_data_len); */
if ( attr_id == target_attr_id )
{
target_attr_ptr = attr_ptr;
@ -992,7 +992,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);
}
@ -1013,7 +1013,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);
@ -1030,7 +1030,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);
@ -1043,7 +1043,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);
@ -1058,7 +1058,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);
@ -1067,7 +1067,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);
@ -1105,7 +1105,7 @@ enum 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);
@ -1196,7 +1196,7 @@ enum 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;
@ -1276,10 +1276,10 @@ void rtw_macaddr_cfg(u8 *mac_addr)
mac[5] = 0x00;
/* use default mac addresss */
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)
@ -1291,7 +1291,7 @@ void dump_ies(u8 *buf, u32 buf_len)
id = *pos;
len = *(pos+1);
DBG_871X("%s ID:%u, LEN:%u\n", __FUNCTION__, id, len);
DBG_88E("%s ID:%u, LEN:%u\n", __FUNCTION__, id, len);
dump_wps_ie(pos, len);
#ifdef CONFIG_P2P
dump_p2p_ie(pos, len);
@ -1322,7 +1322,7 @@ void dump_wps_ie(u8 *ie, u32 ie_len)
id = RTW_GET_BE16(pos);
len = RTW_GET_BE16(pos + 2);
DBG_871X("%s ID:0x%04x, LEN:%u\n", __FUNCTION__, id, len);
DBG_88E("%s ID:0x%04x, LEN:%u\n", __FUNCTION__, id, len);
pos+=(4+len);
}
@ -1417,7 +1417,7 @@ void dump_p2p_ie(u8 *ie, u32 ie_len) {
id = *pos;
len = RTW_GET_LE16(pos+1);
DBG_871X("%s ID:%u, LEN:%u\n", __FUNCTION__, id, len);
DBG_88E("%s ID:%u, LEN:%u\n", __FUNCTION__, id, len);
pos+=(3+len);
}
@ -1427,7 +1427,7 @@ u8 *rtw_get_p2p_ie_from_scan_queue(u8 *in_ie, int in_len, u8 *p2p_ie, uint *p2p_
{
u8* p2p = NULL;
DBG_871X( "[%s] frame_type = %d\n", __FUNCTION__, frame_type );
DBG_88E( "[%s] frame_type = %d\n", __FUNCTION__, frame_type );
switch ( frame_type )
{
case 1:
@ -1534,7 +1534,7 @@ u8 *rtw_get_p2p_attr(u8 *p2p_ie, uint p2p_ielen, u8 target_attr_id , u8 *buf_att
u16 attr_data_len = RTW_GET_LE16(attr_ptr + 1);
u16 attr_len = attr_data_len + 3;
/* DBG_871X("%s attr_ptr:%p, id:%u, length:%u\n", __FUNCTION__, attr_ptr, attr_id, attr_data_len); */
/* DBG_88E("%s attr_ptr:%p, id:%u, length:%u\n", __FUNCTION__, attr_ptr, attr_id, attr_data_len); */
if ( attr_id == target_attr_id )
{
target_attr_ptr = attr_ptr;
@ -1679,7 +1679,7 @@ void dump_wfd_ie(u8 *ie, u32 ie_len)
id = *pos;
len = RTW_GET_BE16(pos+1);
DBG_871X("%s ID:%u, LEN:%u\n", __FUNCTION__, id, len);
DBG_88E("%s ID:%u, LEN:%u\n", __FUNCTION__, id, len);
pos+=(3+len);
}
@ -1749,7 +1749,7 @@ int rtw_get_wfd_ie_from_scan_queue(u8 *in_ie, int in_len, u8 *wfd_ie, uint *wfd_
match =false;
DBG_871X( "[%s] frame_type = %d\n", __FUNCTION__, frame_type );
DBG_88E( "[%s] frame_type = %d\n", __FUNCTION__, frame_type );
switch ( frame_type )
{
case 1:

18
core/rtw_io.c
View file

@ -303,10 +303,10 @@ int rtw_inc_and_chk_continual_io_error(struct dvobj_priv *dvobj)
int ret = false;
int value;
if ( (value =ATOMIC_INC_RETURN(&dvobj->continual_io_error)) > MAX_CONTINUAL_IO_ERR) {
DBG_871X("[dvobj:%p][ERROR] continual_io_error:%d > %d\n", dvobj, value, MAX_CONTINUAL_IO_ERR);
DBG_88E("[dvobj:%p][ERROR] continual_io_error:%d > %d\n", dvobj, value, MAX_CONTINUAL_IO_ERR);
ret = true;
} else {
/* DBG_871X("[dvobj:%p] continual_io_error:%d\n", dvobj, value); */
/* DBG_88E("[dvobj:%p] continual_io_error:%d\n", dvobj, value); */
}
return ret;
}
@ -360,7 +360,7 @@ u8 dbg_rtw_read8(struct adapter *adapter, u32 addr, const char *caller, const in
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;
}
@ -370,7 +370,7 @@ u16 dbg_rtw_read16(struct adapter *adapter, u32 addr, const char *caller, const
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;
}
@ -380,7 +380,7 @@ u32 dbg_rtw_read32(struct adapter *adapter, u32 addr, const char *caller, const
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;
}
@ -388,28 +388,28 @@ u32 dbg_rtw_read32(struct adapter *adapter, u32 addr, const char *caller, const
int dbg_rtw_write8(struct 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(struct 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(struct 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(struct 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);
}

22
core/rtw_ioctl_set.c
View file

@ -185,7 +185,7 @@ u8 rtw_do_join(struct adapter * padapter)
|| rtw_to_roaming(padapter) > 0
)
{
/* DBG_871X("rtw_do_join() when no desired bss in scanning queue\n"); */
/* DBG_88E("rtw_do_join() when no desired bss in scanning queue\n"); */
if ( _SUCCESS!=(ret =rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0)) ) {
pmlmepriv->to_join = false;
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("do_join(): site survey return error\n."));
@ -219,7 +219,7 @@ u8 rtw_set_802_11_bssid(struct adapter* padapter, u8 *bssid)
;
DBG_871X_LEVEL(_drv_always_, "set bssid:%pM\n", bssid);
DBG_88E_LEVEL(_drv_always_, "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))
@ -230,7 +230,7 @@ u8 rtw_set_802_11_bssid(struct adapter* padapter, u8 *bssid)
spin_lock_bh(&pmlmepriv->lock);
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) {
@ -303,7 +303,7 @@ u8 rtw_set_802_11_ssid(struct adapter* padapter, struct ndis_802_11_ssid *ssid)
;
DBG_871X_LEVEL(_drv_always_, "set ssid [%s] fw_state =0x%08x\n",
DBG_88E_LEVEL(_drv_always_, "set ssid [%s] fw_state =0x%08x\n",
ssid->Ssid, get_fwstate(pmlmepriv));
if (padapter->hw_init_completed ==false) {
@ -315,7 +315,7 @@ u8 rtw_set_802_11_ssid(struct adapter* padapter, struct ndis_802_11_ssid *ssid)
spin_lock_bh(&pmlmepriv->lock);
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) {
@ -426,7 +426,7 @@ u8 rtw_set_802_11_connect(struct adapter* padapter, u8 *bssid, struct ndis_802_1
bssid_valid = false;
if (ssid_valid == false && bssid_valid == false) {
DBG_871X(FUNC_ADPT_FMT" ssid:%p, ssid_valid:%d, bssid:%p, bssid_valid:%d\n",
DBG_88E(FUNC_ADPT_FMT" ssid:%p, ssid_valid:%d, bssid:%p, bssid_valid:%d\n",
FUNC_ADPT_ARG(padapter), ssid, ssid_valid, bssid, bssid_valid);
status = _FAIL;
goto exit;
@ -441,7 +441,7 @@ u8 rtw_set_802_11_connect(struct adapter* padapter, u8 *bssid, struct ndis_802_1
spin_lock_bh(&pmlmepriv->lock);
DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" fw_state =0x%08x\n",
DBG_88E_LEVEL(_drv_always_, FUNC_ADPT_FMT" fw_state =0x%08x\n",
FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv));
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
@ -500,7 +500,7 @@ u8 rtw_set_802_11_infrastructure_mode(struct adapter* padapter,
spin_lock_bh(&pmlmepriv->lock);
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) {
/* change to other mode from Ndis802_11APMode */
@ -619,7 +619,7 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter* padapter, struct ndis_802_11_s
}
} 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;
}
@ -1286,7 +1286,7 @@ int rtw_set_country(struct 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 */
@ -1301,7 +1301,7 @@ int rtw_set_country(struct adapter *adapter, const char *country_code)
else if (0 == strcmp(country_code, "IN"))
channel_plan = RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN;
else
DBG_871X("%s unknown country_code:%s\n", __FUNCTION__, country_code);
DBG_88E("%s unknown country_code:%s\n", __FUNCTION__, country_code);
return rtw_set_channel_plan(adapter, channel_plan);
}

20
core/rtw_iol.c
View file

@ -29,13 +29,13 @@ struct xmit_frame *rtw_IOL_accquire_xmit_frame(struct adapter *adapter)
if ((xmit_frame = rtw_alloc_xmitframe(pxmitpriv)) == NULL)
{
DBG_871X("%s rtw_alloc_xmitframe return null\n", __FUNCTION__);
DBG_88E("%s rtw_alloc_xmitframe return null\n", __FUNCTION__);
goto exit;
}
if ((xmitbuf = rtw_alloc_xmitbuf(pxmitpriv)) == NULL)
{
DBG_871X("%s rtw_alloc_xmitbuf return null\n", __FUNCTION__);
DBG_88E("%s rtw_alloc_xmitbuf return null\n", __FUNCTION__);
rtw_free_xmitframe(pxmitpriv, xmit_frame);
xmit_frame = NULL;
goto exit;
@ -67,7 +67,7 @@ int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len
/* check if the io_buf can accommodate new cmds */
if (ori_len + cmd_len + 8 > MAX_XMITBUF_SZ) {
DBG_871X("%s %u is large than MAX_XMITBUF_SZ:%u, can't accommodate new cmds\n", __FUNCTION__
DBG_88E("%s %u is large than MAX_XMITBUF_SZ:%u, can't accommodate new cmds\n", __FUNCTION__
, ori_len + cmd_len + 8, MAX_XMITBUF_SZ);
return _FAIL;
}
@ -76,7 +76,7 @@ int rtw_IOL_append_cmds(struct xmit_frame *xmit_frame, u8 *IOL_cmds, u32 cmd_len
pattrib->pktlen += cmd_len;
pattrib->last_txcmdsz += cmd_len;
/* DBG_871X("%s ori:%u + cmd_len:%u = %u\n", __FUNCTION__, ori_len, cmd_len, buf_offset+pattrib->pktlen); */
/* DBG_88E("%s ori:%u + cmd_len:%u = %u\n", __FUNCTION__, ori_len, cmd_len, buf_offset+pattrib->pktlen); */
return _SUCCESS;
}
@ -115,7 +115,7 @@ int _rtw_IOL_append_WB_cmd(struct xmit_frame *xmit_frame, u16 addr, u8 value, u8
cmd.mask = cpu_to_le32(mask);
}
/* DBG_871X("%s addr:0x%04x, value:0x%08x, mask:0x%08x\n", __FUNCTION__, addr, value, mask); */
/* DBG_88E("%s addr:0x%04x, value:0x%08x, mask:0x%08x\n", __FUNCTION__, addr, value, mask); */
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, cmd.length);
@ -136,7 +136,7 @@ int _rtw_IOL_append_WW_cmd(struct xmit_frame *xmit_frame, u16 addr, u16 value, u
cmd.mask = cpu_to_le32(mask);
}
/* DBG_871X("%s addr:0x%04x, value:0x%08x, mask:0x%08x\n", __FUNCTION__, addr, value, mask); */
/* DBG_88E("%s addr:0x%04x, value:0x%08x, mask:0x%08x\n", __FUNCTION__, addr, value, mask); */
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, cmd.length);
@ -157,7 +157,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);
@ -179,7 +179,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);
@ -191,7 +191,7 @@ int rtw_IOL_append_DELAY_US_cmd(struct xmit_frame *xmit_frame, u16 us)
/* RTW_PUT_LE16((u8*)&cmd.address, us); */
cmd.address = cpu_to_le16(us);
/* DBG_871X("%s %u\n", __FUNCTION__, us); */
/* DBG_88E("%s %u\n", __FUNCTION__, us); */
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 4);
}
@ -202,7 +202,7 @@ int rtw_IOL_append_DELAY_MS_cmd(struct xmit_frame *xmit_frame, u16 ms)
/* RTW_PUT_LE16((u8*)&cmd.address, ms); */
cmd.address = cpu_to_le16(ms);
/* DBG_871X("%s %u\n", __FUNCTION__, ms); */
/* DBG_88E("%s %u\n", __FUNCTION__, ms); */
return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 4);
}
int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame)

8
core/rtw_led.c
View file

@ -30,11 +30,11 @@ void BlinkTimerCallback(void *data)
PLED_871x pLed = (PLED_871x)data;
struct adapter *padapter = pLed->padapter;
/* DBG_871X("%s\n", __FUNCTION__); */
/* DBG_88E("%s\n", __FUNCTION__); */
if ( (padapter->bSurpriseRemoved == true) || ( padapter->bDriverStopped == true))
{
/* DBG_871X("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __FUNCTION__, padapter->bSurpriseRemoved, padapter->bDriverStopped); */
/* DBG_88E("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __FUNCTION__, padapter->bSurpriseRemoved, padapter->bDriverStopped); */
return;
}
@ -2186,11 +2186,11 @@ void BlinkHandler(PLED_871x pLed)
struct adapter *padapter = pLed->padapter;
struct led_priv *ledpriv = &(padapter->ledpriv);
/* DBG_871X("%s (%s:%d)\n", __FUNCTION__, current->comm, current->pid); */
/* DBG_88E("%s (%s:%d)\n", __FUNCTION__, current->comm, current->pid); */
if ( (padapter->bSurpriseRemoved == true) || ( padapter->bDriverStopped == true))
{
/* DBG_871X("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __FUNCTION__, padapter->bSurpriseRemoved, padapter->bDriverStopped); */
/* DBG_88E("%s bSurpriseRemoved:%d, bDriverStopped:%d\n", __FUNCTION__, padapter->bSurpriseRemoved, padapter->bDriverStopped); */
return;
}

78
core/rtw_mlme.c
View file

@ -266,7 +266,7 @@ void _rtw_free_network(struct mlme_priv *pmlmepriv , struct wlan_network *pnetwo
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); */
spin_unlock_bh(&free_queue->lock);
@ -622,7 +622,7 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,
#if defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) && 1
if (strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) {
DBG_871X(FUNC_ADPT_FMT" %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(FUNC_ADPT_FMT" %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_ADPT_ARG(padapter)
, src->Ssid.Ssid, MAC_ARG(src->MacAddress), src->Configuration.DSConfig
, ss_ori, sq_ori, rssi_ori
@ -668,7 +668,7 @@ void update_network(struct wlan_bssid_ex *dst, struct wlan_bssid_ex *src,
#if defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) && 1
if (strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) {
DBG_871X(FUNC_ADPT_FMT" %s("MAC_FMT"), SignalStrength:%u, SignalQuality:%u, RawRSSI:%ld\n"
DBG_88E(FUNC_ADPT_FMT" %s("MAC_FMT"), SignalStrength:%u, SignalQuality:%u, RawRSSI:%ld\n"
, FUNC_ADPT_ARG(padapter)
, dst->Ssid.Ssid, MAC_ARG(dst->MacAddress), dst->PhyInfo.SignalStrength, dst->PhyInfo.SignalQuality, dst->Rssi);
}
@ -894,7 +894,7 @@ int rtw_is_desired_network(struct adapter *adapter, struct wlan_network *pnetwor
}
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;
}
@ -1081,7 +1081,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
}
else
{
DBG_871X("try_to_join, but select scanning queue fail, to_roaming:%d\n", rtw_to_roaming(adapter));
DBG_88E("try_to_join, but select scanning queue fail, to_roaming:%d\n", rtw_to_roaming(adapter));
if (rtw_to_roaming(adapter) != 0) {
if ( --pmlmepriv->to_roaming == 0
|| _SUCCESS != rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid, 1, NULL, 0)
@ -1210,7 +1210,7 @@ void rtw_free_assoc_resources(struct adapter *adapter, int lock_scanned_queue)
u8 *pcap = NULL;
u32 capability_len =0;
/* DBG_871X("free disconnecting network\n"); */
/* DBG_88E("free disconnecting network\n"); */
/* rtw_free_network_nolock(pmlmepriv, pwlan); */
if ((p2p_ie =rtw_get_p2p_ie(pwlan->network.IEs+_FIXED_IE_LENGTH_, pwlan->network.IELength-_FIXED_IE_LENGTH_, NULL, &p2p_ielen)))
@ -1299,7 +1299,7 @@ void rtw_indicate_disconnect( struct adapter *padapter )
_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__); */
if (rtw_to_roaming(padapter) > 0)
_clr_fwstate_(pmlmepriv, _FW_LINKED);
@ -1348,13 +1348,13 @@ void rtw_scan_abort(struct 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));
rtw_indicate_scan_done(adapter, true);
}
pmlmeext->scan_abort = false;
@ -1374,7 +1374,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str
if (psta) /* update ptarget_sta */
{
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
psta->aid = pnetwork->join_res;
psta->mac_id =0;
@ -1423,7 +1423,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str
preorder_ctrl->enable = false;
preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__,
preorder_ctrl->indicate_seq);
#endif
preorder_ctrl->wend_b = 0xffff;
@ -1440,7 +1440,7 @@ static struct sta_info *rtw_joinbss_update_stainfo(struct adapter *padapter, str
preorder_ctrl->enable = false;
preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d indicate_seq:%u\n", __FUNCTION__, __LINE__,
preorder_ctrl->indicate_seq);
#endif
preorder_ctrl->wend_b = 0xffff;
@ -1464,7 +1464,7 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct wlan_network *cur_network = &(pmlmepriv->cur_network);
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("\nfw_state:%x, BSSID:"MAC_FMT"\n"
, get_fwstate(pmlmepriv), MAC_ARG(pnetwork->network.MacAddress)));
@ -1483,7 +1483,7 @@ static void rtw_joinbss_update_network(struct adapter *padapter, struct wlan_net
/* 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(FUNC_ADPT_FMT" signal_strength:%3u, rssi:%3d, signal_qual:%3u"
DBG_88E(FUNC_ADPT_FMT" signal_strength:%3u, rssi:%3d, signal_qual:%3u"
"\n"
, FUNC_ADPT_ARG(padapter)
, padapter->recvpriv.signal_strength
@ -1768,7 +1768,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
ap_sta_info_defer_update(adapter, psta);
/* report to upper layer */
DBG_871X("indicate_sta_assoc_event to upper layer - hostapd\n");
DBG_88E("indicate_sta_assoc_event to upper layer - hostapd\n");
spin_lock_bh(&psta->lock);
if (psta->passoc_req && psta->assoc_req_len>0)
{
@ -1818,7 +1818,7 @@ void rtw_stassoc_event_callback(struct adapter *adapter, u8 *pbuf)
psta->qos_option = 0;
psta->mac_id = (uint)pstassoc->cam_id;
/* psta->aid = (uint)pstassoc->cam_id; */
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
/* for ad-hoc mode */
rtw_hal_set_odm_var(adapter, HAL_ODM_STA_INFO, psta, true);
@ -1876,7 +1876,7 @@ void rtw_stadel_event_callback(struct adapter *adapter, u8 *pbuf)
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;
@ -1990,7 +1990,7 @@ void _rtw_join_timeout_handler (struct adapter *adapter)
int do_join_r;
;
DBG_871X("%s, fw_state =%x\n", __FUNCTION__, get_fwstate(pmlmepriv));
DBG_88E("%s, fw_state =%x\n", __FUNCTION__, get_fwstate(pmlmepriv));
if (adapter->bDriverStopped ||adapter->bSurpriseRemoved)
return;
@ -2001,14 +2001,14 @@ void _rtw_join_timeout_handler (struct adapter *adapter)
while (1) {
pmlmepriv->to_roaming--;
if (rtw_to_roaming(adapter) != 0) { /* try another */
DBG_871X("%s try another roaming\n", __FUNCTION__);
DBG_88E("%s try another roaming\n", __FUNCTION__);
if ( _SUCCESS!=(do_join_r =rtw_do_join(adapter)) ) {
DBG_871X("%s roaming do_join return %d\n", __FUNCTION__ , do_join_r);
DBG_88E("%s roaming do_join return %d\n", __FUNCTION__ , do_join_r);
continue;
}
break;
} else {
DBG_871X("%s We've try roaming but fail\n", __FUNCTION__);
DBG_88E("%s We've try roaming but fail\n", __FUNCTION__);
rtw_indicate_disconnect(adapter);
break;
}
@ -2040,7 +2040,7 @@ void rtw_scan_timeout_handler (struct adapter *adapter)
unsigned long 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));
spin_lock_bh(&pmlmepriv->lock);
@ -2063,7 +2063,7 @@ static void rtw_auto_scan_handler(struct adapter *padapter)
pmlmepriv->scan_interval--;
if (pmlmepriv->scan_interval == 0)
{
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
rtw_set_802_11_bssid_list_scan(padapter, NULL, 0);
@ -2218,7 +2218,7 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv
}
if (updated) {
DBG_871X("[by_bssid:%u][assoc_ssid:%s]"
DBG_88E("[by_bssid:%u][assoc_ssid:%s]"
"[to_roaming:%u] "
"new candidate: %s("MAC_FMT") rssi:%d\n",
pmlmepriv->assoc_by_bssid,
@ -2279,18 +2279,18 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
}
if (candidate == NULL) {
DBG_871X("%s: return _FAIL(candidate == NULL)\n", __FUNCTION__);
DBG_88E("%s: return _FAIL(candidate == NULL)\n", __FUNCTION__);
ret = _FAIL;
goto exit;
} else {
DBG_871X("%s: candidate: %s("MAC_FMT", ch:%u)\n", __FUNCTION__,
DBG_88E("%s: candidate: %s("MAC_FMT", ch:%u)\n", __FUNCTION__,
candidate->network.Ssid.Ssid, MAC_ARG(candidate->network.MacAddress),
candidate->network.Configuration.DSConfig);
}
/* check for situation of _FW_LINKED */
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
DBG_871X("%s: _FW_LINKED while ask_for_joinbss!!!\n", __FUNCTION__);
DBG_88E("%s: _FW_LINKED while ask_for_joinbss!!!\n", __FUNCTION__);
rtw_disassoc_cmd(adapter, 0, true);
rtw_indicate_disconnect(adapter);
@ -2302,7 +2302,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
{
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"
);
@ -2395,7 +2395,7 @@ sint rtw_set_key(struct adapter * adapter, struct security_priv *psecuritypriv,
if (is_wep_enc(psetkeyparm->algorithm))
psecuritypriv->key_mask |= BIT(psetkeyparm->keyid);
DBG_871X("==> rtw_set_key algorithm(%x), keyid(%x), key_mask(%x)\n", psetkeyparm->algorithm, psetkeyparm->keyid, psecuritypriv->key_mask);
DBG_88E("==> rtw_set_key algorithm(%x), keyid(%x), key_mask(%x)\n", psetkeyparm->algorithm, psetkeyparm->keyid, psecuritypriv->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) {
@ -2839,7 +2839,7 @@ void rtw_update_ht_cap(struct 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))
@ -2867,7 +2867,7 @@ void rtw_update_ht_cap(struct 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;
}
@ -2920,7 +2920,7 @@ void rtw_update_ht_cap(struct adapter *padapter, u8 *pie, uint ie_len)
/* */
pmlmeinfo->SM_PS = (le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) & 0x0C) >> 2;
if (pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC) {
DBG_871X("%s(): WLAN_HT_CAP_SM_PS_STATIC\n", __FUNCTION__);
DBG_88E("%s(): WLAN_HT_CAP_SM_PS_STATIC\n", __FUNCTION__);
}
/* */
@ -2948,19 +2948,19 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr
psta = pattrib->psta;
else
{
DBG_871X("%s, call rtw_get_stainfo()\n", __func__);
DBG_88E("%s, call rtw_get_stainfo()\n", __func__);
psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra);
}
if (psta == NULL)
{
DBG_871X("%s, psta ==NUL\n", __func__);
DBG_88E("%s, psta ==NUL\n", __func__);
return;
}
if (!(psta->state &_FW_LINKED))
{
DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state);
DBG_88E("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state);
return;
}
@ -2973,7 +2973,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr
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);
}
@ -3015,7 +3015,7 @@ void _rtw_roaming(struct adapter *padapter, struct wlan_network *tgt_network)
pnetwork = &pmlmepriv->cur_network;
if (0 < rtw_to_roaming(padapter)) {
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);
memcpy(&pmlmepriv->assoc_ssid, &pnetwork->network.Ssid, sizeof(struct ndis_802_11_ssid));
@ -3026,13 +3026,13 @@ void _rtw_roaming(struct 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< rtw_to_roaming(padapter)) {
continue;
} else {
DBG_871X("%s(%d) -to roaming fail, indicate_disconnect\n", __FUNCTION__, __LINE__);
DBG_88E("%s(%d) -to roaming fail, indicate_disconnect\n", __FUNCTION__, __LINE__);
rtw_indicate_disconnect(padapter);
break;
}

360
core/rtw_mlme_ext.c
View file

File diff suppressed because it is too large Load diff

6
core/rtw_odm.c
View file

@ -125,7 +125,7 @@ void rtw_odm_dbg_comp_msg(struct adapter *adapter)
char buf[768] = {0};
_rtw_odm_dbg_comp_msg(adapter, buf, 768);
DBG_871X_LEVEL(_drv_always_, "\n%s", buf);
DBG_88E_LEVEL(_drv_always_, "\n%s", buf);
}
inline void rtw_odm_dbg_comp_set(struct adapter *adapter, u64 comps)
@ -156,7 +156,7 @@ void rtw_odm_dbg_level_msg(struct adapter *adapter)
char buf[100] = {0};
_rtw_odm_dbg_comp_msg(adapter, buf, 100);
DBG_871X_LEVEL(_drv_always_, "\n%s", buf);
DBG_88E_LEVEL(_drv_always_, "\n%s", buf);
}
inline void rtw_odm_dbg_level_set(struct adapter *adapter, u32 level)
@ -187,7 +187,7 @@ void rtw_odm_adaptivity_parm_msg(struct adapter *adapter)
char buf[256] = {0};
_rtw_odm_dbg_comp_msg(adapter, buf, 256);
DBG_871X_LEVEL(_drv_always_, "\n%s", buf);
DBG_88E_LEVEL(_drv_always_, "\n%s", buf);
}
void rtw_odm_adaptivity_parm_set(struct adapter *adapter, s8 TH_L2H_ini, s8 TH_EDCCA_HL_diff,

116
core/rtw_p2p.c
View file

@ -56,7 +56,7 @@ static u32 go_add_group_info_attr(struct wifidirect_info *pwdinfo, u8 *pbuf)
struct adapter *padapter = pwdinfo->padapter;
struct sta_priv *pstapriv = &padapter->stapriv;
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
pdata_attr = rtw_zmalloc(MAX_P2P_IE_LEN);
@ -158,7 +158,7 @@ static void issue_group_disc_req(struct wifidirect_info *pwdinfo, u8 *da)
u8 oui_subtype = P2P_GO_DISC_REQUEST;
u8 dialogToken =0;
DBG_871X("[%s]\n", __FUNCTION__);
DBG_88E("[%s]\n", __FUNCTION__);
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
{
@ -219,7 +219,7 @@ static void issue_p2p_devdisc_resp(struct wifidirect_info *pwdinfo, u8 *da, u8 s
u8 p2pie[8] = { 0x00 };
u32 p2pielen = 0;
DBG_871X("[%s]\n", __FUNCTION__);
DBG_88E("[%s]\n", __FUNCTION__);
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
{
@ -387,7 +387,7 @@ static void issue_p2p_presence_resp(struct wifidirect_info *pwdinfo, u8 *da, u8
u8 noa_attr_content[32] = { 0x00 };
u32 p2pielen = 0;
DBG_871X("[%s]\n", __FUNCTION__);
DBG_88E("[%s]\n", __FUNCTION__);
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
{
@ -2461,7 +2461,7 @@ u8 process_p2p_provdisc_req(struct wifidirect_info *pwdinfo, u8 *pframe, uint l
issue_p2p_provision_resp( pwdinfo, GetAddr2Ptr(pframe), frame_body, uconfig_method);
}
}
DBG_871X( "[%s] config method = %s\n", __FUNCTION__, pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req );
DBG_88E( "[%s] config method = %s\n", __FUNCTION__, pwdinfo->rx_prov_disc_info.strconfig_method_desc_of_prov_disc_req );
return true;
}
@ -2576,7 +2576,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
}
else
{
DBG_871X( "[%s] WPS IE not Found!!\n", __FUNCTION__ );
DBG_88E( "[%s] WPS IE not Found!!\n", __FUNCTION__ );
result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
return( result );
@ -2596,7 +2596,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
if ( !p2p_ie )
{
DBG_871X( "[%s] P2P IE not Found!!\n", __FUNCTION__ );
DBG_88E( "[%s] P2P IE not Found!!\n", __FUNCTION__ );
result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
}
@ -2622,7 +2622,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen) )
{
DBG_871X( "[%s] GO Intent = %d, tie = %d\n", __FUNCTION__, attr_content >> 1, attr_content & 0x01 );
DBG_88E( "[%s] GO Intent = %d, tie = %d\n", __FUNCTION__, 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 ) )
@ -2678,7 +2678,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
if ( ch_num_inclusioned == 0)
{
DBG_871X( "[%s] No common channel in channel list!\n", __FUNCTION__ );
DBG_88E( "[%s] No common channel in channel list!\n", __FUNCTION__ );
result = P2P_STATUS_FAIL_NO_COMMON_CH;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
break;
@ -2705,13 +2705,13 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
* Change our operating channel as peer's for compatibility.
*/
pwdinfo->operating_channel = peer_operating_ch;
DBG_871X( "[%s] Change op ch to %02x as peer's\n", __FUNCTION__, pwdinfo->operating_channel);
DBG_88E( "[%s] Change op ch to %02x as peer's\n", __FUNCTION__, pwdinfo->operating_channel);
}
else
{
/* Take first channel of ch_list_inclusioned as operating channel */
pwdinfo->operating_channel = ch_list_inclusioned[0];
DBG_871X( "[%s] Change op ch to %02x\n", __FUNCTION__, pwdinfo->operating_channel);
DBG_88E( "[%s] Change op ch to %02x\n", __FUNCTION__, pwdinfo->operating_channel);
}
}
@ -2731,12 +2731,12 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
u8 attr_content[ 10 ] = { 0x00 };
u32 attr_contentlen = 0;
DBG_871X( "[%s] WFD IE Found!!\n", __FUNCTION__ );
DBG_88E( "[%s] WFD IE Found!!\n", __FUNCTION__ );
rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen);
if ( attr_contentlen )
{
pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 );
DBG_871X( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
DBG_88E( "[%s] Peer PORT NUM = %d\n", __FUNCTION__, pwdinfo->wfd_info->peer_rtsp_ctrlport );
}
}
#endif /* CONFIG_P2P */
@ -2768,7 +2768,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
}
else
{
DBG_871X( "[%s] WPS IE not Found!!\n", __FUNCTION__ );
DBG_88E( "[%s] WPS IE not Found!!\n", __FUNCTION__ );
result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
}
@ -2804,7 +2804,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen);
if ( attr_contentlen == 1 ) {
DBG_871X( "[%s] Status = %d\n", __FUNCTION__, attr_content );
DBG_88E( "[%s] Status = %d\n", __FUNCTION__, attr_content );
if ( attr_content == P2P_STATUS_SUCCESS )
{
/* Do nothing. */
@ -2837,7 +2837,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
attr_contentlen = 0;
if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen) )
{
DBG_871X( "[%s] GO Intent = %d, tie = %d\n", __FUNCTION__, attr_content >> 1, attr_content & 0x01 );
DBG_88E( "[%s] GO Intent = %d, tie = %d\n", __FUNCTION__, 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 ) )
@ -2890,21 +2890,21 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
attr_contentlen = 0;
if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen))
{
DBG_871X( "[%s] Peer's operating channel = %d\n", __FUNCTION__, operatingch_info[4] );
DBG_88E( "[%s] Peer's operating channel = %d\n", __FUNCTION__, operatingch_info[4] );
pwdinfo->peer_operating_ch = operatingch_info[4];
}
/* Try to get the channel list information */
if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, pwdinfo->channel_list_attr, &pwdinfo->channel_list_attr_len ) )
{
DBG_871X( "[%s] channel list attribute found, len = %d\n", __FUNCTION__, pwdinfo->channel_list_attr_len );
DBG_88E( "[%s] channel list attribute found, len = %d\n", __FUNCTION__, pwdinfo->channel_list_attr_len );
peer_ch_num = rtw_p2p_get_peer_ch_list(pwdinfo, pwdinfo->channel_list_attr, pwdinfo->channel_list_attr_len, peer_ch_list);
ch_num_inclusioned = rtw_p2p_ch_inclusion(&padapter->mlmeextpriv, peer_ch_list, peer_ch_num, ch_list_inclusioned);
if ( ch_num_inclusioned == 0)
{
DBG_871X( "[%s] No common channel in channel list!\n", __FUNCTION__ );
DBG_88E( "[%s] No common channel in channel list!\n", __FUNCTION__ );
result = P2P_STATUS_FAIL_NO_COMMON_CH;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
break;
@ -2931,13 +2931,13 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
* Change our operating channel as peer's for compatibility.
*/
pwdinfo->operating_channel = peer_operating_ch;
DBG_871X( "[%s] Change op ch to %02x as peer's\n", __FUNCTION__, pwdinfo->operating_channel);
DBG_88E( "[%s] Change op ch to %02x as peer's\n", __FUNCTION__, pwdinfo->operating_channel);
}
else
{
/* Take first channel of ch_list_inclusioned as operating channel */
pwdinfo->operating_channel = ch_list_inclusioned[0];
DBG_871X( "[%s] Change op ch to %02x\n", __FUNCTION__, pwdinfo->operating_channel);
DBG_88E( "[%s] Change op ch to %02x\n", __FUNCTION__, pwdinfo->operating_channel);
}
}
@ -2947,7 +2947,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
}
else
{
DBG_871X( "[%s] channel list attribute not found!\n", __FUNCTION__);
DBG_88E( "[%s] channel list attribute not found!\n", __FUNCTION__);
}
/* Try to get the group id information if peer is GO */
@ -3008,7 +3008,7 @@ u8 process_p2p_group_negotation_confirm( struct wifidirect_info *pwdinfo, u8 *pf
rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen);
if ( attr_contentlen == 1 )
{
DBG_871X( "[%s] Status = %d\n", __FUNCTION__, attr_content );
DBG_88E( "[%s] Status = %d\n", __FUNCTION__, attr_content );
result = attr_content;
if ( attr_content == P2P_STATUS_SUCCESS )
@ -3053,7 +3053,7 @@ u8 process_p2p_group_negotation_confirm( struct wifidirect_info *pwdinfo, u8 *pf
memset( groupid, 0x00, 38 );
if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen) )
{
DBG_871X( "[%s] Ssid = %s, ssidlen = %zu\n", __FUNCTION__, &groupid[ETH_ALEN], strlen(&groupid[ETH_ALEN]) );
DBG_88E( "[%s] Ssid = %s, ssidlen = %zu\n", __FUNCTION__, &groupid[ETH_ALEN], strlen(&groupid[ETH_ALEN]) );
memcpy( pwdinfo->groupid_info.go_device_addr, &groupid[0], ETH_ALEN );
memcpy( pwdinfo->groupid_info.ssid, &groupid[6], attr_contentlen - ETH_ALEN );
}
@ -3061,7 +3061,7 @@ u8 process_p2p_group_negotation_confirm( struct wifidirect_info *pwdinfo, u8 *pf
attr_contentlen = 0;
if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen) )
{
DBG_871X( "[%s] Peer's operating channel = %d\n", __FUNCTION__, operatingch_info[4] );
DBG_88E( "[%s] Peer's operating channel = %d\n", __FUNCTION__, operatingch_info[4] );
pwdinfo->peer_operating_ch = operatingch_info[4];
}
@ -3189,12 +3189,12 @@ static void ro_ch_handler(struct adapter *padapter)
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");
rtw_cfg80211_remain_on_channel_expired(padapter,
pcfg80211_wdinfo->remain_on_ch_cookie,
@ -3379,7 +3379,7 @@ void rtw_append_wfd_ie(struct 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
@ -3405,7 +3405,7 @@ void rtw_append_wfd_ie(struct 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); */
}
@ -3504,7 +3504,7 @@ int rtw_p2p_check_frames(struct 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
@ -3547,7 +3547,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
nego_info->state = 0;
dump_p2p_attr_ch_list(p2p_ie, p2p_ielen, ch_list_buf, 128);
DBG_871X("RTW_%s:P2P_GO_NEGO_REQ, dialogToken =%d, intent:%u%s, listen_ch:%d, op_ch:%d, ch_list:%s\n",
DBG_88E("RTW_%s:P2P_GO_NEGO_REQ, dialogToken =%d, intent:%u%s, listen_ch:%d, op_ch:%d, ch_list:%s\n",
(tx ==true)?"Tx":"Rx", dialogToken, (intent>>1), intent&0x1 ? "+" : "-", listen_ch, op_ch, ch_list_buf);
break;
}
@ -3574,7 +3574,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
}
dump_p2p_attr_ch_list(p2p_ie, p2p_ielen, ch_list_buf, 128);
DBG_871X("RTW_%s:P2P_GO_NEGO_RESP, dialogToken =%d, intent:%u%s, status:%d, op_ch:%d, ch_list:%s\n",
DBG_88E("RTW_%s:P2P_GO_NEGO_RESP, dialogToken =%d, intent:%u%s, status:%d, op_ch:%d, ch_list:%s\n",
(tx ==true)?"Tx":"Rx", dialogToken, (intent>>1), intent&0x1 ? "+" : "-", status, op_ch, ch_list_buf);
if (!tx) {
@ -3609,7 +3609,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
}
dump_p2p_attr_ch_list(p2p_ie, p2p_ielen, ch_list_buf, 128);
DBG_871X("RTW_%s:P2P_GO_NEGO_CONF, dialogToken =%d, status:%d, op_ch:%d, ch_list:%s\n",
DBG_88E("RTW_%s:P2P_GO_NEGO_CONF, dialogToken =%d, status:%d, op_ch:%d, ch_list:%s\n",
(tx ==true)?"Tx":"Rx", dialogToken, status, op_ch, ch_list_buf);
break;
}
@ -3634,7 +3634,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
invit_info->state = 0;
dump_p2p_attr_ch_list(p2p_ie, p2p_ielen, ch_list_buf, 128);
DBG_871X("RTW_%s:P2P_INVIT_REQ, dialogToken =%d, flags:0x%02x, op_ch:%d, ch_list:%s\n",
DBG_88E("RTW_%s:P2P_INVIT_REQ, dialogToken =%d, flags:0x%02x, op_ch:%d, ch_list:%s\n",
(tx ==true)?"Tx":"Rx", dialogToken, flags, op_ch, ch_list_buf);
break;
@ -3648,7 +3648,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
#ifdef CONFIG_P2P_INVITE_IOT
if (tx && *cont ==7)
{
DBG_871X("TX_P2P_INVITE_RESP, status is no common channel, change to unknown group\n");
DBG_88E("TX_P2P_INVITE_RESP, status is no common channel, change to unknown group\n");
*cont = 8; /* unknow group status */
}
#endif /* CONFIG_P2P_INVITE_IOT */
@ -3667,7 +3667,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
}
dump_p2p_attr_ch_list(p2p_ie, p2p_ielen, ch_list_buf, 128);
DBG_871X("RTW_%s:P2P_INVIT_RESP, dialogToken =%d, status:%d, op_ch:%d, ch_list:%s\n",
DBG_88E("RTW_%s:P2P_INVIT_RESP, dialogToken =%d, status:%d, op_ch:%d, ch_list:%s\n",
(tx ==true)?"Tx":"Rx", dialogToken, status, op_ch, ch_list_buf);
if (!tx) {
@ -3676,11 +3676,11 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
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:
{
@ -3689,7 +3689,7 @@ int rtw_p2p_check_frames(struct 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) */
{
@ -3705,7 +3705,7 @@ int rtw_p2p_check_frames(struct 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. */
}
@ -3715,10 +3715,10 @@ int rtw_p2p_check_frames(struct 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;
}
@ -3731,7 +3731,7 @@ int rtw_p2p_check_frames(struct 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
@ -3740,26 +3740,26 @@ int rtw_p2p_check_frames(struct 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);
}
return is_p2p_frame;
@ -3949,7 +3949,7 @@ void p2p_ps_wk_hdl(struct adapter *padapter, u8 p2p_ps_state)
if (pwrpriv->smart_ps != 0)
{
pwrpriv->smart_ps = 0;
DBG_871X("%s(): Enter CTW, change SmartPS\n", __FUNCTION__);
DBG_88E("%s(): Enter CTW, change SmartPS\n", __FUNCTION__);
rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&(pwrpriv->pwr_mode)));
}
}
@ -4022,7 +4022,7 @@ static void reset_ch_sitesurvey_timer_process (void *FunctionContext)
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
return;
DBG_871X( "[%s] In\n", __FUNCTION__ );
DBG_88E( "[%s] In\n", __FUNCTION__ );
/* Reset the operation channel information */
pwdinfo->rx_invitereq_info.operation_ch[0] = 0;
#ifdef CONFIG_P2P
@ -4041,7 +4041,7 @@ static void reset_ch_sitesurvey_timer_process2 (void *FunctionContext)
if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
return;
DBG_871X( "[%s] In\n", __FUNCTION__ );
DBG_88E( "[%s] In\n", __FUNCTION__ );
/* Reset the operation channel information */
pwdinfo->p2p_info.operation_ch[0] = 0;
#ifdef CONFIG_P2P
@ -4385,11 +4385,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
, rtw_p2p_state_txt(old_state), rtw_p2p_state_txt(_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
, rtw_p2p_state_txt(_rtw_p2p_state(wdinfo))
);
}
@ -4399,11 +4399,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
, rtw_p2p_state_txt(old_state), rtw_p2p_state_txt(_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
, rtw_p2p_state_txt(_rtw_p2p_pre_state(wdinfo))
);
}
@ -4414,11 +4414,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
, rtw_p2p_role_txt(old_role), rtw_p2p_role_txt(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
, rtw_p2p_role_txt(wdinfo->role)
);
}

88
core/rtw_pwrctrl.c
View file

@ -34,7 +34,7 @@ void _ips_enter(struct adapter * padapter)
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
if (padapter->hw_init_completed == false) {
DBG_871X("%s: hw_init_completed: %d\n",
DBG_88E("%s: hw_init_completed: %d\n",
__func__, padapter->hw_init_completed);
return;
}
@ -45,14 +45,14 @@ void _ips_enter(struct 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_always_, "nolinked power save enter\n");
if (pwrpriv->ips_mode == IPS_LEVEL_2)
pwrpriv->bkeepfwalive = true;
@ -83,14 +83,14 @@ int _ips_leave(struct 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_always_, "nolinked power save leave\n");
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;
@ -130,7 +130,7 @@ static bool rtw_pwr_unassociated_idle(struct adapter *adapter)
bool ret = false;
if (adapter_to_pwrctl(adapter)->ips_deny_time >= jiffies) {
/* DBG_871X("%s ips_deny_time\n", __func__); */
/* DBG_88E("%s ips_deny_time\n", __func__); */
goto exit;
}
@ -182,8 +182,8 @@ static bool rtw_pwr_unassociated_idle(struct adapter *adapter)
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_always_, "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);
goto exit;
}
@ -208,7 +208,7 @@ void rtw_ps_processor(struct 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 (pwrpriv->bHWPwrPindetect)
{
#ifdef CONFIG_AUTOSUSPEND
@ -220,7 +220,7 @@ void rtw_ps_processor(struct adapter*padapter)
pwrpriv->ps_flag = true;
rfpwrstate = RfOnOffDetect(padapter);
DBG_871X("@@@@- #1 %s ==> rfstate:%s\n", __FUNCTION__, (rfpwrstate ==rf_on)?"rf_on":"rf_off");
DBG_88E("@@@@- #1 %s ==> rfstate:%s\n", __FUNCTION__, (rfpwrstate ==rf_on)?"rf_on":"rf_off");
if (rfpwrstate!= pwrpriv->rf_pwrstate)
{
if (rfpwrstate == rf_off)
@ -239,7 +239,7 @@ void rtw_ps_processor(struct adapter*padapter)
#endif /* CONFIG_AUTOSUSPEND */
{
rfpwrstate = RfOnOffDetect(padapter);
DBG_871X("@@@@- #2 %s ==> rfstate:%s\n", __FUNCTION__, (rfpwrstate ==rf_on)?"rf_on":"rf_off");
DBG_88E("@@@@- #2 %s ==> rfstate:%s\n", __FUNCTION__, (rfpwrstate ==rf_on)?"rf_on":"rf_off");
if (rfpwrstate!= pwrpriv->rf_pwrstate)
{
@ -255,7 +255,7 @@ void rtw_ps_processor(struct 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 ++;
@ -269,7 +269,7 @@ void rtw_ps_processor(struct adapter*padapter)
if ((pwrpriv->rf_pwrstate == rf_on) && ((pwrpriv->pwr_state_check_cnts%4) == 0))
{
DBG_871X("==>%s .fw_state(%x)\n", __FUNCTION__, get_fwstate(pmlmepriv));
DBG_88E("==>%s .fw_state(%x)\n", __FUNCTION__, get_fwstate(pmlmepriv));
#if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND)
#else
pwrpriv->change_rfpwrstate = rf_off;
@ -285,11 +285,11 @@ void rtw_ps_processor(struct adapter*padapter)
#if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND)
if (true ==pwrpriv->bInternalAutoSuspend) {
DBG_871X("<==%s .pwrpriv->bInternalAutoSuspend)(%x)\n", __FUNCTION__, pwrpriv->bInternalAutoSuspend);
DBG_88E("<==%s .pwrpriv->bInternalAutoSuspend)(%x)\n", __FUNCTION__, pwrpriv->bInternalAutoSuspend);
} else {
pwrpriv->change_rfpwrstate = rf_off;
padapter->bCardDisableWOHSM = true;
DBG_871X("<==%s .pwrpriv->bInternalAutoSuspend)(%x) call autosuspend_enter\n", __FUNCTION__, pwrpriv->bInternalAutoSuspend);
DBG_88E("<==%s .pwrpriv->bInternalAutoSuspend)(%x) call autosuspend_enter\n", __FUNCTION__, pwrpriv->bInternalAutoSuspend);
autosuspend_enter(padapter);
}
#else
@ -418,7 +418,7 @@ void rtw_set_rpwm(struct adapter *padapter, u8 pslv)
}while (rtw_get_passing_time_ms(cpwm_polling_start_time) < LPS_RPWM_WAIT_MS);
if (pollingRes == _FAIL)
DBG_871X("%s polling cpwm timeout!!!!!!!!!!\n", __FUNCTION__);
DBG_88E("%s polling cpwm timeout!!!!!!!!!!\n", __FUNCTION__);
}
#endif
}
@ -451,7 +451,7 @@ u8 PS_RDY_CHECK(struct adapter * padapter)
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;
}
@ -494,7 +494,7 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a
if (pwdinfo->opp_ps == 0)
#endif /* CONFIG_P2P */
{
DBG_871X("rtw_set_ps_mode: Leave 802.11 power save\n");
DBG_88E("rtw_set_ps_mode: Leave 802.11 power save\n");
pwrpriv->pwr_mode = ps_mode;
rtw_set_rpwm(padapter, PS_STATE_S4);
rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode));
@ -509,7 +509,7 @@ void rtw_set_ps_mode(struct adapter *padapter, u8 ps_mode, u8 smart_ps, u8 bcn_a
#endif
)
{
DBG_871X("%s: Enter 802.11 power save\n", __FUNCTION__);
DBG_88E("%s: Enter 802.11 power save\n", __FUNCTION__);
pwrpriv->bFwCurrentInPSMode = true;
pwrpriv->pwr_mode = ps_mode;
pwrpriv->smart_ps = smart_ps;
@ -549,14 +549,14 @@ s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms)
if (true == padapter->bSurpriseRemoved)
{
err = -2;
DBG_871X("%s: device surprise removed!!\n", __FUNCTION__);
DBG_88E("%s: device surprise removed!!\n", __FUNCTION__);
break;
}
if (rtw_get_passing_time_ms(start_time) > delay_ms)
{
err = -1;
DBG_871X("%s: Wait for FW LPS leave more than %u ms!!!\n", __FUNCTION__, delay_ms);
DBG_88E("%s: Wait for FW LPS leave more than %u ms!!!\n", __FUNCTION__, delay_ms);
break;
}
rtw_usleep_os(100);
@ -585,7 +585,7 @@ void LPS_Enter(struct adapter *padapter)
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, 0x40);
}
@ -630,7 +630,7 @@ void LeaveAllPowerSaveMode(struct adapter *Adapter)
;
/* DBG_871X("%s.....\n", __FUNCTION__); */
/* DBG_88E("%s.....\n", __FUNCTION__); */
if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
{ /* connect */
#ifdef CONFIG_P2P
@ -744,7 +744,7 @@ extern int rtw_resume_process(struct adapter *padapter);
static void rtw_early_suspend(struct early_suspend *h)
{
struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend);
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
rtw_set_do_late_resume(pwrpriv, false);
}
@ -755,7 +755,7 @@ static void rtw_late_resume(struct early_suspend *h)
struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv);
struct adapter *adapter = dvobj->if1;
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
if (pwrpriv->do_late_resume) {
rtw_set_do_late_resume(pwrpriv, false);
rtw_resume_process(adapter);
@ -764,7 +764,7 @@ static void rtw_late_resume(struct early_suspend *h)
void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv)
{
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
/* 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;
@ -775,7 +775,7 @@ void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv)
void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
{
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
rtw_set_do_late_resume(pwrpriv, false);
@ -792,7 +792,7 @@ extern int rtw_resume_process(struct adapter *padapter);
static void rtw_early_suspend(android_early_suspend_t *h)
{
struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend);
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
rtw_set_do_late_resume(pwrpriv, false);
}
@ -803,7 +803,7 @@ static void rtw_late_resume(android_early_suspend_t *h)
struct dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv);
struct adapter *adapter = dvobj->if1;
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
if (pwrpriv->do_late_resume) {
rtw_set_do_late_resume(pwrpriv, false);
rtw_resume_process(adapter);
@ -812,7 +812,7 @@ static void rtw_late_resume(android_early_suspend_t *h)
void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv)
{
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
/* 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;
@ -823,7 +823,7 @@ void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv)
void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
{
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
rtw_set_do_late_resume(pwrpriv, false);
@ -867,26 +867,26 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
pwrpriv->ips_deny_time = jiffies + rtw_ms_to_systime(ips_deffer_ms);
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__);
}
if (rtw_hal_sreset_inprogress(padapter)) {
DBG_871X("%s wait sreset_inprogress...\n", __func__);
DBG_88E("%s wait sreset_inprogress...\n", __func__);
while (rtw_hal_sreset_inprogress(padapter) && rtw_get_passing_time_ms(start) <= 4000)
rtw_msleep_os(10);
if (rtw_hal_sreset_inprogress(padapter))
DBG_871X("%s wait sreset_inprogress timeout\n", __func__);
DBG_88E("%s wait sreset_inprogress timeout\n", __func__);
else
DBG_871X("%s wait sreset_inprogress done\n", __func__);
DBG_88E("%s wait sreset_inprogress done\n", __func__);
}
if (pwrpriv->bInternalAutoSuspend == false && pwrpriv->bInSuspend) {
DBG_871X("%s wait bInSuspend...\n", __func__);
DBG_88E("%s wait bInSuspend...\n", __func__);
while (pwrpriv->bInSuspend
&& ((rtw_get_passing_time_ms(start) <= 3000 && !rtw_is_do_late_resume(pwrpriv))
|| (rtw_get_passing_time_ms(start) <= 500 && rtw_is_do_late_resume(pwrpriv)))
@ -894,9 +894,9 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
rtw_msleep_os(10);
}
if (pwrpriv->bInSuspend)
DBG_871X("%s wait bInSuspend timeout\n", __func__);
DBG_88E("%s wait bInSuspend timeout\n", __func__);
else
DBG_871X("%s wait bInSuspend done\n", __func__);
DBG_88E("%s wait bInSuspend done\n", __func__);
}
/* System suspend is not allowed to wakeup */
@ -920,7 +920,7 @@ int _rtw_pwr_wakeup(struct adapter *padapter, u32 ips_deffer_ms, const char *cal
#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);
@ -1025,12 +1025,12 @@ int rtw_pm_set_ips(struct adapter *padapter, u8 mode)
if ( mode == IPS_NORMAL || mode == IPS_LEVEL_2 ) {
rtw_ips_mode_req(pwrctrlpriv, mode);
DBG_871X("%s %s\n", __FUNCTION__, mode == IPS_NORMAL?"IPS_NORMAL":"IPS_LEVEL_2");
DBG_88E("%s %s\n", __FUNCTION__, mode == IPS_NORMAL?"IPS_NORMAL":"IPS_LEVEL_2");
return 0;
}
else if (mode ==IPS_NONE) {
rtw_ips_mode_req(pwrctrlpriv, mode);
DBG_871X("%s %s\n", __FUNCTION__, "IPS_NONE");
DBG_88E("%s %s\n", __FUNCTION__, "IPS_NONE");
if ((padapter->bSurpriseRemoved == 0)&&(_FAIL == rtw_pwr_wakeup(padapter)) )
return -EFAULT;
}

150
core/rtw_recv.c
View file

@ -304,7 +304,7 @@ u32 rtw_free_uc_swdec_pending_queue(struct adapter *adapter)
}
if (cnt)
DBG_871X(FUNC_ADPT_FMT" dequeue %d\n", FUNC_ADPT_ARG(adapter), cnt);
DBG_88E(FUNC_ADPT_FMT" dequeue %d\n", FUNC_ADPT_ARG(adapter), cnt);
return cnt;
}
@ -403,14 +403,14 @@ sint recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe) {
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;
}
}
@ -472,12 +472,12 @@ sint recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe) {
{
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;
@ -525,7 +525,7 @@ static union recv_frame *decryptor(struct adapter *padapter, union recv_frame *p
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_:
@ -546,7 +546,7 @@ static union recv_frame *decryptor(struct adapter *padapter, union recv_frame *p
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
@ -572,12 +572,12 @@ static union recv_frame *decryptor(struct adapter *padapter, union recv_frame *p
{
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
}
@ -745,7 +745,7 @@ void process_pwrbit_data(struct 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
@ -757,7 +757,7 @@ void process_pwrbit_data(struct 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); */
}
}
@ -1006,7 +1006,7 @@ sint ap2sta_data_frame(
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",
__FUNCTION__, MAC_ARG(pattrib->src), MAC_ARG(myhwaddr));
#endif
ret = _FAIL;
@ -1019,7 +1019,7 @@ sint ap2sta_data_frame(
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;
@ -1034,14 +1034,14 @@ sint ap2sta_data_frame(
(" 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",
__FUNCTION__, 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);
}
@ -1057,7 +1057,7 @@ sint ap2sta_data_frame(
if (*psta == NULL) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("ap2sta: can't get psta under STATION_MODE ; drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s can't get psta under STATION_MODE ; drop pkt\n", __FUNCTION__);
DBG_88E("DBG_RX_DROP_FRAME %s can't get psta under STATION_MODE ; drop pkt\n", __FUNCTION__);
#endif
ret = _FAIL;
goto exit;
@ -1090,7 +1090,7 @@ sint ap2sta_data_frame(
if (*psta == NULL) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("can't get psta under MP_MODE ; drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s can't get psta under WIFI_MP_STATE ; drop pkt\n", __FUNCTION__);
DBG_88E("DBG_RX_DROP_FRAME %s can't get psta under WIFI_MP_STATE ; drop pkt\n", __FUNCTION__);
#endif
ret = _FAIL;
goto exit;
@ -1110,7 +1110,7 @@ sint ap2sta_data_frame(
*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);
}
@ -1118,7 +1118,7 @@ sint ap2sta_data_frame(
ret = _FAIL;
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s fw_state:0x%x\n", __FUNCTION__, get_fwstate(pmlmepriv));
DBG_88E("DBG_RX_DROP_FRAME %s fw_state:0x%x\n", __FUNCTION__, get_fwstate(pmlmepriv));
#endif
}
@ -1161,7 +1161,7 @@ sint sta2ap_data_frame(
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);
@ -1188,7 +1188,7 @@ sint sta2ap_data_frame(
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;
@ -1211,7 +1211,7 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_
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)
{
@ -1268,7 +1268,7 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_
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;
}
@ -1303,7 +1303,7 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_
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); */
rtw_hal_xmitframe_enqueue(padapter, pxmitframe);
@ -1325,19 +1325,19 @@ sint validate_recv_ctrl_frame(struct adapter *padapter, union recv_frame *precv_
/* spin_unlock_bh(&psta->sleep_q.lock); */
spin_unlock_bh(&pxmitpriv->lock);
/* 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;
}
@ -1469,7 +1469,7 @@ sint validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_f
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;
@ -1515,7 +1515,7 @@ sint validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_f
if (ret ==_FAIL) {
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s case:%d, res:%d\n", __FUNCTION__, pattrib->to_fr_ds, ret);
DBG_88E("DBG_RX_DROP_FRAME %s case:%d, res:%d\n", __FUNCTION__, pattrib->to_fr_ds, ret);
#endif
goto exit;
} else if (ret == RTW_RX_HANDLED) {
@ -1525,7 +1525,7 @@ sint validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_f
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;
@ -1568,7 +1568,7 @@ sint validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_f
{
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;
@ -1633,7 +1633,7 @@ static sint validate_80211w_mgmt(struct adapter *adapter, union recv_frame *prec
mgmt_DATA = rtw_zmalloc(data_len);
if (mgmt_DATA == NULL)
{
DBG_871X("%s mgmt allocate fail !!!!!!!!!\n", __FUNCTION__);
DBG_88E("%s mgmt allocate fail !!!!!!!!!\n", __FUNCTION__);
goto validate_80211w_fail;
}
/*/* dump the packet content before decrypt */
@ -1663,7 +1663,7 @@ static sint validate_80211w_mgmt(struct adapter *adapter, union recv_frame *prec
}*/
if (!precv_frame)
{
DBG_871X("%s mgmt descrypt fail !!!!!!!!!\n", __FUNCTION__);
DBG_88E("%s mgmt descrypt fail !!!!!!!!!\n", __FUNCTION__);
goto validate_80211w_fail;
}
}
@ -1675,12 +1675,12 @@ static sint validate_80211w_mgmt(struct adapter *adapter, union recv_frame *prec
BIP_ret = rtw_BIP_verify(adapter, (u8 * )precv_frame);
if (BIP_ret == _FAIL)
{
/* DBG_871X("802.11w BIP verify fail\n"); */
/* DBG_88E("802.11w BIP verify fail\n"); */
goto validate_80211w_fail;
}
else if (BIP_ret == RTW_RX_HANDLED)
{
/* DBG_871X("802.11w recv none protected packet\n"); */
/* DBG_88E("802.11w recv none protected packet\n"); */
/* issue sa query request */
issue_action_SA_Query(adapter, NULL, 0, 0);
goto validate_80211w_fail;
@ -1697,13 +1697,13 @@ static sint validate_80211w_mgmt(struct adapter *adapter, union recv_frame *prec
ptr[WLAN_HDR_A3_LEN] != RTW_WLAN_CATEGORY_SELF_PROTECTED &&
ptr[WLAN_HDR_A3_LEN] != RTW_WLAN_CATEGORY_P2P)
{
DBG_871X("action frame category =%d should robust\n", ptr[WLAN_HDR_A3_LEN]);
DBG_88E("action frame category =%d should robust\n", ptr[WLAN_HDR_A3_LEN]);
goto validate_80211w_fail;
}
}
else if (subtype == WIFI_DEAUTH || subtype == WIFI_DISASSOC)
{
DBG_871X("802.11w recv none protected packet\n");
DBG_88E("802.11w recv none protected packet\n");
/* issue sa query request */
issue_action_SA_Query(adapter, NULL, 0, 0);
goto validate_80211w_fail;
@ -1768,33 +1768,33 @@ sint validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame)
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");
}
}
switch (type)
@ -1837,7 +1837,7 @@ sint validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame)
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;
@ -2180,7 +2180,7 @@ static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe)
#endif /* ENDIAN_FREE */
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;
}
@ -2204,7 +2204,7 @@ static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe)
}
else
{
DBG_871X("rtw_skb_clone() Fail!!! , nr_subframes = %d\n", nr_subframes);
DBG_88E("rtw_skb_clone() Fail!!! , nr_subframes = %d\n", nr_subframes);
break;
}
}
@ -2213,7 +2213,7 @@ static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe)
subframes[nr_subframes++] = sub_skb;
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;
}
@ -2315,7 +2315,7 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_n
{
preorder_ctrl->indicate_seq = seq_num;
#ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d init IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d init IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
preorder_ctrl->indicate_seq, seq_num);
#endif
@ -2331,7 +2331,7 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_n
/* DbgPrint("CheckRxTsIndicateSeq(): Packet Drop! IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); */
#ifdef DBG_RX_DROP_FRAME
DBG_871X("%s IndicateSeq: %d > NewSeq: %d\n", __FUNCTION__,
DBG_88E("%s IndicateSeq: %d > NewSeq: %d\n", __FUNCTION__,
preorder_ctrl->indicate_seq, seq_num);
#endif
@ -2347,7 +2347,7 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_n
{
preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF;
#ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d SN_EQUAL IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d SN_EQUAL IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
preorder_ctrl->indicate_seq, seq_num);
#endif
}
@ -2363,7 +2363,7 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_n
preorder_ctrl->indicate_seq = 0xFFF - (wsize - (seq_num + 1)) + 1;
#ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d SN_LESS(wend, seq_num) IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d SN_LESS(wend, seq_num) IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
preorder_ctrl->indicate_seq, seq_num);
#endif
}
@ -2446,7 +2446,7 @@ int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctr
pattrib = &prframe->u.hdr.attrib;
preorder_ctrl->indicate_seq = pattrib->seq_num;
#ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif
}
@ -2471,7 +2471,7 @@ int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctr
{
preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF;
#ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif
}
@ -2486,7 +2486,7 @@ int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctr
/* DbgPrint("recv_indicatepkts_in_order, indicate_seq =%d, seq_num =%d\n", precvpriv->indicate_seq, pattrib->seq_num); */
if (!pattrib->amsdu)
{
/* DBG_871X("recv_indicatepkts_in_order, amsdu!=1, indicate_seq =%d, seq_num =%d\n", preorder_ctrl->indicate_seq, pattrib->seq_num); */
/* DBG_88E("recv_indicatepkts_in_order, amsdu!=1, indicate_seq =%d, seq_num =%d\n", preorder_ctrl->indicate_seq, pattrib->seq_num); */
if ((padapter->bDriverStopped == false) &&
(padapter->bSurpriseRemoved == false))
@ -2546,7 +2546,7 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
}
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s pattrib->qos !=1\n", __FUNCTION__);
DBG_88E("DBG_RX_DROP_FRAME %s pattrib->qos !=1\n", __FUNCTION__);
#endif
return _FAIL;
@ -2555,7 +2555,7 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
/* indicate this recv_frame */
preorder_ctrl->indicate_seq = pattrib->seq_num;
#ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif
@ -2563,7 +2563,7 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096;
#ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif
@ -2573,7 +2573,7 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
if (preorder_ctrl->enable == false) {
preorder_ctrl->indicate_seq = pattrib->seq_num;
#ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif
@ -2581,13 +2581,13 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096;
#ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d, NewSeq: %d\n", __FUNCTION__, __LINE__,
preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif
if (retval != _SUCCESS) {
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __FUNCTION__);
DBG_88E("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n", __FUNCTION__);
#endif
}
@ -2604,7 +2604,7 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
/* s2. check if winstart_b(indicate_seq) needs to been updated */
if (!check_indicate_seq(preorder_ctrl, pattrib->seq_num)) {
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s check_indicate_seq fail\n", __FUNCTION__);
DBG_88E("DBG_RX_DROP_FRAME %s check_indicate_seq fail\n", __FUNCTION__);
#endif
goto _err_exit;
}
@ -2612,7 +2612,7 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
/* s3. Insert all packet into Reorder Queue to maintain its ordering. */
if (!enqueue_reorder_recvframe(preorder_ctrl, prframe)) {
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s enqueue_reorder_recvframe fail\n", __FUNCTION__);
DBG_88E("DBG_RX_DROP_FRAME %s enqueue_reorder_recvframe fail\n", __FUNCTION__);
#endif
goto _err_exit;
}
@ -2670,7 +2670,7 @@ static int process_recv_indicatepkts(struct adapter *padapter, union recv_frame
if (recv_indicatepkt_reorder(padapter, prframe)!=_SUCCESS)/* including perform A-MPDU Rx Ordering Buffer Control */
{
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s recv_indicatepkt_reorder error!\n", __FUNCTION__);
DBG_88E("DBG_RX_DROP_FRAME %s recv_indicatepkt_reorder error!\n", __FUNCTION__);
#endif
if ((padapter->bDriverStopped == false) &&
@ -2688,7 +2688,7 @@ static int process_recv_indicatepkts(struct adapter *padapter, union recv_frame
{
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("wlanhdr_to_ethhdr: drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __FUNCTION__);
DBG_88E("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n", __FUNCTION__);
#endif
return retval;
}
@ -2750,7 +2750,7 @@ static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prfr
if (prframe == NULL) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("decryptor: drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s decryptor: drop pkt\n", __FUNCTION__);
DBG_88E("DBG_RX_DROP_FRAME %s decryptor: drop pkt\n", __FUNCTION__);
#endif
ret = _FAIL;
goto _recv_data_drop;
@ -2760,7 +2760,7 @@ static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prfr
if (prframe == NULL) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("recvframe_chk_defrag: drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s recvframe_chk_defrag: drop pkt\n", __FUNCTION__);
DBG_88E("DBG_RX_DROP_FRAME %s recvframe_chk_defrag: drop pkt\n", __FUNCTION__);
#endif
goto _recv_data_drop;
}
@ -2769,7 +2769,7 @@ static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prfr
if (prframe == NULL) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("portctrl: drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n", __FUNCTION__);
DBG_88E("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n", __FUNCTION__);
#endif
ret = _FAIL;
goto _recv_data_drop;
@ -2781,7 +2781,7 @@ static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prfr
{
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("recv_func: process_recv_indicatepkts fail!\n"));
#ifdef DBG_RX_DROP_FRAME
DBG_871X("DBG_RX_DROP_FRAME %s process_recv_indicatepkts fail!\n", __FUNCTION__);
DBG_88E("DBG_RX_DROP_FRAME %s process_recv_indicatepkts fail!\n", __FUNCTION__);
#endif
rtw_free_recvframe(orig_prframe, pfree_recv_queue);/* free this recv_frame */
goto _recv_data_drop;
@ -2815,7 +2815,7 @@ int recv_func(struct adapter *padapter, union recv_frame *rframe)
}
if (cnt)
DBG_871X(FUNC_ADPT_FMT" dequeue %d from uc_swdec_pending_queue\n",
DBG_88E(FUNC_ADPT_FMT" dequeue %d from uc_swdec_pending_queue\n",
FUNC_ADPT_ARG(padapter), cnt);
}
@ -2831,7 +2831,7 @@ int recv_func(struct adapter *padapter, union recv_frame *rframe)
!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__); */
if (recvpriv->free_recvframe_cnt < NR_RECVFRAME/4) {
/* to prevent from recvframe starvation, get recvframe from uc_swdec_pending_queue to free_recvframe_cnt */
@ -2953,7 +2953,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(FUNC_ADPT_FMT" signal_strength:%3u, rssi:%3d, signal_qual:%3u"
DBG_88E(FUNC_ADPT_FMT" signal_strength:%3u, rssi:%3d, signal_qual:%3u"
", num_signal_strength:%u, num_signal_qual:%u"
", on_cur_ch_ms:%d"
"\n"

54
core/rtw_security.c
View file

@ -647,7 +647,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
}
else
{
DBG_871X("%s, call rtw_get_stainfo()\n", __func__);
DBG_88E("%s, call rtw_get_stainfo()\n", __func__);
stainfo =rtw_get_stainfo(&padapter->stapriv ,&pattrib->ra[0] );
}
@ -655,7 +655,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
if (!(stainfo->state &_FW_LINKED))
{
DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, stainfo->state);
DBG_88E("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, stainfo->state);
return _FAIL;
}
@ -710,7 +710,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
}
else {
RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_encrypt: stainfo == NULL!!!\n"));
DBG_871X("%s, psta ==NUL\n", __func__);
DBG_88E("%s, psta ==NUL\n", __func__);
res =_FAIL;
}
@ -770,7 +770,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
if (rtw_get_passing_time_ms(start) > 1000) {
if (no_gkey_bc_cnt || no_gkey_mc_cnt) {
DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n",
DBG_88E_LEVEL(_drv_always_, FUNC_ADPT_FMT" no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n",
FUNC_ADPT_ARG(padapter), no_gkey_bc_cnt, no_gkey_mc_cnt);
}
start = jiffies;
@ -781,14 +781,14 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
}
if (no_gkey_bc_cnt || no_gkey_mc_cnt) {
DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" gkey installed. no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n",
DBG_88E_LEVEL(_drv_always_, FUNC_ADPT_FMT" gkey installed. no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n",
FUNC_ADPT_ARG(padapter), no_gkey_bc_cnt, no_gkey_mc_cnt);
}
start = 0;
no_gkey_bc_cnt = 0;
no_gkey_mc_cnt = 0;
/* 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;
@ -1519,13 +1519,13 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
if (pattrib->psta) {
stainfo = pattrib->psta;
} else {
DBG_871X("%s, call rtw_get_stainfo()\n", __func__);
DBG_88E("%s, call rtw_get_stainfo()\n", __func__);
stainfo =rtw_get_stainfo(&padapter->stapriv ,&pattrib->ra[0] );
}
if (stainfo!= NULL) {
if (!(stainfo->state &_FW_LINKED)) {
DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, stainfo->state);
DBG_88E("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, stainfo->state);
return _FAIL;
}
@ -1553,7 +1553,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
}
} else {
RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_aes_encrypt: stainfo == NULL!!!\n"));
DBG_871X("%s, psta ==NUL\n", __func__);
DBG_88E("%s, psta ==NUL\n", __func__);
res =_FAIL;
}
@ -1810,7 +1810,7 @@ static sint aes_decipher(u8 *key, uint hdrlen,
{
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;
}
@ -1854,7 +1854,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
if (rtw_get_passing_time_ms(start) > 1000) {
if (no_gkey_bc_cnt || no_gkey_mc_cnt) {
DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n",
DBG_88E_LEVEL(_drv_always_, FUNC_ADPT_FMT" no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n",
FUNC_ADPT_ARG(padapter), no_gkey_bc_cnt, no_gkey_mc_cnt);
}
start = jiffies;
@ -1866,7 +1866,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
}
if (no_gkey_bc_cnt || no_gkey_mc_cnt) {
DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" gkey installed. no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n",
DBG_88E_LEVEL(_drv_always_, FUNC_ADPT_FMT" gkey installed. no_gkey_bc_cnt:%u, no_gkey_mc_cnt:%u\n",
FUNC_ADPT_ARG(padapter), no_gkey_bc_cnt, no_gkey_mc_cnt);
}
start = 0;
@ -1875,7 +1875,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
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;
@ -1913,7 +1913,7 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)
if (BIP_AAD == NULL)
{
DBG_871X("BIP AAD allocate fail\n");
DBG_88E("BIP AAD allocate fail\n");
return _FAIL;
}
/* PKT start */
@ -1935,7 +1935,7 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)
/* BIP packet number should bigger than previous BIP packet */
if (temp_ipn <= pmlmeext->mgnt_80211w_IPN_rx)
{
DBG_871X("replay BIP packet\n");
DBG_88E("replay BIP packet\n");
goto BIP_exit;
}
/* copy key index */
@ -1943,7 +1943,7 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)
keyid = le16_to_cpu(keyid);
if (keyid != padapter->securitypriv.dot11wBIPKeyid)
{
DBG_871X("BIP key index error!\n");
DBG_88E("BIP key index error!\n");
goto BIP_exit;
}
/* clear the MIC field of MME to zero */
@ -1964,20 +1964,20 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)
/*/* management packet content */
{
int pp;
DBG_871X("pkt: ");
DBG_88E("pkt: ");
for (pp =0;pp< pattrib->pkt_len; pp++)
printk(" %02x ", pframe[pp]);
DBG_871X("\n");
DBG_88E("\n");
/* BIP AAD + management frame body + MME(MIC is zero) */
DBG_871X("AAD+PKT: ");
DBG_88E("AAD+PKT: ");
for (pp =0;pp< ori_len; pp++)
DBG_871X(" %02x ", BIP_AAD[pp]);
DBG_871X("\n");
DBG_88E(" %02x ", BIP_AAD[pp]);
DBG_88E("\n");
/* show the MIC result */
DBG_871X("mic: ");
DBG_88E("mic: ");
for (pp =0;pp<16; pp++)
DBG_871X(" %02x ", mic[pp]);
DBG_871X("\n");
DBG_88E(" %02x ", mic[pp]);
DBG_88E("\n");
}
*/
/* MIC field should be last 8 bytes of packet (packet without FCS) */
@ -1987,7 +1987,7 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)
res =_SUCCESS;
}
else
DBG_871X("BIP MIC error!\n");
DBG_88E("BIP MIC error!\n");
}
else
@ -2741,12 +2741,12 @@ u8 rtw_handle_tkip_countermeasure(struct adapter* adapter, const char *caller)
if (securitypriv->btkip_countermeasure == true) {
u32 passing_ms = rtw_get_passing_time_ms(securitypriv->btkip_countermeasure_time);
if (passing_ms > 60*1000) {
DBG_871X_LEVEL(_drv_always_, "%s("ADPT_FMT") countermeasure time:%ds > 60s\n",
DBG_88E_LEVEL(_drv_always_, "%s("ADPT_FMT") countermeasure time:%ds > 60s\n",
caller, ADPT_ARG(adapter), passing_ms/1000);
securitypriv->btkip_countermeasure = false;
securitypriv->btkip_countermeasure_time = 0;
} else {
DBG_871X_LEVEL(_drv_always_, "%s("ADPT_FMT") countermeasure time:%ds < 60s\n",
DBG_88E_LEVEL(_drv_always_, "%s("ADPT_FMT") countermeasure time:%ds < 60s\n",
caller, ADPT_ARG(adapter), passing_ms/1000);
status = _FAIL;
}

16
core/rtw_sreset.c
View file

@ -184,15 +184,15 @@ static void sreset_restore_network_status(struct adapter *padapter)
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
if (check_fwstate(mlmepriv, WIFI_STATION_STATE)) {
DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_STATION_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
DBG_88E(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_STATION_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
sreset_restore_network_station(padapter);
} else if (check_fwstate(mlmepriv, WIFI_AP_STATE)) {
DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_AP_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
DBG_88E(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_AP_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
rtw_ap_restore_network(padapter);
} else if (check_fwstate(mlmepriv, WIFI_ADHOC_STATE)) {
DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_ADHOC_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
DBG_88E(FUNC_ADPT_FMT" fwstate:0x%08x - WIFI_ADHOC_STATE\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
} else {
DBG_871X(FUNC_ADPT_FMT" fwstate:0x%08x - ???\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
DBG_88E(FUNC_ADPT_FMT" fwstate:0x%08x - ???\n", FUNC_ADPT_ARG(padapter), get_fwstate(mlmepriv));
}
}
@ -204,7 +204,7 @@ static void sreset_stop_adapter(struct adapter *padapter)
if (padapter == NULL)
return;
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
if (!rtw_netif_queue_stopped(padapter->pnetdev))
rtw_netif_stop_queue(padapter->pnetdev);
@ -233,7 +233,7 @@ static void sreset_start_adapter(struct adapter *padapter)
if (padapter == NULL)
return;
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
if (check_fwstate(pmlmepriv, _FW_LINKED)) {
sreset_restore_network_status(padapter);
@ -259,7 +259,7 @@ void sreset_reset(struct adapter *padapter)
unsigned long irqL;
u32 start = jiffies;
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
@ -279,5 +279,5 @@ void sreset_reset(struct adapter *padapter)
_exit_pwrlock(&pwrpriv->lock);
DBG_871X("%s done in %d ms\n", __FUNCTION__, rtw_get_passing_time_ms(start));
DBG_88E("%s done in %d ms\n", __FUNCTION__, rtw_get_passing_time_ms(start));
}

6
core/rtw_sta_mgt.c
View file

@ -145,7 +145,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;
}
@ -153,7 +153,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));
}
@ -306,7 +306,7 @@ struct sta_info *rtw_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr)
preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ
DBG_871X("DBG_RX_SEQ %s:%d IndicateSeq: %d\n", __FUNCTION__, __LINE__,
DBG_88E("DBG_RX_SEQ %s:%d IndicateSeq: %d\n", __FUNCTION__, __LINE__,
preorder_ctrl->indicate_seq);
#endif
preorder_ctrl->wend_b = 0xffff;

66
core/rtw_wlan_util.c
View file

@ -465,7 +465,7 @@ void set_channel_bwmode(struct adapter *padapter, unsigned char channel, unsigne
if ( padapter->bNotifyChannelChange )
{
DBG_871X( "[%s] ch = %d, offset = %d, bwmode = %d\n", __FUNCTION__, channel, channel_offset, bwmode );
DBG_88E( "[%s] ch = %d, offset = %d, bwmode = %d\n", __FUNCTION__, channel, channel_offset, bwmode );
}
if ((bwmode == HT_CHANNEL_WIDTH_20)||(channel_offset == HAL_PRIME_CHNL_OFFSET_DONT_CARE))
@ -714,7 +714,7 @@ int WFD_info_handler(struct adapter *padapter, struct ndis_802_11_variable_ies *
u8 attr_content[ 10 ] = { 0x00 };
u32 attr_contentlen = 0;
DBG_871X( "[%s] Found WFD IE\n", __FUNCTION__ );
DBG_88E( "[%s] Found WFD IE\n", __FUNCTION__ );
rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen);
if ( attr_contentlen )
{
@ -725,7 +725,7 @@ int WFD_info_handler(struct adapter *padapter, struct ndis_802_11_variable_ies *
}
else
{
DBG_871X( "[%s] NO WFD IE\n", __FUNCTION__ );
DBG_88E( "[%s] NO WFD IE\n", __FUNCTION__ );
}
return( _FAIL );
@ -816,7 +816,7 @@ void WMMOnAssocRsp(struct 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)
@ -865,7 +865,7 @@ void WMMOnAssocRsp(struct 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;
@ -1056,7 +1056,7 @@ void HTOnAssocRsp(struct adapter *padapter)
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
DBG_871X("%s\n", __FUNCTION__);
DBG_88E("%s\n", __FUNCTION__);
if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable))
{
@ -1173,12 +1173,12 @@ int rtw_check_bcn_info(struct 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;
}
@ -1217,11 +1217,11 @@ int rtw_check_bcn_info(struct 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;
@ -1240,19 +1240,19 @@ int rtw_check_bcn_info(struct 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;
@ -1274,7 +1274,7 @@ int rtw_check_bcn_info(struct 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;
}
}
@ -1291,7 +1291,7 @@ int rtw_check_bcn_info(struct 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;
}
@ -1307,7 +1307,7 @@ int rtw_check_bcn_info(struct 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;
}
@ -1334,14 +1334,14 @@ int rtw_check_bcn_info(struct 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;
}
}
@ -1758,19 +1758,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))
@ -1778,33 +1778,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
@ -1820,13 +1820,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;
}
}
@ -2091,13 +2091,13 @@ int rtw_handle_dualmac(struct adapter *adapter, bool init)
if (init) {
if (pbuddy_padapter == NULL) {
pbuddy_padapter = adapter;
DBG_871X("%s(): pbuddy_padapter == NULL, Set pbuddy_padapter\n", __FUNCTION__);
DBG_88E("%s(): pbuddy_padapter == NULL, Set pbuddy_padapter\n", __FUNCTION__);
} else {
adapter->pbuddy_adapter = pbuddy_padapter;
pbuddy_padapter->pbuddy_adapter = adapter;
/* clear global value */
pbuddy_padapter = NULL;
DBG_871X("%s(): pbuddy_padapter exist, Exchange Information\n", __FUNCTION__);
DBG_88E("%s(): pbuddy_padapter exist, Exchange Information\n", __FUNCTION__);
}
} else {
pbuddy_padapter = NULL;

114
core/rtw_xmit.c
View file

@ -404,19 +404,19 @@ static void update_attrib_vcs_info(struct adapter *padapter, struct xmit_frame *
}
else
{
DBG_871X("%s, call rtw_get_stainfo()\n", __func__);
DBG_88E("%s, call rtw_get_stainfo()\n", __func__);
psta =rtw_get_stainfo(&padapter->stapriv ,&pattrib->ra[0] );
}
if (psta == NULL)
{
DBG_871X("%s, psta ==NUL\n", __func__);
DBG_88E("%s, psta ==NUL\n", __func__);
return;
}
if (!(psta->state &_FW_LINKED))
{
DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state);
DBG_88E("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state);
return;
}
@ -556,7 +556,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;
}
@ -650,7 +650,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
}
}
} else if (0x888e == pattrib->ether_type) {
DBG_871X_LEVEL(_drv_always_, "send eapol packet\n");
DBG_88E_LEVEL(_drv_always_, "send eapol packet\n");
}
if ( (pattrib->ether_type == 0x888e) || (pattrib->dhcp_pkt == 1) )
@ -672,7 +672,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
if (psta == NULL) { /* if we cannot get psta => drrp the pkt */
RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:" MAC_FMT"\n", MAC_ARG(pattrib->ra)));
#ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __FUNCTION__, MAC_ARG(pattrib->ra));
DBG_88E("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __FUNCTION__, MAC_ARG(pattrib->ra));
#endif
res =_FAIL;
goto exit;
@ -695,7 +695,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
/* if we cannot get psta => drop the pkt */
RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:" MAC_FMT "\n", MAC_ARG(pattrib->ra)));
#ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __FUNCTION__, MAC_ARG(pattrib->ra));
DBG_88E("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __FUNCTION__, MAC_ARG(pattrib->ra));
#endif
res = _FAIL;
goto exit;
@ -735,7 +735,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
{
RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("\npsta->ieee8021x_blocked == true, pattrib->ether_type(%.4x) != 0x888e\n", pattrib->ether_type));
#ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s psta->ieee8021x_blocked == true, pattrib->ether_type(%04x) != 0x888e\n", __FUNCTION__, pattrib->ether_type);
DBG_88E("DBG_TX_DROP_FRAME %s psta->ieee8021x_blocked == true, pattrib->ether_type(%04x) != 0x888e\n", __FUNCTION__, pattrib->ether_type);
#endif
res = _FAIL;
goto exit;
@ -781,7 +781,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
{
RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("\npadapter->securitypriv.busetkipkey(%d) ==_FAIL drop packet\n", padapter->securitypriv.busetkipkey));
#ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s padapter->securitypriv.busetkipkey(%d) ==_FAIL drop packet\n", __FUNCTION__, padapter->securitypriv.busetkipkey);
DBG_88E("DBG_TX_DROP_FRAME %s padapter->securitypriv.busetkipkey(%d) ==_FAIL drop packet\n", __FUNCTION__, padapter->securitypriv.busetkipkey);
#endif
res =_FAIL;
goto exit;
@ -839,19 +839,19 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
}
else
{
DBG_871X("%s, call rtw_get_stainfo()\n", __func__);
DBG_88E("%s, call rtw_get_stainfo()\n", __func__);
stainfo =rtw_get_stainfo(&padapter->stapriv ,&pattrib->ra[0]);
}
if (stainfo == NULL)
{
DBG_871X("%s, psta ==NUL\n", __func__);
DBG_88E("%s, psta ==NUL\n", __func__);
return _FAIL;
}
if (!(stainfo->state &_FW_LINKED))
{
DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, stainfo->state);
DBG_88E("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, stainfo->state);
return _FAIL;
}
@ -968,7 +968,7 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmi
/* 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_:
@ -1015,7 +1015,7 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat
if (pattrib->psta) {
psta = pattrib->psta;
} else {
DBG_871X("%s, call rtw_get_stainfo()\n", __func__);
DBG_88E("%s, call rtw_get_stainfo()\n", __func__);
if (bmcst) {
psta = rtw_get_bcmc_stainfo(padapter);
} else {
@ -1025,13 +1025,13 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat
if (psta == NULL)
{
DBG_871X("%s, psta ==NUL\n", __func__);
DBG_88E("%s, psta ==NUL\n", __func__);
return _FAIL;
}
if (!(psta->state &_FW_LINKED))
{
DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state);
DBG_88E("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state);
return _FAIL;
}
@ -1126,7 +1126,7 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat
/* 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))
@ -1137,7 +1137,7 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat
}
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 */
}
@ -1181,19 +1181,19 @@ s32 rtw_txframes_sta_ac_pending(struct adapter *padapter, struct pkt_attrib *pat
}
else
{
DBG_871X("%s, call rtw_get_stainfo()\n", __func__);
DBG_88E("%s, call rtw_get_stainfo()\n", __func__);
psta =rtw_get_stainfo(&padapter->stapriv ,&pattrib->ra[0]);
}
if (psta == NULL)
{
DBG_871X("%s, psta ==NUL\n", __func__);
DBG_88E("%s, psta ==NUL\n", __func__);
return 0;
}
if (!(psta->state &_FW_LINKED))
{
DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state);
DBG_88E("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state);
return 0;
}
@ -1281,20 +1281,20 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
psta = pattrib->psta;
} else
{
DBG_871X("%s, call rtw_get_stainfo()\n", __func__);
DBG_88E("%s, call rtw_get_stainfo()\n", __func__);
psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra);
}
if (psta == NULL)
{
DBG_871X("%s, psta ==NUL\n", __func__);
DBG_88E("%s, psta ==NUL\n", __func__);
return _FAIL;
}
if (!(psta->state &_FW_LINKED))
{
DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state);
DBG_88E("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state);
return _FAIL;
}
@ -1491,7 +1491,7 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s
/* IGTK key is not install, it may not support 802.11w */
if (padapter->securitypriv.binstallBIPkey != true)
{
DBG_871X("no instll BIP key\n");
DBG_88E("no instll BIP key\n");
goto xmitframe_coalesce_success;
}
/* station mode doesn't need TX BIP, just ready the code */
@ -1579,17 +1579,17 @@ s32 rtw_mgmt_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, s
if (psta == NULL)
{
DBG_871X("%s, psta ==NUL\n", __func__);
DBG_88E("%s, psta ==NUL\n", __func__);
goto xmitframe_coalesce_fail;
}
if (!(psta->state & _FW_LINKED) || pxmitframe->buf_addr == NULL)
{
DBG_871X("%s, not _FW_LINKED or addr null\n", __func__);
DBG_88E("%s, not _FW_LINKED or addr null\n", __func__);
goto xmitframe_coalesce_fail;
}
/* DBG_871X("%s, action frame category =%d\n", __func__, pframe[WLAN_HDR_A3_LEN]); */
/* DBG_88E("%s, action frame category =%d\n", __func__, pframe[WLAN_HDR_A3_LEN]); */
/* according 802.11-2012 standard, these five types are not robust types */
if (subtype == WIFI_ACTION &&
(pframe[WLAN_HDR_A3_LEN] == RTW_WLAN_CATEGORY_PUBLIC ||
@ -1810,14 +1810,14 @@ struct xmit_buf *rtw_alloc_xmitbuf_ext(struct xmit_priv *pxmitpriv)
{
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
pxmitbuf->priv_data = NULL;
/* pxmitbuf->ext_tag = true; */
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);
}
@ -1843,7 +1843,7 @@ s32 rtw_free_xmitbuf_ext(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
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
spin_unlock_irqrestore(&pfree_queue->lock, flags);
@ -1860,7 +1860,7 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)
;
/* DBG_871X("+rtw_alloc_xmitbuf\n"); */
/* DBG_88E("+rtw_alloc_xmitbuf\n"); */
spin_lock_irqsave(&pfree_xmitbuf_queue->lock, flags);
@ -1881,21 +1881,21 @@ struct xmit_buf *rtw_alloc_xmitbuf(struct xmit_priv *pxmitpriv)
{
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; */
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
@ -1913,7 +1913,7 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
return _FAIL;
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);
}
@ -1927,9 +1927,9 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
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
spin_unlock_irqrestore(&pfree_xmitbuf_queue->lock, flags);
}
@ -2066,7 +2066,7 @@ struct xmit_frame *rtw_alloc_xmitframe_once(struct xmit_priv *pxmitpriv)
rtw_init_xmitframe(pxframe);
DBG_871X("################## %s ##################\n", __func__);
DBG_88E("################## %s ##################\n", __func__);
exit:
return pxframe;
@ -2091,7 +2091,7 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
}
if (pxmitframe->alloc_addr) {
DBG_871X("################## %s with alloc_addr ##################\n", __func__);
DBG_88E("################## %s with alloc_addr ##################\n", __func__);
rtw_mfree(pxmitframe->alloc_addr, sizeof(struct xmit_frame) + 4);
goto check_pkt_complete;
}
@ -2319,7 +2319,7 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe)
if (pattrib->psta) {
psta = pattrib->psta;
} else {
DBG_871X("%s, call rtw_get_stainfo()\n", __func__);
DBG_88E("%s, call rtw_get_stainfo()\n", __func__);
psta = rtw_get_stainfo(pstapriv, pattrib->ra);
}
@ -2332,7 +2332,7 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe)
if (!(psta->state &_FW_LINKED))
{
DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state);
DBG_88E("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state);
return _FAIL;
}
@ -2666,7 +2666,7 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt)
if (rtw_get_passing_time_ms(start) > 2000) {
if (drop_cnt)
DBG_871X("DBG_TX_DROP_FRAME %s no more pxmitframe, drop_cnt:%u\n", __FUNCTION__, drop_cnt);
DBG_88E("DBG_TX_DROP_FRAME %s no more pxmitframe, drop_cnt:%u\n", __FUNCTION__, drop_cnt);
start = jiffies;
drop_cnt = 0;
}
@ -2704,7 +2704,7 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt)
if (res == _FAIL) {
RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit: update attrib fail\n"));
#ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s update attrib fail\n", __FUNCTION__);
DBG_88E("DBG_TX_DROP_FRAME %s update attrib fail\n", __FUNCTION__);
#endif
rtw_free_xmitframe(pxmitpriv, pxmitframe);
return -1;
@ -2751,25 +2751,25 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr
}
else
{
DBG_871X("%s, call rtw_get_stainfo()\n", __func__);
DBG_88E("%s, call rtw_get_stainfo()\n", __func__);
psta =rtw_get_stainfo(pstapriv, pattrib->ra);
}
if (psta == NULL)
{
DBG_871X("%s, psta ==NUL\n", __func__);
DBG_88E("%s, psta ==NUL\n", __func__);
return false;
}
if (!(psta->state &_FW_LINKED))
{
DBG_871X("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state);
DBG_88E("%s, psta->state(0x%x) != _FW_LINKED\n", __func__, psta->state);
return false;
}
if (pattrib->triggered ==1)
{
/* DBG_871X("directly xmit pspoll_triggered packet\n"); */
/* DBG_88E("directly xmit pspoll_triggered packet\n"); */
/* pattrib->triggered =0; */
@ -2848,11 +2848,11 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr
{
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);
}
@ -2909,7 +2909,7 @@ static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struc
}
else
{
/* DBG_871X("xmitframe_enqueue_for_sleeping_sta return false\n"); */
/* DBG_88E("xmitframe_enqueue_for_sleeping_sta return false\n"); */
}
}
@ -3076,7 +3076,7 @@ void wakeup_sta_to_xmit(struct 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);
@ -3088,7 +3088,7 @@ void wakeup_sta_to_xmit(struct adapter *padapter, struct sta_info *psta)
{
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);
@ -3212,7 +3212,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;
}
@ -3243,7 +3243,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;
complete(&((*sctx)->done));
*sctx = NULL;
@ -3273,6 +3273,6 @@ 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__);
}
}