skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-29 15:43:38 +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
Show stats 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); struct wlan_bssid_ex *pnetwork_mlmeext = &(pmlmeinfo->network);
unsigned char *pie = pnetwork_mlmeext->IEs; unsigned char *pie = pnetwork_mlmeext->IEs;
/* DBG_871X("%s\n", __FUNCTION__); */ /* DBG_88E("%s\n", __FUNCTION__); */
/* update TIM IE */ /* update TIM IE */
/* if (pstapriv->tim_bitmap) */ /* if (pstapriv->tim_bitmap) */
@ -322,7 +322,7 @@ void expire_timeout_chk(struct adapter *padapter)
rtw_list_delete(&psta->auth_list); rtw_list_delete(&psta->auth_list);
pstapriv->auth_list_cnt--; 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]); 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); 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->expire_to = pstapriv->expire_to;
psta->state |= WIFI_STA_ALIVE_CHK_STATE; 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 */ /* to update bcn with tim_bitmap for this station */
pstapriv->tim_bitmap |= BIT(psta->aid); pstapriv->tim_bitmap |= BIT(psta->aid);
@ -396,14 +396,14 @@ void expire_timeout_chk(struct adapter *padapter)
rtw_list_delete(&psta->asoc_list); rtw_list_delete(&psta->asoc_list);
pstapriv->asoc_list_cnt--; 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); updated = ap_free_sta(padapter, psta, false, WLAN_REASON_DEAUTH_LEAVING);
} else { } else {
/* TODO: Aging mechanism to digest frames in sleep_q to avoid running out of xmitframe */ /* 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) if (psta->sleepq_len > (NR_XMITFRAME/pstapriv->asoc_list_cnt)
&& padapter->xmitpriv.free_xmitframe_cnt < ((NR_XMITFRAME/pstapriv->asoc_list_cnt)/2) && 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) , MAC_ARG(psta->hwaddr)
, psta->sleepq_len, padapter->xmitpriv.free_xmitframe_cnt, pstapriv->asoc_list_cnt); , psta->sleepq_len, padapter->xmitpriv.free_xmitframe_cnt, pstapriv->asoc_list_cnt);
wakeup_sta_to_xmit(padapter, psta); wakeup_sta_to_xmit(padapter, psta);
@ -437,19 +437,19 @@ void expire_timeout_chk(struct adapter *padapter)
psta->keep_alive_trycnt++; psta->keep_alive_trycnt++;
if (ret == _SUCCESS) { 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->expire_to = pstapriv->expire_to;
psta->keep_alive_trycnt = 0; psta->keep_alive_trycnt = 0;
continue; continue;
} else if (psta->keep_alive_trycnt <= 3) { } 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; psta->expire_to = 1;
continue; continue;
} }
psta->keep_alive_trycnt = 0; 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); spin_lock_bh(&pstapriv->asoc_list_lock);
if (rtw_is_list_empty(&psta->asoc_list) ==false) { if (rtw_is_list_empty(&psta->asoc_list) ==false) {
rtw_list_delete(&psta->asoc_list); 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); 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); __FUNCTION__ , psta->mac_id, raid , tx_ra_bitmap, arg);
/* bitmap[0:27] = tx_rate_bitmap */ /* 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->raid = raid;
psta->init_rate = init_rate; psta->init_rate = init_rate;
} else { } 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); raid = networktype_to_raid(network_type);
init_rate = get_highest_rate_idx(tx_ra_bitmap&0x0fffffff)&0x3f; 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 */ /* ap mode */
rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true); 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); 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); 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; psta->state = _FW_LINKED;
spin_unlock_bh(&psta->lock); spin_unlock_bh(&psta->lock);
} else { } 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+4; */
psta->mac_id = psta->aid+1; psta->mac_id = psta->aid+1;
DBG_871X("%s\n", __FUNCTION__); DBG_88E("%s\n", __FUNCTION__);
/* ap mode */ /* ap mode */
rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, true); 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_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
DBG_871X("%s\n", __FUNCTION__); DBG_88E("%s\n", __FUNCTION__);
/* handle A-MPDU parameter field */ /* 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; pmlmeinfo->SM_PS = (le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) & 0x0C) >> 2;
if (pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC) if (pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC)
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. */ /* 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); struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
#endif /* CONFIG_P2P */ #endif /* CONFIG_P2P */
/* DBG_871X("%s\n", __FUNCTION__); */ /* DBG_88E("%s\n", __FUNCTION__); */
bcn_interval = (u16)pnetwork->Configuration.BeaconPeriod; bcn_interval = (u16)pnetwork->Configuration.BeaconPeriod;
cur_channel = pnetwork->Configuration.DSConfig; 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, pmlmeext->cur_channel, pmlmeext->cur_ch_offset, pmlmeext->cur_bwmode); */
set_channel_bwmode(padapter, cur_channel, cur_ch_offset, 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; pmlmeext->cur_channel = cur_channel;
@ -903,7 +903,7 @@ static void start_bss_network(struct adapter *padapter, u8 *pbuf)
/* issue beacon frame */ /* issue beacon frame */
if (send_beacon(padapter) ==_FAIL) if (send_beacon(padapter) ==_FAIL)
DBG_871X("issue_beacon, fail!\n"); DBG_88E("issue_beacon, fail!\n");
} }
/* update bc/mc sta_info */ /* 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 */ /* ht_capab, ht_oper */
/* WPS IE */ /* 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) if (check_fwstate(pmlmepriv, WIFI_AP_STATE) != true)
return _FAIL; return _FAIL;
@ -1192,7 +1192,7 @@ void rtw_set_macaddr_acl(struct adapter *padapter, int mode)
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; 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; 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 wlan_acl_pool *pacl_list = &pstapriv->acl_list;
struct __queue *pacl_node_q =&pacl_list->acl_node_q; 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) if ((NUM_ACL-1) < pacl_list->num)
return (-1); 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 (_rtw_memcmp(paclnode->addr, addr, ETH_ALEN)) {
if (paclnode->valid == true) { if (paclnode->valid == true) {
added = true; added = true;
DBG_871X("%s, sta has been added\n", __func__); DBG_88E("%s, sta has been added\n", __func__);
break; 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)); 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 wlan_acl_pool *pacl_list = &pstapriv->acl_list;
struct __queue *pacl_node_q =&pacl_list->acl_node_q; 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)); 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)); 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; 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) 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; unsigned char *p, *ie = pnetwork->IEs;
u32 len = 0; 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) if (!pmlmeinfo->ERP_enable)
return; return;
@ -1345,31 +1345,31 @@ static void update_bcn_erpinfo_ie(struct adapter *padapter)
static void update_bcn_htcap_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) 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) 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) 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) 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; unsigned char *ie = pnetwork->IEs;
u32 ielen = pnetwork->IELength; 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); 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) 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)) { if (_rtw_memcmp(RTW_WPA_OUI, oui, 4)) {
update_bcn_wpa_ie(padapter); 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)) { } else if (_rtw_memcmp(P2P_OUI, oui, 4)) {
update_bcn_p2p_ie(padapter); update_bcn_p2p_ie(padapter);
} else { } 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_priv *pmlmeext;
/* struct mlme_ext_info *pmlmeinfo; */ /* struct mlme_ext_info *pmlmeinfo; */
/* DBG_871X("%s\n", __FUNCTION__); */ /* DBG_88E("%s\n", __FUNCTION__); */
if (!padapter) if (!padapter)
return; return;
@ -1548,7 +1548,7 @@ static int rtw_ht_operation_update(struct adapter *padapter)
/* if (!iface->conf->ieee80211n || iface->conf->ht_op_mode_fixed) */ /* if (!iface->conf->ieee80211n || iface->conf->ht_op_mode_fixed) */
/* return 0; */ /* 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); __FUNCTION__, pmlmepriv->ht_op_mode);
if (!(pmlmepriv->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT) if (!(pmlmepriv->ht_op_mode & HT_INFO_OPERATION_MODE_NON_GF_DEVS_PRESENT)
@ -1599,7 +1599,7 @@ static int rtw_ht_operation_update(struct adapter *padapter)
op_mode_changes++; 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); __FUNCTION__, pmlmepriv->ht_op_mode, op_mode_changes);
return 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) { if (psta->flags & WLAN_STA_HT) {
u16 ht_capab = le16_to_cpu(psta->htpriv.ht_cap.cap_info); 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); "Info: 0x%04x\n", MAC_ARG(psta->hwaddr), ht_capab);
if (psta->no_ht_set) { 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; psta->no_ht_gf_set = 1;
pmlmepriv->num_sta_ht_no_gf++; 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", "greenfield, num of non-gf stations %d\n",
__FUNCTION__, MAC_ARG(psta->hwaddr), __FUNCTION__, MAC_ARG(psta->hwaddr),
pmlmepriv->num_sta_ht_no_gf); 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; psta->ht_20mhz_set = 1;
pmlmepriv->num_sta_ht_20mhz++; 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", "num of 20MHz HT STAs %d\n",
__FUNCTION__, MAC_ARG(psta->hwaddr), __FUNCTION__, MAC_ARG(psta->hwaddr),
pmlmepriv->num_sta_ht_20mhz); 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++; pmlmepriv->num_sta_no_ht++;
} }
if (pmlmepriv->htpriv.ht_option == true) { 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", " - no HT, num of non-HT stations %d\n",
__FUNCTION__, MAC_ARG(psta->hwaddr), __FUNCTION__, MAC_ARG(psta->hwaddr),
pmlmepriv->num_sta_no_ht); 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. */ /* update associcated stations cap. */
associated_clients_update(padapter, beacon_updated); 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); 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; 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) if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
return ret; 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); FUNC_NDEV_ARG(padapter->pnetdev), new_ch, ch_offset);
spin_lock_bh(&pstapriv->asoc_list_lock); spin_lock_bh(&pstapriv->asoc_list_lock);
@ -1938,7 +1938,7 @@ int rtw_sta_flush(struct adapter *padapter)
char chk_alive_list[NUM_STA]; char chk_alive_list[NUM_STA];
int i; 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) if ((pmlmeinfo->state&0x03) != WIFI_FW_AP_STATE)
return ret; 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]); psta = rtw_get_stainfo_by_offset(pstapriv, chk_alive_list[i]);
if (psta == NULL) { 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) { } else if (psta->state &_FW_LINKED) {
Update_RA_Entry(padapter, psta); Update_RA_Entry(padapter, psta);
/* pairwise key */ /* pairwise key */
@ -2166,7 +2166,7 @@ void stop_ap_mode(struct adapter *padapter)
} }
spin_unlock_bh(&(pacl_node_q->lock)); 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); 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) || if ((pcmdpriv->padapter->hw_init_completed ==false && bAllow == false) ||
pcmdpriv->cmdthd_running == false) { /* com_thread not running */ 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, */ /* cmd_obj->cmdcode, */
/* pcmdpriv->padapter->hw_init_completed, */ /* pcmdpriv->padapter->hw_init_completed, */
/* pcmdpriv->cmdthd_running */ /* pcmdpriv->cmdthd_running */
@ -359,32 +359,32 @@ int rtw_cmd_thread(void * context)
while (1) { while (1) {
if (_rtw_down_sema(&pcmdpriv->cmd_queue_sema) == _FAIL) { 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; break;
} }
if ((padapter->bDriverStopped == true)||(padapter->bSurpriseRemoved == true)) 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__); __FUNCTION__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__);
break; break;
} }
if (pcmdpriv->stop_req) { 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; break;
} }
if (rtw_is_list_empty(&(pcmdpriv->cmd_queue.queue))) 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; continue;
} }
_next: _next:
if ((padapter->bDriverStopped == true)||(padapter->bSurpriseRemoved == true)) 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__); __FUNCTION__, padapter->bDriverStopped, padapter->bSurpriseRemoved, __LINE__);
break; break;
} }
@ -461,7 +461,7 @@ post_process:
break; 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); rtw_free_cmd_obj(pcmd);
}while (1); }while (1);
@ -1067,7 +1067,7 @@ u8 rtw_joinbss_cmd(struct adapter *padapter, struct wlan_network* pnetwork)
else else
adapter_to_pwrctl(padapter)->smart_ps = padapter->registrypriv.smart_ps; 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 */ 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)); 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); */ /* rtw_enqueue_cmd(pcmdpriv, ph2c); */
res = 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); FUNC_NDEV_ARG(padapter->pnetdev), ch, bw, ch_offset);
/* check input parameter */ /* 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: 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 if (link_detect->NumTxOkInPeriod > TX_ACTIVE_TH
|| link_detect->NumRxUnicastOkInPeriod > RX_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), FUNC_ADPT_ARG(padapter),
TRAFFIC_PROTECT_PERIOD_MS, TRAFFIC_PROTECT_PERIOD_MS,
link_detect->NumTxOkInPeriod, link_detect->NumTxOkInPeriod,
@ -1894,7 +1894,7 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
switch (lps_ctrl_type) { switch (lps_ctrl_type) {
case LPS_CTRL_SCAN: case LPS_CTRL_SCAN:
/* DBG_871X("LPS_CTRL_SCAN\n"); */ /* DBG_88E("LPS_CTRL_SCAN\n"); */
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
BT_WifiScanNotify(padapter, true); BT_WifiScanNotify(padapter, true);
if (BT_1Ant(padapter) == false) if (BT_1Ant(padapter) == false)
@ -1907,11 +1907,11 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
} }
break; break;
case LPS_CTRL_JOINBSS: case LPS_CTRL_JOINBSS:
/* DBG_871X("LPS_CTRL_JOINBSS\n"); */ /* DBG_88E("LPS_CTRL_JOINBSS\n"); */
LPS_Leave(padapter); LPS_Leave(padapter);
break; break;
case LPS_CTRL_CONNECT: case LPS_CTRL_CONNECT:
/* DBG_871X("LPS_CTRL_CONNECT\n"); */ /* DBG_88E("LPS_CTRL_CONNECT\n"); */
mstatus = 1;/* connect */ mstatus = 1;/* connect */
/* Reset LPS Setting */ /* Reset LPS Setting */
pwrpriv->LpsIdleCount = 0; pwrpriv->LpsIdleCount = 0;
@ -1921,7 +1921,7 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
#endif #endif
break; break;
case LPS_CTRL_DISCONNECT: case LPS_CTRL_DISCONNECT:
/* DBG_871X("LPS_CTRL_DISCONNECT\n"); */ /* DBG_88E("LPS_CTRL_DISCONNECT\n"); */
mstatus = 0;/* disconnect */ mstatus = 0;/* disconnect */
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
BT_WifiMediaStatusNotify(padapter, mstatus); 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)); rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_JOINBSSRPT, (u8 *)(&mstatus));
break; break;
case LPS_CTRL_SPECIAL_PACKET: case LPS_CTRL_SPECIAL_PACKET:
/* DBG_871X("LPS_CTRL_SPECIAL_PACKET\n"); */ /* DBG_88E("LPS_CTRL_SPECIAL_PACKET\n"); */
pwrpriv->DelayLPSLastTimeStamp = jiffies; pwrpriv->DelayLPSLastTimeStamp = jiffies;
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
BT_SpecialPacketNotify(padapter); BT_SpecialPacketNotify(padapter);
@ -1942,7 +1942,7 @@ static void lps_ctrl_wk_hdl(struct adapter *padapter, u8 lps_ctrl_type)
LPS_Leave(padapter); LPS_Leave(padapter);
break; break;
case LPS_CTRL_LEAVE: case LPS_CTRL_LEAVE:
/* DBG_871X("LPS_CTRL_LEAVE\n"); */ /* DBG_88E("LPS_CTRL_LEAVE\n"); */
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
BT_LpsLeave(padapter); BT_LpsLeave(padapter);
if (BT_1Ant(padapter) == false) 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) if (count < 3)
{ {
DBG_871X("argument size is less than 3\n"); DBG_88E("argument size is less than 3\n");
return -EFAULT; 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); int num = sscanf(tmp, "%x %x %x", &addr, &val, &len);
if (num != 3) { if (num != 3) {
DBG_871X("invalid write_reg parameter!\n"); DBG_88E("invalid write_reg parameter!\n");
return count; return count;
} }
@ -96,7 +96,7 @@ int proc_set_write_reg(struct file *file, const char __user *buffer,
rtw_write32(padapter, addr, val); rtw_write32(padapter, addr, val);
break; break;
default: default:
DBG_871X("error write length =%d", len); DBG_88E("error write length =%d", len);
break; break;
} }
@ -153,7 +153,7 @@ int proc_set_read_reg(struct file *file, const char __user *buffer,
if (count < 2) if (count < 2)
{ {
DBG_871X("argument size is less than 2\n"); DBG_88E("argument size is less than 2\n");
return -EFAULT; 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); int num = sscanf(tmp, "%x %x", &addr, &len);
if (num != 2) { if (num != 2) {
DBG_871X("invalid read_reg parameter!\n"); DBG_88E("invalid read_reg parameter!\n");
return count; 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; padapter->recvpriv.signal_strength_dbg =signal_strength;
if (is_signal_dbg) 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 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; 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; return count;

18
core/rtw_efuse.c
View file

@ -217,7 +217,7 @@ ReadEFuseByte(
value32 = rtw_read32(Adapter, EFUSE_CTRL); value32 = rtw_read32(Adapter, EFUSE_CTRL);
*pbuf = (u8)(value32 & 0xff); *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) { if (word_en != 0xF) {
ret = Efuse_PgPacketWrite(padapter, offset, word_en, newdata, false); ret = Efuse_PgPacketWrite(padapter, offset, word_en, newdata, false);
DBG_871X("offset =%x\n", offset); DBG_88E("offset =%x\n", offset);
DBG_871X("word_en =%x\n", word_en); DBG_88E("word_en =%x\n", word_en);
for (i =0;i<PGPKT_DATA_SIZE;i++) 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; 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) if (word_en != 0xF)
{ {
DBG_871X("%s: offset =%#X\n", __FUNCTION__, offset); DBG_88E("%s: offset =%#X\n", __FUNCTION__, offset);
DBG_871X("%s: word_en =%#X\n", __FUNCTION__, word_en); DBG_88E("%s: word_en =%#X\n", __FUNCTION__, word_en);
DBG_871X("%s: data =", __FUNCTION__); DBG_88E("%s: data =", __FUNCTION__);
for (i =0; i<PGPKT_DATA_SIZE; i++) 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); ret = Efuse_PgPacketWrite_BT(padapter, offset, word_en, newdata, false);
if (ret == _FAIL) break; 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; 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 ) switch ( frame_type )
{ {
case 1: 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_data_len = RTW_GET_BE16(attr_ptr + 2);
u16 attr_len = attr_data_len + 4; 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 ) if ( attr_id == target_attr_id )
{ {
target_attr_ptr = attr_ptr; target_attr_ptr = attr_ptr;
@ -992,7 +992,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
* sub-type. */ * sub-type. */
if (elen < 4) { if (elen < 4) {
if (show_errors) { if (show_errors) {
DBG_871X("short vendor specific " DBG_88E("short vendor specific "
"information element ignored (len =%lu)\n", "information element ignored (len =%lu)\n",
(unsigned long) elen); (unsigned long) elen);
} }
@ -1013,7 +1013,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
break; break;
case WME_OUI_TYPE: /* this is a Wi-Fi WME info. element */ case WME_OUI_TYPE: /* this is a Wi-Fi WME info. element */
if (elen < 5) { if (elen < 5) {
DBG_871X("short WME " DBG_88E("short WME "
"information element ignored " "information element ignored "
"(len =%lu)\n", "(len =%lu)\n",
(unsigned long) elen); (unsigned long) elen);
@ -1030,7 +1030,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
elems->wme_tspec_len = elen; elems->wme_tspec_len = elen;
break; break;
default: default:
DBG_871X("unknown WME " DBG_88E("unknown WME "
"information element ignored " "information element ignored "
"(subtype =%d len =%lu)\n", "(subtype =%d len =%lu)\n",
pos[4], (unsigned long) elen); 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; elems->wps_ie_len = elen;
break; break;
default: default:
DBG_871X("Unknown Microsoft " DBG_88E("Unknown Microsoft "
"information element ignored " "information element ignored "
"(type =%d len =%lu)\n", "(type =%d len =%lu)\n",
pos[3], (unsigned long) elen); 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; elems->vendor_ht_cap_len = elen;
break; break;
default: default:
DBG_871X("Unknown Broadcom " DBG_88E("Unknown Broadcom "
"information element ignored " "information element ignored "
"(type =%d len =%lu)\n", "(type =%d len =%lu)\n",
pos[3], (unsigned long) elen); pos[3], (unsigned long) elen);
@ -1067,7 +1067,7 @@ static int rtw_ieee802_11_parse_vendor_specific(u8 *pos, uint elen,
break; break;
default: default:
DBG_871X("unknown vendor specific information " DBG_88E("unknown vendor specific information "
"element ignored (vendor OUI %02x:%02x:%02x " "element ignored (vendor OUI %02x:%02x:%02x "
"len =%lu)\n", "len =%lu)\n",
pos[0], pos[1], pos[2], (unsigned long) elen); 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 (elen > left) {
if (show_errors) { if (show_errors) {
DBG_871X("IEEE 802.11 element " DBG_88E("IEEE 802.11 element "
"parse failed (id =%d elen =%d " "parse failed (id =%d elen =%d "
"left =%lu)\n", "left =%lu)\n",
id, elen, (unsigned long) left); id, elen, (unsigned long) left);
@ -1196,7 +1196,7 @@ enum ParseRes rtw_ieee802_11_parse_elems(u8 *start, uint len,
unknown++; unknown++;
if (!show_errors) if (!show_errors)
break; break;
DBG_871X("IEEE 802.11 element parse " DBG_88E("IEEE 802.11 element parse "
"ignored unknown element (id =%d elen =%d)\n", "ignored unknown element (id =%d elen =%d)\n",
id, elen); id, elen);
break; break;
@ -1276,10 +1276,10 @@ void rtw_macaddr_cfg(u8 *mac_addr)
mac[5] = 0x00; mac[5] = 0x00;
/* use default mac addresss */ /* use default mac addresss */
memcpy(mac_addr, mac, ETH_ALEN); 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) void dump_ies(u8 *buf, u32 buf_len)
@ -1291,7 +1291,7 @@ void dump_ies(u8 *buf, u32 buf_len)
id = *pos; id = *pos;
len = *(pos+1); 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); dump_wps_ie(pos, len);
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
dump_p2p_ie(pos, len); dump_p2p_ie(pos, len);
@ -1322,7 +1322,7 @@ void dump_wps_ie(u8 *ie, u32 ie_len)
id = RTW_GET_BE16(pos); id = RTW_GET_BE16(pos);
len = RTW_GET_BE16(pos + 2); 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); pos+=(4+len);
} }
@ -1417,7 +1417,7 @@ void dump_p2p_ie(u8 *ie, u32 ie_len) {
id = *pos; id = *pos;
len = RTW_GET_LE16(pos+1); 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); 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; 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 ) switch ( frame_type )
{ {
case 1: 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_data_len = RTW_GET_LE16(attr_ptr + 1);
u16 attr_len = attr_data_len + 3; 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 ) if ( attr_id == target_attr_id )
{ {
target_attr_ptr = attr_ptr; target_attr_ptr = attr_ptr;
@ -1679,7 +1679,7 @@ void dump_wfd_ie(u8 *ie, u32 ie_len)
id = *pos; id = *pos;
len = RTW_GET_BE16(pos+1); 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); 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; 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 ) switch ( frame_type )
{ {
case 1: 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 ret = false;
int value; int value;
if ( (value =ATOMIC_INC_RETURN(&dvobj->continual_io_error)) > MAX_CONTINUAL_IO_ERR) { 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; ret = true;
} else { } 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; 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); u8 val = _rtw_read8(adapter, addr);
if (match_read_sniff_ranges(addr, 1)) 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; 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); u16 val = _rtw_read16(adapter, addr);
if (match_read_sniff_ranges(addr, 2)) 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; 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); u32 val = _rtw_read32(adapter, addr);
if (match_read_sniff_ranges(addr, 4)) 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; 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) int dbg_rtw_write8(struct adapter *adapter, u32 addr, u8 val, const char *caller, const int line)
{ {
if (match_write_sniff_ranges(addr, 1)) 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); return _rtw_write8(adapter, addr, val);
} }
int dbg_rtw_write16(struct adapter *adapter, u32 addr, u16 val, const char *caller, const int line) int dbg_rtw_write16(struct adapter *adapter, u32 addr, u16 val, const char *caller, const int line)
{ {
if (match_write_sniff_ranges(addr, 2)) 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); return _rtw_write16(adapter, addr, val);
} }
int dbg_rtw_write32(struct adapter *adapter, u32 addr, u32 val, const char *caller, const int line) int dbg_rtw_write32(struct adapter *adapter, u32 addr, u32 val, const char *caller, const int line)
{ {
if (match_write_sniff_ranges(addr, 4)) 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); 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) 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)) 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); 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 || 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)) ) { if ( _SUCCESS!=(ret =rtw_sitesurvey_cmd(padapter, &pmlmepriv->assoc_ssid, 1, NULL, 0)) ) {
pmlmepriv->to_join = false; pmlmepriv->to_join = false;
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_err_, ("do_join(): site survey return error\n.")); 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) || 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)) (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); 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) { if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
goto handle_tkip_countermeasure; goto handle_tkip_countermeasure;
} else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true) { } 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)); ssid->Ssid, get_fwstate(pmlmepriv));
if (padapter->hw_init_completed ==false) { 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); 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) { if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) {
goto handle_tkip_countermeasure; goto handle_tkip_countermeasure;
} else if (check_fwstate(pmlmepriv, _FW_UNDER_LINKING) == true) { } 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; bssid_valid = false;
if (ssid_valid == false && 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); FUNC_ADPT_ARG(padapter), ssid, ssid_valid, bssid, bssid_valid);
status = _FAIL; status = _FAIL;
goto exit; 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); 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)); FUNC_ADPT_ARG(padapter), get_fwstate(pmlmepriv));
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY) == true) { 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); spin_lock_bh(&pmlmepriv->lock);
RT_TRACE(_module_rtl871x_ioctl_set_c_, _drv_info_, (" change mode!")); 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) { if (*pold_state ==Ndis802_11APMode) {
/* change to other mode from 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 { } else {
if (rtw_is_scan_deny(padapter)) { 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); indicate_wx_scan_complete_event(padapter);
return _SUCCESS; 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; 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 have a table to match country code and RT_CHANNEL_DOMAIN */
/* TODO: should consider 2-character and 3-character country code */ /* 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")) else if (0 == strcmp(country_code, "IN"))
channel_plan = RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN; channel_plan = RT_CHANNEL_DOMAIN_GLOBAL_DOAMIN;
else 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); 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) 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; goto exit;
} }
if ((xmitbuf = rtw_alloc_xmitbuf(pxmitpriv)) == NULL) 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); rtw_free_xmitframe(pxmitpriv, xmit_frame);
xmit_frame = NULL; xmit_frame = NULL;
goto exit; 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 */ /* check if the io_buf can accommodate new cmds */
if (ori_len + cmd_len + 8 > MAX_XMITBUF_SZ) { if (ori_len + cmd_len + 8 > MAX_XMITBUF_SZ) {
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); , ori_len + cmd_len + 8, MAX_XMITBUF_SZ);
return _FAIL; 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->pktlen += cmd_len;
pattrib->last_txcmdsz += 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; 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); 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); 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); 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); 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); 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); 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); 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); 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); */ /* RTW_PUT_LE16((u8*)&cmd.address, us); */
cmd.address = cpu_to_le16(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); 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); */ /* RTW_PUT_LE16((u8*)&cmd.address, ms); */
cmd.address = cpu_to_le16(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); return rtw_IOL_append_cmds(xmit_frame, (u8*)&cmd, 4);
} }
int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame) int rtw_IOL_append_END_cmd(struct xmit_frame *xmit_frame)

8
core/rtw_led.c
View file

@ -30,11 +30,11 @@ void BlinkTimerCallback(void *data)
PLED_871x pLed = (PLED_871x)data; PLED_871x pLed = (PLED_871x)data;
struct adapter *padapter = pLed->padapter; struct adapter *padapter = pLed->padapter;
/* DBG_871X("%s\n", __FUNCTION__); */ /* DBG_88E("%s\n", __FUNCTION__); */
if ( (padapter->bSurpriseRemoved == true) || ( padapter->bDriverStopped == true)) 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; return;
} }
@ -2186,11 +2186,11 @@ void BlinkHandler(PLED_871x pLed)
struct adapter *padapter = pLed->padapter; struct adapter *padapter = pLed->padapter;
struct led_priv *ledpriv = &(padapter->ledpriv); 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)) 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; 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 --; 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); 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 defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) && 1
if (strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) { 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) , FUNC_ADPT_ARG(padapter)
, src->Ssid.Ssid, MAC_ARG(src->MacAddress), src->Configuration.DSConfig , src->Ssid.Ssid, MAC_ARG(src->MacAddress), src->Configuration.DSConfig
, ss_ori, sq_ori, rssi_ori , 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 defined(DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) && 1
if (strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) { 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) , FUNC_ADPT_ARG(padapter)
, dst->Ssid.Ssid, MAC_ARG(dst->MacAddress), dst->PhyInfo.SignalStrength, dst->PhyInfo.SignalQuality, dst->Rssi); , 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)) { 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; bselected = false;
} }
@ -1081,7 +1081,7 @@ void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf)
} }
else 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 (rtw_to_roaming(adapter) != 0) {
if ( --pmlmepriv->to_roaming == 0 if ( --pmlmepriv->to_roaming == 0
|| _SUCCESS != rtw_sitesurvey_cmd(adapter, &pmlmepriv->assoc_ssid, 1, NULL, 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; u8 *pcap = NULL;
u32 capability_len =0; u32 capability_len =0;
/* DBG_871X("free disconnecting network\n"); */ /* DBG_88E("free disconnecting network\n"); */
/* rtw_free_network_nolock(pmlmepriv, pwlan); */ /* 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))) 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); _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) if (rtw_to_roaming(padapter) > 0)
_clr_fwstate_(pmlmepriv, _FW_LINKED); _clr_fwstate_(pmlmepriv, _FW_LINKED);
@ -1348,13 +1348,13 @@ void rtw_scan_abort(struct adapter *adapter)
if (adapter->bDriverStopped || adapter->bSurpriseRemoved) if (adapter->bDriverStopped || adapter->bSurpriseRemoved)
break; 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); rtw_msleep_os(20);
} }
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) { if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) {
if (!adapter->bDriverStopped && !adapter->bSurpriseRemoved) 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); rtw_indicate_scan_done(adapter, true);
} }
pmlmeext->scan_abort = false; 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 */ if (psta) /* update ptarget_sta */
{ {
DBG_871X("%s\n", __FUNCTION__); DBG_88E("%s\n", __FUNCTION__);
psta->aid = pnetwork->join_res; psta->aid = pnetwork->join_res;
psta->mac_id =0; 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->enable = false;
preorder_ctrl->indicate_seq = 0xffff; preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ #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); preorder_ctrl->indicate_seq);
#endif #endif
preorder_ctrl->wend_b = 0xffff; 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->enable = false;
preorder_ctrl->indicate_seq = 0xffff; preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ #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); preorder_ctrl->indicate_seq);
#endif #endif
preorder_ctrl->wend_b = 0xffff; 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 mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct wlan_network *cur_network = &(pmlmepriv->cur_network); 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" RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("\nfw_state:%x, BSSID:"MAC_FMT"\n"
, get_fwstate(pmlmepriv), MAC_ARG(pnetwork->network.MacAddress))); , 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) */ /* 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); padapter->recvpriv.rssi = translate_percentage_to_dbm(ptarget_wlan->network.PhyInfo.SignalStrength);
#if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1 #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" "\n"
, FUNC_ADPT_ARG(padapter) , FUNC_ADPT_ARG(padapter)
, padapter->recvpriv.signal_strength , 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); ap_sta_info_defer_update(adapter, psta);
/* report to upper layer */ /* 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); spin_lock_bh(&psta->lock);
if (psta->passoc_req && psta->assoc_req_len>0) 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->qos_option = 0;
psta->mac_id = (uint)pstassoc->cam_id; psta->mac_id = (uint)pstassoc->cam_id;
/* psta->aid = (uint)pstassoc->cam_id; */ /* psta->aid = (uint)pstassoc->cam_id; */
DBG_871X("%s\n", __FUNCTION__); DBG_88E("%s\n", __FUNCTION__);
/* for ad-hoc mode */ /* for ad-hoc mode */
rtw_hal_set_odm_var(adapter, HAL_ODM_STA_INFO, psta, true); 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 else
mac_id = pstadel->mac_id; 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) { if (mac_id>=0) {
u16 media_status; u16 media_status;
@ -1990,7 +1990,7 @@ void _rtw_join_timeout_handler (struct adapter *adapter)
int do_join_r; 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) if (adapter->bDriverStopped ||adapter->bSurpriseRemoved)
return; return;
@ -2001,14 +2001,14 @@ void _rtw_join_timeout_handler (struct adapter *adapter)
while (1) { while (1) {
pmlmepriv->to_roaming--; pmlmepriv->to_roaming--;
if (rtw_to_roaming(adapter) != 0) { /* try another */ 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)) ) { 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; continue;
} }
break; break;
} else { } 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); rtw_indicate_disconnect(adapter);
break; break;
} }
@ -2040,7 +2040,7 @@ void rtw_scan_timeout_handler (struct adapter *adapter)
unsigned long irqL; unsigned long irqL;
struct mlme_priv *pmlmepriv = &adapter->mlmepriv; 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); spin_lock_bh(&pmlmepriv->lock);
@ -2063,7 +2063,7 @@ static void rtw_auto_scan_handler(struct adapter *padapter)
pmlmepriv->scan_interval--; pmlmepriv->scan_interval--;
if (pmlmepriv->scan_interval == 0) 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); 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) { if (updated) {
DBG_871X("[by_bssid:%u][assoc_ssid:%s]" DBG_88E("[by_bssid:%u][assoc_ssid:%s]"
"[to_roaming:%u] " "[to_roaming:%u] "
"new candidate: %s("MAC_FMT") rssi:%d\n", "new candidate: %s("MAC_FMT") rssi:%d\n",
pmlmepriv->assoc_by_bssid, pmlmepriv->assoc_by_bssid,
@ -2279,18 +2279,18 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
} }
if (candidate == NULL) { if (candidate == NULL) {
DBG_871X("%s: return _FAIL(candidate == NULL)\n", __FUNCTION__); DBG_88E("%s: return _FAIL(candidate == NULL)\n", __FUNCTION__);
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
} else { } 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.Ssid.Ssid, MAC_ARG(candidate->network.MacAddress),
candidate->network.Configuration.DSConfig); candidate->network.Configuration.DSConfig);
} }
/* check for situation of _FW_LINKED */ /* check for situation of _FW_LINKED */
if (check_fwstate(pmlmepriv, _FW_LINKED) == true) { if (check_fwstate(pmlmepriv, _FW_LINKED) == true) {
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_disassoc_cmd(adapter, 0, true);
rtw_indicate_disconnect(adapter); rtw_indicate_disconnect(adapter);
@ -2302,7 +2302,7 @@ int rtw_select_and_join_from_scanned_queue(struct mlme_priv *pmlmepriv )
{ {
u8 CurrentAntenna; u8 CurrentAntenna;
rtw_hal_get_def_var(adapter, HAL_DEF_CURRENT_ANTENNA, &(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 ==candidate->network.PhyInfo.Optimum_antenna)?"A":"B",
(2 ==CurrentAntenna)?"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)) if (is_wep_enc(psetkeyparm->algorithm))
psecuritypriv->key_mask |= BIT(psetkeyparm->keyid); 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)); 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) { 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)) if ((!pmlmeinfo->HT_info_enable) || (!pmlmeinfo->HT_caps_enable))
return; return;
DBG_871X("+rtw_update_ht_cap()\n"); DBG_88E("+rtw_update_ht_cap()\n");
/* maybe needs check if ap supports rx ampdu. */ /* maybe needs check if ap supports rx ampdu. */
if ((phtpriv->ampdu_enable ==false) &&(pregistrypriv->ampdu_enable ==1)) 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 = (pht_capie->ampdu_params_info & IEEE80211_HT_CAP_AMPDU_FACTOR);
max_ampdu_sz = 1 << (max_ampdu_sz+3); /* max_ampdu_sz (kbytes); */ 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; 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; pmlmeinfo->SM_PS = (le16_to_cpu(pmlmeinfo->HT_caps.u.HT_cap_element.HT_caps_info) & 0x0C) >> 2;
if (pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC) { if (pmlmeinfo->SM_PS == WLAN_HT_CAP_SM_PS_STATIC) {
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; psta = pattrib->psta;
else 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); psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra);
} }
if (psta == NULL) if (psta == NULL)
{ {
DBG_871X("%s, psta ==NUL\n", __func__); DBG_88E("%s, psta ==NUL\n", __func__);
return; return;
} }
if (!(psta->state &_FW_LINKED)) 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; return;
} }
@ -2973,7 +2973,7 @@ void rtw_issue_addbareq_cmd(struct adapter *padapter, struct xmit_frame *pxmitfr
if (0 ==issued) 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); psta->htpriv.candidate_tid_bitmap |= BIT((u8)priority);
rtw_addbareq_cmd(padapter, (u8) priority, pattrib->ra); 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; pnetwork = &pmlmepriv->cur_network;
if (0 < rtw_to_roaming(padapter)) { 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.Ssid, MAC_ARG(pnetwork->network.MacAddress),
pnetwork->network.Ssid.SsidLength); pnetwork->network.Ssid.SsidLength);
memcpy(&pmlmepriv->assoc_ssid, &pnetwork->network.Ssid, sizeof(struct ndis_802_11_ssid)); 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)) ) { if ( _SUCCESS ==(do_join_r =rtw_do_join(padapter)) ) {
break; break;
} else { } 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--; pmlmepriv->to_roaming--;
if (0< rtw_to_roaming(padapter)) { if (0< rtw_to_roaming(padapter)) {
continue; continue;
} else { } 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); rtw_indicate_disconnect(padapter);
break; 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}; char buf[768] = {0};
_rtw_odm_dbg_comp_msg(adapter, buf, 768); _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) 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}; char buf[100] = {0};
_rtw_odm_dbg_comp_msg(adapter, buf, 100); _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) 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}; char buf[256] = {0};
_rtw_odm_dbg_comp_msg(adapter, buf, 256); _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, 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 adapter *padapter = pwdinfo->padapter;
struct sta_priv *pstapriv = &padapter->stapriv; struct sta_priv *pstapriv = &padapter->stapriv;
DBG_871X("%s\n", __FUNCTION__); DBG_88E("%s\n", __FUNCTION__);
pdata_attr = rtw_zmalloc(MAX_P2P_IE_LEN); 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 oui_subtype = P2P_GO_DISC_REQUEST;
u8 dialogToken =0; u8 dialogToken =0;
DBG_871X("[%s]\n", __FUNCTION__); DBG_88E("[%s]\n", __FUNCTION__);
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) 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 }; u8 p2pie[8] = { 0x00 };
u32 p2pielen = 0; u32 p2pielen = 0;
DBG_871X("[%s]\n", __FUNCTION__); DBG_88E("[%s]\n", __FUNCTION__);
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) 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 }; u8 noa_attr_content[32] = { 0x00 };
u32 p2pielen = 0; u32 p2pielen = 0;
DBG_871X("[%s]\n", __FUNCTION__); DBG_88E("[%s]\n", __FUNCTION__);
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL) 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); 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; return true;
} }
@ -2576,7 +2576,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
} }
else 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; result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
return( result ); return( result );
@ -2596,7 +2596,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
if ( !p2p_ie ) 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; result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); 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) ) 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. */ pwdinfo->peer_intent = attr_content; /* include both intent and tie breaker values. */
if ( pwdinfo->intent == ( pwdinfo->peer_intent >> 1 ) ) if ( pwdinfo->intent == ( pwdinfo->peer_intent >> 1 ) )
@ -2678,7 +2678,7 @@ u8 process_p2p_group_negotation_req( struct wifidirect_info *pwdinfo, u8 *pframe
if ( ch_num_inclusioned == 0) 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; result = P2P_STATUS_FAIL_NO_COMMON_CH;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
break; break;
@ -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. * Change our operating channel as peer's for compatibility.
*/ */
pwdinfo->operating_channel = peer_operating_ch; 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 else
{ {
/* Take first channel of ch_list_inclusioned as operating channel */ /* Take first channel of ch_list_inclusioned as operating channel */
pwdinfo->operating_channel = ch_list_inclusioned[0]; pwdinfo->operating_channel = ch_list_inclusioned[0];
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 }; u8 attr_content[ 10 ] = { 0x00 };
u32 attr_contentlen = 0; 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); rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen);
if ( attr_contentlen ) if ( attr_contentlen )
{ {
pwdinfo->wfd_info->peer_rtsp_ctrlport = RTW_GET_BE16( attr_content + 2 ); 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 */ #endif /* CONFIG_P2P */
@ -2768,7 +2768,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
} }
else 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; result = P2P_STATUS_FAIL_INCOMPATIBLE_PARAM;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); 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); rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen);
if ( attr_contentlen == 1 ) { 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 ) if ( attr_content == P2P_STATUS_SUCCESS )
{ {
/* Do nothing. */ /* Do nothing. */
@ -2837,7 +2837,7 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
attr_contentlen = 0; attr_contentlen = 0;
if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen) ) if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_GO_INTENT , &attr_content, &attr_contentlen) )
{ {
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. */ pwdinfo->peer_intent = attr_content; /* include both intent and tie breaker values. */
if ( pwdinfo->intent == ( pwdinfo->peer_intent >> 1 ) ) if ( pwdinfo->intent == ( pwdinfo->peer_intent >> 1 ) )
@ -2890,21 +2890,21 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
attr_contentlen = 0; attr_contentlen = 0;
if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen)) if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen))
{ {
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]; pwdinfo->peer_operating_ch = operatingch_info[4];
} }
/* Try to get the channel list information */ /* Try to get the channel list information */
if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, pwdinfo->channel_list_attr, &pwdinfo->channel_list_attr_len ) ) if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_CH_LIST, pwdinfo->channel_list_attr, &pwdinfo->channel_list_attr_len ) )
{ {
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); peer_ch_num = rtw_p2p_get_peer_ch_list(pwdinfo, pwdinfo->channel_list_attr, pwdinfo->channel_list_attr_len, peer_ch_list);
ch_num_inclusioned = rtw_p2p_ch_inclusion(&padapter->mlmeextpriv, peer_ch_list, peer_ch_num, ch_list_inclusioned); ch_num_inclusioned = rtw_p2p_ch_inclusion(&padapter->mlmeextpriv, peer_ch_list, peer_ch_num, ch_list_inclusioned);
if ( ch_num_inclusioned == 0) if ( ch_num_inclusioned == 0)
{ {
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; result = P2P_STATUS_FAIL_NO_COMMON_CH;
rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL); rtw_p2p_set_state(pwdinfo, P2P_STATE_GONEGO_FAIL);
break; break;
@ -2931,13 +2931,13 @@ u8 process_p2p_group_negotation_resp( struct wifidirect_info *pwdinfo, u8 *pfram
* Change our operating channel as peer's for compatibility. * Change our operating channel as peer's for compatibility.
*/ */
pwdinfo->operating_channel = peer_operating_ch; pwdinfo->operating_channel = peer_operating_ch;
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 else
{ {
/* Take first channel of ch_list_inclusioned as operating channel */ /* Take first channel of ch_list_inclusioned as operating channel */
pwdinfo->operating_channel = ch_list_inclusioned[0]; pwdinfo->operating_channel = ch_list_inclusioned[0];
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 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 */ /* 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); rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_content, &attr_contentlen);
if ( attr_contentlen == 1 ) 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; result = attr_content;
if ( attr_content == P2P_STATUS_SUCCESS ) 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 ); memset( groupid, 0x00, 38 );
if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen) ) if ( rtw_get_p2p_attr_content( p2p_ie, p2p_ielen, P2P_ATTR_GROUP_ID, groupid, &attr_contentlen) )
{ {
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.go_device_addr, &groupid[0], ETH_ALEN );
memcpy( pwdinfo->groupid_info.ssid, &groupid[6], attr_contentlen - 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; attr_contentlen = 0;
if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen) ) if ( rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_OPERATING_CH, operatingch_info, &attr_contentlen) )
{ {
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]; 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)); rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo));
#ifdef CONFIG_DEBUG_CFG80211 #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 #endif
pcfg80211_wdinfo->is_ro_ch = false; 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, rtw_cfg80211_remain_on_channel_expired(padapter,
pcfg80211_wdinfo->remain_on_ch_cookie, 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]; dialogToken = frame_body[6];
#ifdef CONFIG_DEBUG_CFG80211 #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); cpu_to_be32( *( ( u32* ) ( frame_body + 1 ) ) ), OUI_Subtype, dialogToken);
#endif #endif
@ -3405,7 +3405,7 @@ void rtw_append_wfd_ie(struct adapter *padapter, u8 *buf, u32* len)
} }
else 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); */ /* 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]; dialogToken = frame_body[7];
is_p2p_frame = OUI_Subtype; is_p2p_frame = OUI_Subtype;
#ifdef CONFIG_DEBUG_CFG80211 #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); cpu_to_be32( *( ( u32* ) ( frame_body + 2 ) ) ), OUI_Subtype, dialogToken);
#endif #endif
@ -3547,7 +3547,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
nego_info->state = 0; nego_info->state = 0;
dump_p2p_attr_ch_list(p2p_ie, p2p_ielen, ch_list_buf, 128); 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); (tx ==true)?"Tx":"Rx", dialogToken, (intent>>1), intent&0x1 ? "+" : "-", listen_ch, op_ch, ch_list_buf);
break; 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); 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); (tx ==true)?"Tx":"Rx", dialogToken, (intent>>1), intent&0x1 ? "+" : "-", status, op_ch, ch_list_buf);
if (!tx) { 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); 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); (tx ==true)?"Tx":"Rx", dialogToken, status, op_ch, ch_list_buf);
break; break;
} }
@ -3634,7 +3634,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
invit_info->state = 0; invit_info->state = 0;
dump_p2p_attr_ch_list(p2p_ie, p2p_ielen, ch_list_buf, 128); 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); (tx ==true)?"Tx":"Rx", dialogToken, flags, op_ch, ch_list_buf);
break; 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 #ifdef CONFIG_P2P_INVITE_IOT
if (tx && *cont ==7) 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 */ *cont = 8; /* unknow group status */
} }
#endif /* CONFIG_P2P_INVITE_IOT */ #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); 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); (tx ==true)?"Tx":"Rx", dialogToken, status, op_ch, ch_list_buf);
if (!tx) { if (!tx) {
@ -3676,11 +3676,11 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
break; break;
} }
case P2P_DEVDISC_REQ: 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; break;
case P2P_DEVDISC_RESP: case P2P_DEVDISC_RESP:
cont = rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, NULL, &cont_len); 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; break;
case P2P_PROVISION_DISC_REQ: 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 p2p_ielen = 0;
uint contentlen = 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) */ /* if (tx) */
{ {
@ -3705,7 +3705,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
else else
{ {
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
DBG_871X("provdisc_req_issued is true\n"); DBG_88E("provdisc_req_issued is true\n");
#endif /* CONFIG_DEBUG_CFG80211 */ #endif /* CONFIG_DEBUG_CFG80211 */
pwdev_priv->provdisc_req_issued = true;/* case: p2p_devices connection before Nego req. */ 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; break;
case P2P_PROVISION_DISC_RESP: 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; break;
default: 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; break;
} }
@ -3731,7 +3731,7 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
dialogToken = frame_body[6]; dialogToken = frame_body[6];
#ifdef CONFIG_DEBUG_CFG80211 #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); cpu_to_be32( *( ( u32* ) ( frame_body + 1 ) ) ), OUI_Subtype, dialogToken);
#endif #endif
@ -3740,26 +3740,26 @@ int rtw_p2p_check_frames(struct adapter *padapter, const u8 *buf, u32 len, u8 tx
switch (OUI_Subtype) switch (OUI_Subtype)
{ {
case P2P_NOTICE_OF_ABSENCE: 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; break;
case P2P_PRESENCE_REQUEST: 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; break;
case P2P_PRESENCE_RESPONSE: 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; break;
case P2P_GO_DISC_REQUEST: 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; break;
default: 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; break;
} }
} }
else 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; 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) if (pwrpriv->smart_ps != 0)
{ {
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))); 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)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
return; return;
DBG_871X( "[%s] In\n", __FUNCTION__ ); DBG_88E( "[%s] In\n", __FUNCTION__ );
/* Reset the operation channel information */ /* Reset the operation channel information */
pwdinfo->rx_invitereq_info.operation_ch[0] = 0; pwdinfo->rx_invitereq_info.operation_ch[0] = 0;
#ifdef CONFIG_P2P #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)) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
return; return;
DBG_871X( "[%s] In\n", __FUNCTION__ ); DBG_88E( "[%s] In\n", __FUNCTION__ );
/* Reset the operation channel information */ /* Reset the operation channel information */
pwdinfo->p2p_info.operation_ch[0] = 0; pwdinfo->p2p_info.operation_ch[0] = 0;
#ifdef CONFIG_P2P #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)) { if (!_rtw_p2p_chk_state(wdinfo, state)) {
enum P2P_STATE old_state = _rtw_p2p_state(wdinfo); enum P2P_STATE old_state = _rtw_p2p_state(wdinfo);
_rtw_p2p_set_state(wdinfo, state); _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)) , rtw_p2p_state_txt(old_state), rtw_p2p_state_txt(_rtw_p2p_state(wdinfo))
); );
} else { } 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)) , 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) { if (_rtw_p2p_pre_state(wdinfo) != state) {
enum P2P_STATE old_state = _rtw_p2p_pre_state(wdinfo); enum P2P_STATE old_state = _rtw_p2p_pre_state(wdinfo);
_rtw_p2p_set_pre_state(wdinfo, state); _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)) , rtw_p2p_state_txt(old_state), rtw_p2p_state_txt(_rtw_p2p_pre_state(wdinfo))
); );
} else { } 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)) , 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) { if (wdinfo->role != role) {
enum P2P_ROLE old_role = wdinfo->role; enum P2P_ROLE old_role = wdinfo->role;
_rtw_p2p_set_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) , rtw_p2p_role_txt(old_role), rtw_p2p_role_txt(wdinfo->role)
); );
} else { } 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) , 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); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
if (padapter->hw_init_completed == false) { 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); __func__, padapter->hw_init_completed);
return; return;
} }
@ -45,14 +45,14 @@ void _ips_enter(struct adapter * padapter)
pwrpriv->ips_mode = pwrpriv->ips_mode_req; pwrpriv->ips_mode = pwrpriv->ips_mode_req;
pwrpriv->ips_enter_cnts++; 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 #ifdef CONFIG_BT_COEXIST
BTDM_TurnOffBtCoexistBeforeEnterIPS(padapter); BTDM_TurnOffBtCoexistBeforeEnterIPS(padapter);
#endif #endif
if (rf_off == pwrpriv->change_rfpwrstate ) if (rf_off == pwrpriv->change_rfpwrstate )
{ {
pwrpriv->bpower_saving = true; 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) if (pwrpriv->ips_mode == IPS_LEVEL_2)
pwrpriv->bkeepfwalive = true; pwrpriv->bkeepfwalive = true;
@ -83,14 +83,14 @@ int _ips_leave(struct adapter * padapter)
pwrpriv->bips_processing = true; pwrpriv->bips_processing = true;
pwrpriv->change_rfpwrstate = rf_on; pwrpriv->change_rfpwrstate = rf_on;
pwrpriv->ips_leave_cnts++; 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) { if ((result = rtw_ips_pwr_up(padapter)) == _SUCCESS) {
pwrpriv->rf_pwrstate = rf_on; 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->bips_processing = false;
pwrpriv->bkeepfwalive = false; pwrpriv->bkeepfwalive = false;
@ -130,7 +130,7 @@ static bool rtw_pwr_unassociated_idle(struct adapter *adapter)
bool ret = false; bool ret = false;
if (adapter_to_pwrctl(adapter)->ips_deny_time >= jiffies) { 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; goto exit;
} }
@ -182,8 +182,8 @@ static bool rtw_pwr_unassociated_idle(struct adapter *adapter)
if (pxmit_priv->free_xmitbuf_cnt != NR_XMITBUFF || if (pxmit_priv->free_xmitbuf_cnt != NR_XMITBUFF ||
pxmit_priv->free_xmit_extbuf_cnt != NR_XMIT_EXTBUFF) { pxmit_priv->free_xmit_extbuf_cnt != NR_XMIT_EXTBUFF) {
DBG_871X_LEVEL(_drv_always_, "There are some pkts to transmit\n"); DBG_88E_LEVEL(_drv_always_, "There are some pkts to transmit\n");
DBG_871X_LEVEL(_drv_info_, "free_xmitbuf_cnt: %d, free_xmit_extbuf_cnt: %d\n", DBG_88E_LEVEL(_drv_info_, "free_xmitbuf_cnt: %d, free_xmit_extbuf_cnt: %d\n",
pxmit_priv->free_xmitbuf_cnt, pxmit_priv->free_xmit_extbuf_cnt); pxmit_priv->free_xmitbuf_cnt, pxmit_priv->free_xmit_extbuf_cnt);
goto exit; goto exit;
} }
@ -208,7 +208,7 @@ void rtw_ps_processor(struct adapter*padapter)
if (pwrpriv->bips_processing == true) if (pwrpriv->bips_processing == true)
goto exit; 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) if (pwrpriv->bHWPwrPindetect)
{ {
#ifdef CONFIG_AUTOSUSPEND #ifdef CONFIG_AUTOSUSPEND
@ -220,7 +220,7 @@ void rtw_ps_processor(struct adapter*padapter)
pwrpriv->ps_flag = true; pwrpriv->ps_flag = true;
rfpwrstate = RfOnOffDetect(padapter); 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!= pwrpriv->rf_pwrstate)
{ {
if (rfpwrstate == rf_off) if (rfpwrstate == rf_off)
@ -239,7 +239,7 @@ void rtw_ps_processor(struct adapter*padapter)
#endif /* CONFIG_AUTOSUSPEND */ #endif /* CONFIG_AUTOSUSPEND */
{ {
rfpwrstate = RfOnOffDetect(padapter); 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) if (rfpwrstate!= pwrpriv->rf_pwrstate)
{ {
@ -255,7 +255,7 @@ void rtw_ps_processor(struct adapter*padapter)
pwrpriv->change_rfpwrstate = rf_on; pwrpriv->change_rfpwrstate = rf_on;
rtw_hw_resume(padapter ); 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 ++; 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)) 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) #if defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND)
#else #else
pwrpriv->change_rfpwrstate = rf_off; 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 defined (CONFIG_BT_COEXIST)&& defined (CONFIG_AUTOSUSPEND)
if (true ==pwrpriv->bInternalAutoSuspend) { 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 { } else {
pwrpriv->change_rfpwrstate = rf_off; pwrpriv->change_rfpwrstate = rf_off;
padapter->bCardDisableWOHSM = true; 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); autosuspend_enter(padapter);
} }
#else #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); }while (rtw_get_passing_time_ms(cpwm_polling_start_time) < LPS_RPWM_WAIT_MS);
if (pollingRes == _FAIL) if (pollingRes == _FAIL)
DBG_871X("%s polling cpwm timeout!!!!!!!!!!\n", __FUNCTION__); DBG_88E("%s polling cpwm timeout!!!!!!!!!!\n", __FUNCTION__);
} }
#endif #endif
} }
@ -451,7 +451,7 @@ u8 PS_RDY_CHECK(struct adapter * padapter)
if ( (padapter->securitypriv.dot11AuthAlgrthm == dot11AuthAlgrthm_8021X) && (padapter->securitypriv.binstallGrpkey == false) ) 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; 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) if (pwdinfo->opp_ps == 0)
#endif /* CONFIG_P2P */ #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; pwrpriv->pwr_mode = ps_mode;
rtw_set_rpwm(padapter, PS_STATE_S4); rtw_set_rpwm(padapter, PS_STATE_S4);
rtw_hal_set_hwreg(padapter, HW_VAR_H2C_FW_PWRMODE, (u8 *)(&ps_mode)); 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 #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->bFwCurrentInPSMode = true;
pwrpriv->pwr_mode = ps_mode; pwrpriv->pwr_mode = ps_mode;
pwrpriv->smart_ps = smart_ps; pwrpriv->smart_ps = smart_ps;
@ -549,14 +549,14 @@ s32 LPS_RF_ON_check(struct adapter *padapter, u32 delay_ms)
if (true == padapter->bSurpriseRemoved) if (true == padapter->bSurpriseRemoved)
{ {
err = -2; err = -2;
DBG_871X("%s: device surprise removed!!\n", __FUNCTION__); DBG_88E("%s: device surprise removed!!\n", __FUNCTION__);
break; break;
} }
if (rtw_get_passing_time_ms(start_time) > delay_ms) if (rtw_get_passing_time_ms(start_time) > delay_ms)
{ {
err = -1; err = -1;
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; break;
} }
rtw_usleep_os(100); rtw_usleep_os(100);
@ -585,7 +585,7 @@ void LPS_Enter(struct adapter *padapter)
if (pwrpriv->pwr_mode == PS_MODE_ACTIVE) if (pwrpriv->pwr_mode == PS_MODE_ACTIVE)
{ {
pwrpriv->bpower_saving = true; 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 */ /* For Tenda W311R IOT issue */
rtw_set_ps_mode(padapter, pwrpriv->power_mgnt, pwrpriv->smart_ps, 0x40); 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) if (check_fwstate(pmlmepriv, _FW_LINKED) == true)
{ /* connect */ { /* connect */
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
@ -744,7 +744,7 @@ extern int rtw_resume_process(struct adapter *padapter);
static void rtw_early_suspend(struct early_suspend *h) static void rtw_early_suspend(struct early_suspend *h)
{ {
struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend);
DBG_871X("%s\n", __FUNCTION__); DBG_88E("%s\n", __FUNCTION__);
rtw_set_do_late_resume(pwrpriv, false); 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 dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv);
struct adapter *adapter = dvobj->if1; struct adapter *adapter = dvobj->if1;
DBG_871X("%s\n", __FUNCTION__); DBG_88E("%s\n", __FUNCTION__);
if (pwrpriv->do_late_resume) { if (pwrpriv->do_late_resume) {
rtw_set_do_late_resume(pwrpriv, false); rtw_set_do_late_resume(pwrpriv, false);
rtw_resume_process(adapter); 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) 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 */ /* jeff: set the early suspend level before blank screen, so we wll do late resume after scree is lit */
pwrpriv->early_suspend.level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN - 20; pwrpriv->early_suspend.level = EARLY_SUSPEND_LEVEL_BLANK_SCREEN - 20;
@ -775,7 +775,7 @@ void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv)
void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv) void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
{ {
DBG_871X("%s\n", __FUNCTION__); DBG_88E("%s\n", __FUNCTION__);
rtw_set_do_late_resume(pwrpriv, false); 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) static void rtw_early_suspend(android_early_suspend_t *h)
{ {
struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend); struct pwrctrl_priv *pwrpriv = container_of(h, struct pwrctrl_priv, early_suspend);
DBG_871X("%s\n", __FUNCTION__); DBG_88E("%s\n", __FUNCTION__);
rtw_set_do_late_resume(pwrpriv, false); 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 dvobj_priv *dvobj = pwrctl_to_dvobj(pwrpriv);
struct adapter *adapter = dvobj->if1; struct adapter *adapter = dvobj->if1;
DBG_871X("%s\n", __FUNCTION__); DBG_88E("%s\n", __FUNCTION__);
if (pwrpriv->do_late_resume) { if (pwrpriv->do_late_resume) {
rtw_set_do_late_resume(pwrpriv, false); rtw_set_do_late_resume(pwrpriv, false);
rtw_resume_process(adapter); 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) 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 */ /* jeff: set the early suspend level before blank screen, so we wll do late resume after scree is lit */
pwrpriv->early_suspend.level = ANDROID_EARLY_SUSPEND_LEVEL_BLANK_SCREEN - 20; pwrpriv->early_suspend.level = ANDROID_EARLY_SUSPEND_LEVEL_BLANK_SCREEN - 20;
@ -823,7 +823,7 @@ void rtw_register_early_suspend(struct pwrctrl_priv *pwrpriv)
void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv) void rtw_unregister_early_suspend(struct pwrctrl_priv *pwrpriv)
{ {
DBG_871X("%s\n", __FUNCTION__); DBG_88E("%s\n", __FUNCTION__);
rtw_set_do_late_resume(pwrpriv, false); 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); pwrpriv->ips_deny_time = jiffies + rtw_ms_to_systime(ips_deffer_ms);
if (pwrpriv->ps_processing) { 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) while (pwrpriv->ps_processing && rtw_get_passing_time_ms(start) <= 3000)
rtw_msleep_os(10); rtw_msleep_os(10);
if (pwrpriv->ps_processing) if (pwrpriv->ps_processing)
DBG_871X("%s wait ps_processing timeout\n", __func__); DBG_88E("%s wait ps_processing timeout\n", __func__);
else 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)) { 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) while (rtw_hal_sreset_inprogress(padapter) && rtw_get_passing_time_ms(start) <= 4000)
rtw_msleep_os(10); rtw_msleep_os(10);
if (rtw_hal_sreset_inprogress(padapter)) 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 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) { if (pwrpriv->bInternalAutoSuspend == false && pwrpriv->bInSuspend) {
DBG_871X("%s wait bInSuspend...\n", __func__); DBG_88E("%s wait bInSuspend...\n", __func__);
while (pwrpriv->bInSuspend while (pwrpriv->bInSuspend
&& ((rtw_get_passing_time_ms(start) <= 3000 && !rtw_is_do_late_resume(pwrpriv)) && ((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))) || (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); rtw_msleep_os(10);
} }
if (pwrpriv->bInSuspend) if (pwrpriv->bInSuspend)
DBG_871X("%s wait bInSuspend timeout\n", __func__); DBG_88E("%s wait bInSuspend timeout\n", __func__);
else else
DBG_871X("%s wait bInSuspend done\n", __func__); DBG_88E("%s wait bInSuspend done\n", __func__);
} }
/* System suspend is not allowed to wakeup */ /* 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 (LINUX_VERSION_CODE>=KERNEL_VERSION(2, 6, 33))
if (usb_autopm_get_interface(adapter_to_dvobj(padapter)->pusbintf) < 0) 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)) #elif (LINUX_VERSION_CODE>=KERNEL_VERSION(2, 6, 20))
usb_autopm_disable(adapter_to_dvobj(padapter)->pusbintf); 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 ) { if ( mode == IPS_NORMAL || mode == IPS_LEVEL_2 ) {
rtw_ips_mode_req(pwrctrlpriv, mode); 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; return 0;
} }
else if (mode ==IPS_NONE) { else if (mode ==IPS_NONE) {
rtw_ips_mode_req(pwrctrlpriv, mode); 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)) ) if ((padapter->bSurpriseRemoved == 0)&&(_FAIL == rtw_pwr_wakeup(padapter)) )
return -EFAULT; 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) 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; return cnt;
} }
@ -403,14 +403,14 @@ sint recvframe_chkmic(struct adapter *adapter, union recv_frame *precvframe) {
mickey =&psecuritypriv->dot118021XGrprxmickey[prxattrib->key_index].skey[0]; mickey =&psecuritypriv->dot118021XGrprxmickey[prxattrib->key_index].skey[0];
RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("\n recvframe_chkmic: bcmc key\n")); 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); */ /* psecuritypriv->dot118021XGrpKeyid, pmlmeinfo->key_index, rxdata_key_idx); */
if (psecuritypriv->binstallGrpkey ==false) if (psecuritypriv->binstallGrpkey ==false)
{ {
res =_FAIL; res =_FAIL;
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("\n recvframe_chkmic:didn't install group key!!!!!!!!!!\n")); 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; 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)); 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)); 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 else
{ {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" mic error :prxattrib->bdecrypted =%d ", prxattrib->bdecrypted)); 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; res =_FAIL;
@ -525,7 +525,7 @@ static union recv_frame *decryptor(struct adapter *padapter, union recv_frame *p
if (prxattrib->key_index > WEP_KEYS) 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) { switch (prxattrib->encrypt) {
case _WEP40_: case _WEP40_:
@ -546,7 +546,7 @@ static union recv_frame *decryptor(struct adapter *padapter, union recv_frame *p
psecuritypriv->hw_decrypted =false; psecuritypriv->hw_decrypted =false;
#ifdef DBG_RX_DECRYPTOR #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); , prxattrib->bdecrypted , prxattrib->encrypt, psecuritypriv->hw_decrypted);
#endif #endif
@ -572,12 +572,12 @@ static union recv_frame *decryptor(struct adapter *padapter, union recv_frame *p
{ {
psecuritypriv->hw_decrypted =true; psecuritypriv->hw_decrypted =true;
#ifdef DBG_RX_DECRYPTOR #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); , prxattrib->bdecrypted , prxattrib->encrypt, psecuritypriv->hw_decrypted);
#endif #endif
} else { } else {
#ifdef DBG_RX_DECRYPTOR #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); , prxattrib->bdecrypted , prxattrib->encrypt, psecuritypriv->hw_decrypted);
#endif #endif
} }
@ -745,7 +745,7 @@ void process_pwrbit_data(struct adapter *padapter, union recv_frame *precv_frame
stop_sta_xmit(padapter, psta); 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 else
@ -757,7 +757,7 @@ void process_pwrbit_data(struct adapter *padapter, union recv_frame *precv_frame
wakeup_sta_to_xmit(padapter, psta); 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)) { if (_rtw_memcmp(myhwaddr, pattrib->src, ETH_ALEN)) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" SA ==myself\n")); RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" SA ==myself\n"));
#ifdef DBG_RX_DROP_FRAME #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)); __FUNCTION__, MAC_ARG(pattrib->src), MAC_ARG(myhwaddr));
#endif #endif
ret = _FAIL; ret = _FAIL;
@ -1019,7 +1019,7 @@ sint ap2sta_data_frame(
RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,
(" ap2sta_data_frame: compare DA fail; DA ="MAC_FMT"\n", MAC_ARG(pattrib->dst))); (" ap2sta_data_frame: compare DA fail; DA ="MAC_FMT"\n", MAC_ARG(pattrib->dst)));
#ifdef DBG_RX_DROP_FRAME #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 #endif
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
@ -1034,14 +1034,14 @@ sint ap2sta_data_frame(
(" ap2sta_data_frame: compare BSSID fail ; BSSID ="MAC_FMT"\n", MAC_ARG(pattrib->bssid))); (" 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))); RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("mybssid ="MAC_FMT"\n", MAC_ARG(mybssid)));
#ifdef DBG_RX_DROP_FRAME #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)); __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 #endif
if (!bmcast) 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); issue_deauth(adapter, pattrib->bssid, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
} }
@ -1057,7 +1057,7 @@ sint ap2sta_data_frame(
if (*psta == NULL) { if (*psta == NULL) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("ap2sta: can't get psta under STATION_MODE ; drop pkt\n")); RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("ap2sta: can't get psta under STATION_MODE ; drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME #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 #endif
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
@ -1090,7 +1090,7 @@ sint ap2sta_data_frame(
if (*psta == NULL) { if (*psta == NULL) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("can't get psta under MP_MODE ; drop pkt\n")); RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("can't get psta under MP_MODE ; drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME #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 #endif
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
@ -1110,7 +1110,7 @@ sint ap2sta_data_frame(
*psta = rtw_get_stainfo(pstapriv, pattrib->bssid); /* get sta_info */ *psta = rtw_get_stainfo(pstapriv, pattrib->bssid); /* get sta_info */
if (*psta == NULL) if (*psta == NULL)
{ {
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); issue_deauth(adapter, pattrib->bssid, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
} }
@ -1118,7 +1118,7 @@ sint ap2sta_data_frame(
ret = _FAIL; ret = _FAIL;
#ifdef DBG_RX_DROP_FRAME #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 #endif
} }
@ -1161,7 +1161,7 @@ sint sta2ap_data_frame(
if (*psta == NULL) if (*psta == NULL)
{ {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("can't get psta under AP_MODE; drop pkt\n")); 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); issue_deauth(adapter, pattrib->src, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
@ -1188,7 +1188,7 @@ sint sta2ap_data_frame(
ret = RTW_RX_HANDLED; ret = RTW_RX_HANDLED;
goto exit; 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); issue_deauth(adapter, pattrib->src, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
ret = RTW_RX_HANDLED; ret = RTW_RX_HANDLED;
goto exit; 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; u8 *pframe = precv_frame->u.hdr.rx_data;
/* uint len = precv_frame->u.hdr.len; */ /* 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) 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) 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->expire_to = pstapriv->expire_to;
psta->state ^= WIFI_STA_ALIVE_CHK_STATE; 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; 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); 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(&psta->sleep_q.lock); */
spin_unlock_bh(&pxmitpriv->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 (pstapriv->tim_bitmap&BIT(psta->aid))
{ {
if (psta->sleepq_len == 0) 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 with More data bit = 0 to indicate we have no buffered packets */
issue_nulldata(padapter, psta->hwaddr, 0, 0, 0); issue_nulldata(padapter, psta->hwaddr, 0, 0, 0);
} }
else 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; psta->sleepq_len =0;
} }
@ -1469,7 +1469,7 @@ sint validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_f
if (pbssid == NULL) { if (pbssid == NULL) {
#ifdef DBG_RX_DROP_FRAME #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 #endif
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
@ -1515,7 +1515,7 @@ sint validate_recv_data_frame(struct adapter *adapter, union recv_frame *precv_f
if (ret ==_FAIL) { if (ret ==_FAIL) {
#ifdef DBG_RX_DROP_FRAME #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 #endif
goto exit; goto exit;
} else if (ret == RTW_RX_HANDLED) { } 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) { if (psta == NULL) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" after to_fr_ds_chk; psta == NULL\n")); RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, (" after to_fr_ds_chk; psta == NULL\n"));
#ifdef DBG_RX_DROP_FRAME #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 #endif
ret = _FAIL; ret = _FAIL;
goto exit; 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")); RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("decache : drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME #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 #endif
ret = _FAIL; ret = _FAIL;
goto exit; goto exit;
@ -1633,7 +1633,7 @@ static sint validate_80211w_mgmt(struct adapter *adapter, union recv_frame *prec
mgmt_DATA = rtw_zmalloc(data_len); mgmt_DATA = rtw_zmalloc(data_len);
if (mgmt_DATA == NULL) if (mgmt_DATA == NULL)
{ {
DBG_871X("%s mgmt allocate fail !!!!!!!!!\n", __FUNCTION__); DBG_88E("%s mgmt allocate fail !!!!!!!!!\n", __FUNCTION__);
goto validate_80211w_fail; goto validate_80211w_fail;
} }
/*/* dump the packet content before decrypt */ /*/* 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) if (!precv_frame)
{ {
DBG_871X("%s mgmt descrypt fail !!!!!!!!!\n", __FUNCTION__); DBG_88E("%s mgmt descrypt fail !!!!!!!!!\n", __FUNCTION__);
goto validate_80211w_fail; 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); BIP_ret = rtw_BIP_verify(adapter, (u8 * )precv_frame);
if (BIP_ret == _FAIL) if (BIP_ret == _FAIL)
{ {
/* DBG_871X("802.11w BIP verify fail\n"); */ /* DBG_88E("802.11w BIP verify fail\n"); */
goto validate_80211w_fail; goto validate_80211w_fail;
} }
else if (BIP_ret == RTW_RX_HANDLED) 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 sa query request */
issue_action_SA_Query(adapter, NULL, 0, 0); issue_action_SA_Query(adapter, NULL, 0, 0);
goto validate_80211w_fail; 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_SELF_PROTECTED &&
ptr[WLAN_HDR_A3_LEN] != RTW_WLAN_CATEGORY_P2P) 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; goto validate_80211w_fail;
} }
} }
else if (subtype == WIFI_DEAUTH || subtype == WIFI_DISASSOC) 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 sa query request */
issue_action_SA_Query(adapter, NULL, 0, 0); issue_action_SA_Query(adapter, NULL, 0, 0);
goto validate_80211w_fail; 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)); rtw_hal_get_def_var(adapter, HAL_DEF_DBG_DUMP_RXPKT, &(bDumpRxPkt));
if (bDumpRxPkt ==1) {/* dump all rx packets */ if (bDumpRxPkt ==1) {/* dump all rx packets */
int i; int i;
DBG_871X("#############################\n"); DBG_88E("#############################\n");
for (i =0; i<64;i =i+8) 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)); *(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) { else if (bDumpRxPkt ==2) {
if (type == WIFI_MGT_TYPE) { if (type == WIFI_MGT_TYPE) {
int i; int i;
DBG_871X("#############################\n"); DBG_88E("#############################\n");
for (i =0; i<64;i =i+8) 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)); *(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) { else if (bDumpRxPkt ==3) {
if (type == WIFI_DATA_TYPE) { if (type == WIFI_DATA_TYPE) {
int i; int i;
DBG_871X("#############################\n"); DBG_88E("#############################\n");
for (i =0; i<64;i =i+8) 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)); *(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) switch (type)
@ -1837,7 +1837,7 @@ sint validate_recv_frame(struct adapter *adapter, union recv_frame *precv_frame)
default: default:
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("validate_recv_data_frame fail! type =0x%x\n", type)); RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("validate_recv_data_frame fail! type =0x%x\n", type));
#ifdef DBG_RX_DROP_FRAME #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 #endif
retval = _FAIL; retval = _FAIL;
break; break;
@ -2180,7 +2180,7 @@ static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe)
#endif /* ENDIAN_FREE */ #endif /* ENDIAN_FREE */
if ( a_len < (ETHERNET_HEADER_SIZE + nSubframe_Length) ) { 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; goto exit;
} }
@ -2204,7 +2204,7 @@ static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe)
} }
else 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; break;
} }
} }
@ -2213,7 +2213,7 @@ static int amsdu_to_msdu(struct adapter *padapter, union recv_frame *prframe)
subframes[nr_subframes++] = sub_skb; subframes[nr_subframes++] = sub_skb;
if (nr_subframes >= MAX_SUBFRAME_COUNT) { 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; 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; preorder_ctrl->indicate_seq = seq_num;
#ifdef DBG_RX_SEQ #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); preorder_ctrl->indicate_seq, seq_num);
#endif #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); */ /* DbgPrint("CheckRxTsIndicateSeq(): Packet Drop! IndicateSeq: %d, NewSeq: %d\n", precvpriv->indicate_seq, seq_num); */
#ifdef DBG_RX_DROP_FRAME #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); preorder_ctrl->indicate_seq, seq_num);
#endif #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; preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF;
#ifdef DBG_RX_SEQ #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); preorder_ctrl->indicate_seq, seq_num);
#endif #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; preorder_ctrl->indicate_seq = 0xFFF - (wsize - (seq_num + 1)) + 1;
#ifdef DBG_RX_SEQ #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); preorder_ctrl->indicate_seq, seq_num);
#endif #endif
} }
@ -2446,7 +2446,7 @@ int recv_indicatepkts_in_order(struct adapter *padapter, struct recv_reorder_ctr
pattrib = &prframe->u.hdr.attrib; pattrib = &prframe->u.hdr.attrib;
preorder_ctrl->indicate_seq = pattrib->seq_num; preorder_ctrl->indicate_seq = pattrib->seq_num;
#ifdef DBG_RX_SEQ #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); preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif #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; preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1) & 0xFFF;
#ifdef DBG_RX_SEQ #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); preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif #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); */ /* DbgPrint("recv_indicatepkts_in_order, indicate_seq =%d, seq_num =%d\n", precvpriv->indicate_seq, pattrib->seq_num); */
if (!pattrib->amsdu) 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) && if ((padapter->bDriverStopped == false) &&
(padapter->bSurpriseRemoved == false)) (padapter->bSurpriseRemoved == false))
@ -2546,7 +2546,7 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
} }
#ifdef DBG_RX_DROP_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 #endif
return _FAIL; return _FAIL;
@ -2555,7 +2555,7 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
/* indicate this recv_frame */ /* indicate this recv_frame */
preorder_ctrl->indicate_seq = pattrib->seq_num; preorder_ctrl->indicate_seq = pattrib->seq_num;
#ifdef DBG_RX_SEQ #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); preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif #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; preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096;
#ifdef DBG_RX_SEQ #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); preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif #endif
@ -2573,7 +2573,7 @@ static int recv_indicatepkt_reorder(struct adapter *padapter, union recv_frame *
if (preorder_ctrl->enable == false) { if (preorder_ctrl->enable == false) {
preorder_ctrl->indicate_seq = pattrib->seq_num; preorder_ctrl->indicate_seq = pattrib->seq_num;
#ifdef DBG_RX_SEQ #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); preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif #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; preorder_ctrl->indicate_seq = (preorder_ctrl->indicate_seq + 1)%4096;
#ifdef DBG_RX_SEQ #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); preorder_ctrl->indicate_seq, pattrib->seq_num);
#endif #endif
if (retval != _SUCCESS) { if (retval != _SUCCESS) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
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 #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 */ /* s2. check if winstart_b(indicate_seq) needs to been updated */
if (!check_indicate_seq(preorder_ctrl, pattrib->seq_num)) { if (!check_indicate_seq(preorder_ctrl, pattrib->seq_num)) {
#ifdef DBG_RX_DROP_FRAME #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 #endif
goto _err_exit; 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. */ /* s3. Insert all packet into Reorder Queue to maintain its ordering. */
if (!enqueue_reorder_recvframe(preorder_ctrl, prframe)) { if (!enqueue_reorder_recvframe(preorder_ctrl, prframe)) {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
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 #endif
goto _err_exit; 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 */ if (recv_indicatepkt_reorder(padapter, prframe)!=_SUCCESS)/* including perform A-MPDU Rx Ordering Buffer Control */
{ {
#ifdef DBG_RX_DROP_FRAME #ifdef DBG_RX_DROP_FRAME
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 #endif
if ((padapter->bDriverStopped == false) && 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")); RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("wlanhdr_to_ethhdr: drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME #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 #endif
return retval; return retval;
} }
@ -2750,7 +2750,7 @@ static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prfr
if (prframe == NULL) { if (prframe == NULL) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("decryptor: drop pkt\n")); RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("decryptor: drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME #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 #endif
ret = _FAIL; ret = _FAIL;
goto _recv_data_drop; goto _recv_data_drop;
@ -2760,7 +2760,7 @@ static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prfr
if (prframe == NULL) { if (prframe == NULL) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("recvframe_chk_defrag: drop pkt\n")); RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("recvframe_chk_defrag: drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME #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 #endif
goto _recv_data_drop; goto _recv_data_drop;
} }
@ -2769,7 +2769,7 @@ static int recv_func_posthandle(struct adapter *padapter, union recv_frame *prfr
if (prframe == NULL) { if (prframe == NULL) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("portctrl: drop pkt\n")); RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("portctrl: drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME #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 #endif
ret = _FAIL; ret = _FAIL;
goto _recv_data_drop; 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")); RT_TRACE(_module_rtl871x_recv_c_, _drv_err_, ("recv_func: process_recv_indicatepkts fail!\n"));
#ifdef DBG_RX_DROP_FRAME #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 #endif
rtw_free_recvframe(orig_prframe, pfree_recv_queue);/* free this recv_frame */ rtw_free_recvframe(orig_prframe, pfree_recv_queue);/* free this recv_frame */
goto _recv_data_drop; goto _recv_data_drop;
@ -2815,7 +2815,7 @@ int recv_func(struct adapter *padapter, union recv_frame *rframe)
} }
if (cnt) 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); FUNC_ADPT_ARG(padapter), cnt);
} }
@ -2831,7 +2831,7 @@ int recv_func(struct adapter *padapter, union recv_frame *rframe)
!psecuritypriv->busetkipkey) !psecuritypriv->busetkipkey)
{ {
rtw_enqueue_recvframe(rframe, &padapter->recvpriv.uc_swdec_pending_queue); 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) { if (recvpriv->free_recvframe_cnt < NR_RECVFRAME/4) {
/* to prevent from recvframe starvation, get recvframe from uc_swdec_pending_queue to free_recvframe_cnt */ /* 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; recvpriv->signal_qual = tmp_q;
#if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1 #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" ", num_signal_strength:%u, num_signal_qual:%u"
", on_cur_ch_ms:%d" ", on_cur_ch_ms:%d"
"\n" "\n"

54
core/rtw_security.c
View file

@ -647,7 +647,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
} }
else 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] ); 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)) 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; return _FAIL;
} }
@ -710,7 +710,7 @@ u32 rtw_tkip_encrypt(struct adapter *padapter, u8 *pxmitframe)
} }
else { else {
RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_tkip_encrypt: stainfo == NULL!!!\n")); 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; res =_FAIL;
} }
@ -770,7 +770,7 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
if (rtw_get_passing_time_ms(start) > 1000) { if (rtw_get_passing_time_ms(start) > 1000) {
if (no_gkey_bc_cnt || no_gkey_mc_cnt) { 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); FUNC_ADPT_ARG(padapter), no_gkey_bc_cnt, no_gkey_mc_cnt);
} }
start = jiffies; start = jiffies;
@ -781,14 +781,14 @@ u32 rtw_tkip_decrypt(struct adapter *padapter, u8 *precvframe)
} }
if (no_gkey_bc_cnt || no_gkey_mc_cnt) { 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); FUNC_ADPT_ARG(padapter), no_gkey_bc_cnt, no_gkey_mc_cnt);
} }
start = 0; start = 0;
no_gkey_bc_cnt = 0; no_gkey_bc_cnt = 0;
no_gkey_mc_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[psecuritypriv->dot118021XGrpKeyid].skey; */
prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey; prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey;
prwskeylen =16; prwskeylen =16;
@ -1519,13 +1519,13 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
if (pattrib->psta) { if (pattrib->psta) {
stainfo = pattrib->psta; stainfo = pattrib->psta;
} else { } 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] ); stainfo =rtw_get_stainfo(&padapter->stapriv ,&pattrib->ra[0] );
} }
if (stainfo!= NULL) { if (stainfo!= NULL) {
if (!(stainfo->state &_FW_LINKED)) { 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; return _FAIL;
} }
@ -1553,7 +1553,7 @@ u32 rtw_aes_encrypt(struct adapter *padapter, u8 *pxmitframe)
} }
} else { } else {
RT_TRACE(_module_rtl871x_security_c_, _drv_err_, ("rtw_aes_encrypt: stainfo == NULL!!!\n")); 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; 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", 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])); 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]); i, pframe[hdrlen+8+plen-8+i], message[hdrlen+8+plen-8+i]);
res = _FAIL; res = _FAIL;
} }
@ -1854,7 +1854,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
if (rtw_get_passing_time_ms(start) > 1000) { if (rtw_get_passing_time_ms(start) > 1000) {
if (no_gkey_bc_cnt || no_gkey_mc_cnt) { 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); FUNC_ADPT_ARG(padapter), no_gkey_bc_cnt, no_gkey_mc_cnt);
} }
start = jiffies; start = jiffies;
@ -1866,7 +1866,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
} }
if (no_gkey_bc_cnt || no_gkey_mc_cnt) { 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); FUNC_ADPT_ARG(padapter), no_gkey_bc_cnt, no_gkey_mc_cnt);
} }
start = 0; start = 0;
@ -1875,7 +1875,7 @@ u32 rtw_aes_decrypt(struct adapter *padapter, u8 *precvframe)
prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey; prwskey = psecuritypriv->dot118021XGrpKey[prxattrib->key_index].skey;
if (psecuritypriv->dot118021XGrpKeyid != prxattrib->key_index) { 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); , prxattrib->key_index, psecuritypriv->dot118021XGrpKeyid);
res =_FAIL; res =_FAIL;
goto exit; goto exit;
@ -1913,7 +1913,7 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)
if (BIP_AAD == NULL) if (BIP_AAD == NULL)
{ {
DBG_871X("BIP AAD allocate fail\n"); DBG_88E("BIP AAD allocate fail\n");
return _FAIL; return _FAIL;
} }
/* PKT start */ /* PKT start */
@ -1935,7 +1935,7 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)
/* BIP packet number should bigger than previous BIP packet */ /* BIP packet number should bigger than previous BIP packet */
if (temp_ipn <= pmlmeext->mgnt_80211w_IPN_rx) if (temp_ipn <= pmlmeext->mgnt_80211w_IPN_rx)
{ {
DBG_871X("replay BIP packet\n"); DBG_88E("replay BIP packet\n");
goto BIP_exit; goto BIP_exit;
} }
/* copy key index */ /* copy key index */
@ -1943,7 +1943,7 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)
keyid = le16_to_cpu(keyid); keyid = le16_to_cpu(keyid);
if (keyid != padapter->securitypriv.dot11wBIPKeyid) if (keyid != padapter->securitypriv.dot11wBIPKeyid)
{ {
DBG_871X("BIP key index error!\n"); DBG_88E("BIP key index error!\n");
goto BIP_exit; goto BIP_exit;
} }
/* clear the MIC field of MME to zero */ /* clear the MIC field of MME to zero */
@ -1964,20 +1964,20 @@ u32 rtw_BIP_verify(struct adapter *padapter, u8 *precvframe)
/*/* management packet content */ /*/* management packet content */
{ {
int pp; int pp;
DBG_871X("pkt: "); DBG_88E("pkt: ");
for (pp =0;pp< pattrib->pkt_len; pp++) for (pp =0;pp< pattrib->pkt_len; pp++)
printk(" %02x ", pframe[pp]); printk(" %02x ", pframe[pp]);
DBG_871X("\n"); DBG_88E("\n");
/* BIP AAD + management frame body + MME(MIC is zero) */ /* BIP AAD + management frame body + MME(MIC is zero) */
DBG_871X("AAD+PKT: "); DBG_88E("AAD+PKT: ");
for (pp =0;pp< ori_len; pp++) for (pp =0;pp< ori_len; pp++)
DBG_871X(" %02x ", BIP_AAD[pp]); DBG_88E(" %02x ", BIP_AAD[pp]);
DBG_871X("\n"); DBG_88E("\n");
/* show the MIC result */ /* show the MIC result */
DBG_871X("mic: "); DBG_88E("mic: ");
for (pp =0;pp<16; pp++) for (pp =0;pp<16; pp++)
DBG_871X(" %02x ", mic[pp]); DBG_88E(" %02x ", mic[pp]);
DBG_871X("\n"); DBG_88E("\n");
} }
*/ */
/* MIC field should be last 8 bytes of packet (packet without FCS) */ /* 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; res =_SUCCESS;
} }
else else
DBG_871X("BIP MIC error!\n"); DBG_88E("BIP MIC error!\n");
} }
else else
@ -2741,12 +2741,12 @@ u8 rtw_handle_tkip_countermeasure(struct adapter* adapter, const char *caller)
if (securitypriv->btkip_countermeasure == true) { if (securitypriv->btkip_countermeasure == true) {
u32 passing_ms = rtw_get_passing_time_ms(securitypriv->btkip_countermeasure_time); u32 passing_ms = rtw_get_passing_time_ms(securitypriv->btkip_countermeasure_time);
if (passing_ms > 60*1000) { 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); caller, ADPT_ARG(adapter), passing_ms/1000);
securitypriv->btkip_countermeasure = false; securitypriv->btkip_countermeasure = false;
securitypriv->btkip_countermeasure_time = 0; securitypriv->btkip_countermeasure_time = 0;
} else { } 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); caller, ADPT_ARG(adapter), passing_ms/1000);
status = _FAIL; 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); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
if (check_fwstate(mlmepriv, WIFI_STATION_STATE)) { 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); sreset_restore_network_station(padapter);
} else if (check_fwstate(mlmepriv, WIFI_AP_STATE)) { } 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); rtw_ap_restore_network(padapter);
} else if (check_fwstate(mlmepriv, WIFI_ADHOC_STATE)) { } 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 { } 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) if (padapter == NULL)
return; 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)) if (!rtw_netif_queue_stopped(padapter->pnetdev))
rtw_netif_stop_queue(padapter->pnetdev); rtw_netif_stop_queue(padapter->pnetdev);
@ -233,7 +233,7 @@ static void sreset_start_adapter(struct adapter *padapter)
if (padapter == NULL) if (padapter == NULL)
return; 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)) { if (check_fwstate(pmlmepriv, _FW_LINKED)) {
sreset_restore_network_status(padapter); sreset_restore_network_status(padapter);
@ -259,7 +259,7 @@ void sreset_reset(struct adapter *padapter)
unsigned long irqL; unsigned long irqL;
u32 start = jiffies; u32 start = jiffies;
DBG_871X("%s\n", __FUNCTION__); DBG_88E("%s\n", __FUNCTION__);
psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS; psrtpriv->Wifi_Error_Status = WIFI_STATUS_SUCCESS;
@ -279,5 +279,5 @@ void sreset_reset(struct adapter *padapter)
_exit_pwrlock(&pwrpriv->lock); _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); int offset = (((u8 *)sta) - stapriv->pstainfo_buf)/sizeof(struct sta_info);
if (!stainfo_offset_valid(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 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) inline struct sta_info *rtw_get_stainfo_by_offset(struct sta_priv *stapriv, int offset)
{ {
if (!stainfo_offset_valid(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)); 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; preorder_ctrl->indicate_seq = 0xffff;
#ifdef DBG_RX_SEQ #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); preorder_ctrl->indicate_seq);
#endif #endif
preorder_ctrl->wend_b = 0xffff; 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 ) 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)) 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 }; u8 attr_content[ 10 ] = { 0x00 };
u32 attr_contentlen = 0; 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); rtw_get_wfd_attr_content( wfd_ie, wfd_ielen, WFD_ATTR_DEVICE_INFO, attr_content, &attr_contentlen);
if ( attr_contentlen ) if ( attr_contentlen )
{ {
@ -725,7 +725,7 @@ int WFD_info_handler(struct adapter *padapter, struct ndis_802_11_variable_ies *
} }
else else
{ {
DBG_871X( "[%s] NO WFD IE\n", __FUNCTION__ ); DBG_88E( "[%s] NO WFD IE\n", __FUNCTION__ );
} }
return( _FAIL ); return( _FAIL );
@ -816,7 +816,7 @@ void WMMOnAssocRsp(struct adapter *padapter)
break; 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) if (padapter->registrypriv.acm_method == 1)
@ -865,7 +865,7 @@ void WMMOnAssocRsp(struct adapter *padapter)
for (i =0; i<4; i++) { for (i =0; i<4; i++) {
pxmitpriv->wmm_para_seq[i] = inx[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; return;
@ -1056,7 +1056,7 @@ void HTOnAssocRsp(struct adapter *padapter)
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
DBG_871X("%s\n", __FUNCTION__); DBG_88E("%s\n", __FUNCTION__);
if ((pmlmeinfo->HT_info_enable) && (pmlmeinfo->HT_caps_enable)) 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); len = packet_len - sizeof(struct rtw_ieee80211_hdr_3addr);
if (len > MAX_IE_SZ) { 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; return _FAIL;
} }
if (_rtw_memcmp(cur_network->network.MacAddress, pbssid, 6) == false) { 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)); MAC_ARG(pbssid), MAC_ARG(cur_network->network.MacAddress));
return true; 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 || if (ht_cap_info != cur_network->BcnInfo.ht_cap_info ||
((ht_info_infos_0&0x03) != (cur_network->BcnInfo.ht_info_infos_0&0x03))) { ((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); 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); 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 */ /* bcn_info_update */
cur_network->BcnInfo.ht_cap_info = ht_cap_info; 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) { if (pht_info) {
bcn_channel = pht_info->primary_channel; bcn_channel = pht_info->primary_channel;
} else { /* we don't find channel IE, so don't check it */ } 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; bcn_channel = Adapter->mlmeextpriv.cur_channel;
} }
} }
if (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); bcn_channel, Adapter->mlmeextpriv.cur_channel);
goto _mismatch; goto _mismatch;
} }
/* checking SSID */ /* checking SSID */
if ((p = rtw_get_ie(bssid->IEs + _FIXED_IE_LENGTH_, _SSID_IE_, &len, bssid->IELength - _FIXED_IE_LENGTH_)) == NULL) { 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; hidden_ssid = true;
} else { } else {
hidden_ssid = false; 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 || if (_rtw_memcmp(bssid->Ssid.Ssid, cur_network->network.Ssid.Ssid, 32) == false ||
bssid->Ssid.SsidLength != cur_network->network.Ssid.SsidLength) { bssid->Ssid.SsidLength != cur_network->network.Ssid.SsidLength) {
if (bssid->Ssid.Ssid[0] != '\0' && bssid->Ssid.SsidLength != 0) { /* not hidden ssid */ 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; 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", ("%s(): cur_network->network.Privacy is %d, bssid.Privacy is %d\n",
__func__, cur_network->network.Privacy, bssid->Privacy)); __func__, cur_network->network.Privacy, bssid->Privacy));
if (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; 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) { 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; 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_, 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)); ("%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) { 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, pairwise_cipher, cur_network->BcnInfo.pairwise_cipher,
group_cipher, cur_network->BcnInfo.group_cipher); group_cipher, cur_network->BcnInfo.group_cipher);
goto _mismatch; goto _mismatch;
} }
if (is_8021x != cur_network->BcnInfo.is_8021x) { 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; goto _mismatch;
} }
} }
@ -1758,19 +1758,19 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
case _VENDOR_SPECIFIC_IE_: case _VENDOR_SPECIFIC_IE_:
if ((_rtw_memcmp(pIE->data, ARTHEROS_OUI1, 3)) || (_rtw_memcmp(pIE->data, ARTHEROS_OUI2, 3))) 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; return HT_IOT_PEER_ATHEROS;
} }
else if ((_rtw_memcmp(pIE->data, BROADCOM_OUI1, 3)) else if ((_rtw_memcmp(pIE->data, BROADCOM_OUI1, 3))
|| (_rtw_memcmp(pIE->data, BROADCOM_OUI2, 3)) || (_rtw_memcmp(pIE->data, BROADCOM_OUI2, 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; return HT_IOT_PEER_BROADCOM;
} }
else if (_rtw_memcmp(pIE->data, MARVELL_OUI, 3)) 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; return HT_IOT_PEER_MARVELL;
} }
else if (_rtw_memcmp(pIE->data, RALINK_OUI, 3)) 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) { if (!ralink_vendor_flag) {
ralink_vendor_flag = 1; ralink_vendor_flag = 1;
} else { } else {
DBG_871X("link to Ralink AP\n"); DBG_88E("link to Ralink AP\n");
return HT_IOT_PEER_RALINK; return HT_IOT_PEER_RALINK;
} }
} }
else if (_rtw_memcmp(pIE->data, CISCO_OUI, 3)) 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; return HT_IOT_PEER_CISCO;
} }
else if (_rtw_memcmp(pIE->data, REALTEK_OUI, 3)) 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; return HT_IOT_PEER_REALTEK;
} }
else if (_rtw_memcmp(pIE->data, AIRGOCAP_OUI, 3)) 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; return HT_IOT_PEER_AIRGO;
} }
else if (_rtw_memcmp(pIE->data, EPIGRAM_OUI, 3)) else if (_rtw_memcmp(pIE->data, EPIGRAM_OUI, 3))
{ {
epigram_vendor_flag = 1; epigram_vendor_flag = 1;
if (ralink_vendor_flag) { 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; return HT_IOT_PEER_TENDA;
} else { } else {
DBG_871X("Capture EPIGRAM_OUI\n"); DBG_88E("Capture EPIGRAM_OUI\n");
} }
} }
else else
@ -1820,13 +1820,13 @@ unsigned char check_assoc_AP(u8 *pframe, uint len)
} }
if (ralink_vendor_flag && !epigram_vendor_flag) { 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; return HT_IOT_PEER_RALINK;
} else if (ralink_vendor_flag && epigram_vendor_flag) { } 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; return HT_IOT_PEER_TENDA;
} else { } else {
DBG_871X("link to new AP\n"); DBG_88E("link to new AP\n");
return HT_IOT_PEER_UNKNOWN; return HT_IOT_PEER_UNKNOWN;
} }
} }
@ -2091,13 +2091,13 @@ int rtw_handle_dualmac(struct adapter *adapter, bool init)
if (init) { if (init) {
if (pbuddy_padapter == NULL) { if (pbuddy_padapter == NULL) {
pbuddy_padapter = adapter; 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 { } else {
adapter->pbuddy_adapter = pbuddy_padapter; adapter->pbuddy_adapter = pbuddy_padapter;
pbuddy_padapter->pbuddy_adapter = adapter; pbuddy_padapter->pbuddy_adapter = adapter;
/* clear global value */ /* clear global value */
pbuddy_padapter = NULL; pbuddy_padapter = NULL;
DBG_871X("%s(): pbuddy_padapter exist, Exchange Information\n", __FUNCTION__); DBG_88E("%s(): pbuddy_padapter exist, Exchange Information\n", __FUNCTION__);
} }
} else { } else {
pbuddy_padapter = NULL; 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 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] ); psta =rtw_get_stainfo(&padapter->stapriv ,&pattrib->ra[0] );
} }
if (psta == NULL) if (psta == NULL)
{ {
DBG_871X("%s, psta ==NUL\n", __func__); DBG_88E("%s, psta ==NUL\n", __func__);
return; return;
} }
if (!(psta->state &_FW_LINKED)) 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; return;
} }
@ -556,7 +556,7 @@ u8 qos_acm(u8 acm_mask, u8 priority)
change_priority = 5; change_priority = 5;
break; break;
default: default:
DBG_871X("qos_acm(): invalid pattrib->priority: %d!!!\n", priority); DBG_88E("qos_acm(): invalid pattrib->priority: %d!!!\n", priority);
break; break;
} }
@ -650,7 +650,7 @@ static s32 update_attrib(struct adapter *padapter, struct sk_buff *pkt, struct p
} }
} }
} else if (0x888e == pattrib->ether_type) { } 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) ) 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 */ 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))); 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 #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 #endif
res =_FAIL; res =_FAIL;
goto exit; 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 */ /* 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))); 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 #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 #endif
res = _FAIL; res = _FAIL;
goto exit; 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)); 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 #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 #endif
res = _FAIL; res = _FAIL;
goto exit; 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)); RT_TRACE(_module_rtl871x_xmit_c_, _drv_err_, ("\npadapter->securitypriv.busetkipkey(%d) ==_FAIL drop packet\n", padapter->securitypriv.busetkipkey));
#ifdef DBG_TX_DROP_FRAME #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 #endif
res =_FAIL; res =_FAIL;
goto exit; goto exit;
@ -839,19 +839,19 @@ static s32 xmitframe_addmic(struct adapter *padapter, struct xmit_frame *pxmitfr
} }
else 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]); stainfo =rtw_get_stainfo(&padapter->stapriv ,&pattrib->ra[0]);
} }
if (stainfo == NULL) if (stainfo == NULL)
{ {
DBG_871X("%s, psta ==NUL\n", __func__); DBG_88E("%s, psta ==NUL\n", __func__);
return _FAIL; return _FAIL;
} }
if (!(stainfo->state &_FW_LINKED)) 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; return _FAIL;
} }
@ -968,7 +968,7 @@ static s32 xmitframe_swencrypt(struct adapter *padapter, struct xmit_frame *pxmi
/* if ((psecuritypriv->sw_encrypt)||(pattrib->bswenc)) */ /* if ((psecuritypriv->sw_encrypt)||(pattrib->bswenc)) */
if (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")); RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("### xmitframe_swencrypt\n"));
switch (pattrib->encrypt) { switch (pattrib->encrypt) {
case _WEP40_: case _WEP40_:
@ -1015,7 +1015,7 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat
if (pattrib->psta) { if (pattrib->psta) {
psta = pattrib->psta; psta = pattrib->psta;
} else { } else {
DBG_871X("%s, call rtw_get_stainfo()\n", __func__); DBG_88E("%s, call rtw_get_stainfo()\n", __func__);
if (bmcst) { if (bmcst) {
psta = rtw_get_bcmc_stainfo(padapter); psta = rtw_get_bcmc_stainfo(padapter);
} else { } else {
@ -1025,13 +1025,13 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat
if (psta == NULL) if (psta == NULL)
{ {
DBG_871X("%s, psta ==NUL\n", __func__); DBG_88E("%s, psta ==NUL\n", __func__);
return _FAIL; return _FAIL;
} }
if (!(psta->state &_FW_LINKED)) 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; return _FAIL;
} }
@ -1126,7 +1126,7 @@ s32 rtw_make_wlanhdr (struct adapter *padapter , u8 *hdr, struct pkt_attrib *pat
/* check BA_starting_seqctrl */ /* check BA_starting_seqctrl */
if (SN_LESS(pattrib->seqnum, tx_seq)) 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 */ pattrib->ampdu_en = false;/* AGG BK */
} }
else if (SN_EQUAL(pattrib->seqnum, tx_seq)) 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 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; psta->BA_starting_seqctrl[pattrib->priority & 0x0f] = (pattrib->seqnum+1)&0xfff;
pattrib->ampdu_en = true;/* AGG EN */ pattrib->ampdu_en = true;/* AGG EN */
} }
@ -1181,19 +1181,19 @@ s32 rtw_txframes_sta_ac_pending(struct adapter *padapter, struct pkt_attrib *pat
} }
else 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]); psta =rtw_get_stainfo(&padapter->stapriv ,&pattrib->ra[0]);
} }
if (psta == NULL) if (psta == NULL)
{ {
DBG_871X("%s, psta ==NUL\n", __func__); DBG_88E("%s, psta ==NUL\n", __func__);
return 0; return 0;
} }
if (!(psta->state &_FW_LINKED)) 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; return 0;
} }
@ -1281,20 +1281,20 @@ s32 rtw_xmitframe_coalesce(struct adapter *padapter, struct sk_buff *pkt, struct
psta = pattrib->psta; psta = pattrib->psta;
} else } 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); psta = rtw_get_stainfo(&padapter->stapriv, pattrib->ra);
} }
if (psta == NULL) if (psta == NULL)
{ {
DBG_871X("%s, psta ==NUL\n", __func__); DBG_88E("%s, psta ==NUL\n", __func__);
return _FAIL; return _FAIL;
} }
if (!(psta->state &_FW_LINKED)) 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; 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 */ /* IGTK key is not install, it may not support 802.11w */
if (padapter->securitypriv.binstallBIPkey != true) if (padapter->securitypriv.binstallBIPkey != true)
{ {
DBG_871X("no instll BIP key\n"); DBG_88E("no instll BIP key\n");
goto xmitframe_coalesce_success; goto xmitframe_coalesce_success;
} }
/* station mode doesn't need TX BIP, just ready the code */ /* 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) if (psta == NULL)
{ {
DBG_871X("%s, psta ==NUL\n", __func__); DBG_88E("%s, psta ==NUL\n", __func__);
goto xmitframe_coalesce_fail; goto xmitframe_coalesce_fail;
} }
if (!(psta->state & _FW_LINKED) || pxmitframe->buf_addr == NULL) 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; 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 */ /* according 802.11-2012 standard, these five types are not robust types */
if (subtype == WIFI_ACTION && if (subtype == WIFI_ACTION &&
(pframe[WLAN_HDR_A3_LEN] == RTW_WLAN_CATEGORY_PUBLIC || (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--; pxmitpriv->free_xmit_extbuf_cnt--;
#ifdef DBG_XMIT_BUF_EXT #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 #endif
pxmitbuf->priv_data = NULL; pxmitbuf->priv_data = NULL;
/* pxmitbuf->ext_tag = true; */ /* pxmitbuf->ext_tag = true; */
if (pxmitbuf->sctx) { 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); 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)); rtw_list_insert_tail(&(pxmitbuf->list), get_list_head(pfree_queue));
pxmitpriv->free_xmit_extbuf_cnt++; pxmitpriv->free_xmit_extbuf_cnt++;
#ifdef DBG_XMIT_BUF_EXT #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 #endif
spin_unlock_irqrestore(&pfree_queue->lock, flags); 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); 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--; pxmitpriv->free_xmitbuf_cnt--;
#ifdef DBG_XMIT_BUF #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 #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->priv_data = NULL;
/* pxmitbuf->ext_tag = false; */ /* pxmitbuf->ext_tag = false; */
if (pxmitbuf->sctx) { 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); rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_BUF_ALLOC);
} }
} }
#ifdef DBG_XMIT_BUF #ifdef DBG_XMIT_BUF
else else
{ {
DBG_871X("DBG_XMIT_BUF rtw_alloc_xmitbuf return NULL\n"); DBG_88E("DBG_XMIT_BUF rtw_alloc_xmitbuf return NULL\n");
} }
#endif #endif
@ -1913,7 +1913,7 @@ s32 rtw_free_xmitbuf(struct xmit_priv *pxmitpriv, struct xmit_buf *pxmitbuf)
return _FAIL; return _FAIL;
if (pxmitbuf->sctx) { 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); 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)); rtw_list_insert_tail(&(pxmitbuf->list), get_list_head(pfree_xmitbuf_queue));
pxmitpriv->free_xmitbuf_cnt++; 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 #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 #endif
spin_unlock_irqrestore(&pfree_xmitbuf_queue->lock, flags); 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); rtw_init_xmitframe(pxframe);
DBG_871X("################## %s ##################\n", __func__); DBG_88E("################## %s ##################\n", __func__);
exit: exit:
return pxframe; return pxframe;
@ -2091,7 +2091,7 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitfram
} }
if (pxmitframe->alloc_addr) { 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); rtw_mfree(pxmitframe->alloc_addr, sizeof(struct xmit_frame) + 4);
goto check_pkt_complete; goto check_pkt_complete;
} }
@ -2319,7 +2319,7 @@ s32 rtw_xmit_classifier(struct adapter *padapter, struct xmit_frame *pxmitframe)
if (pattrib->psta) { if (pattrib->psta) {
psta = pattrib->psta; psta = pattrib->psta;
} else { } 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); 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)) 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; 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 (rtw_get_passing_time_ms(start) > 2000) {
if (drop_cnt) 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; start = jiffies;
drop_cnt = 0; drop_cnt = 0;
} }
@ -2704,7 +2704,7 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_buff **ppkt)
if (res == _FAIL) { if (res == _FAIL) {
RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit: update attrib fail\n")); RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit: update attrib fail\n"));
#ifdef DBG_TX_DROP_FRAME #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 #endif
rtw_free_xmitframe(pxmitpriv, pxmitframe); rtw_free_xmitframe(pxmitpriv, pxmitframe);
return -1; return -1;
@ -2751,25 +2751,25 @@ sint xmitframe_enqueue_for_sleeping_sta(struct adapter *padapter, struct xmit_fr
} }
else 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); psta =rtw_get_stainfo(pstapriv, pattrib->ra);
} }
if (psta == NULL) if (psta == NULL)
{ {
DBG_871X("%s, psta ==NUL\n", __func__); DBG_88E("%s, psta ==NUL\n", __func__);
return false; return false;
} }
if (!(psta->state &_FW_LINKED)) 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; return false;
} }
if (pattrib->triggered ==1) if (pattrib->triggered ==1)
{ {
/* DBG_871X("directly xmit pspoll_triggered packet\n"); */ /* DBG_88E("directly xmit pspoll_triggered packet\n"); */
/* pattrib->triggered =0; */ /* 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); 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) 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 */ /* upate BCN for TIM IE */
update_beacon(padapter, _TIM_IE_, NULL, false); update_beacon(padapter, _TIM_IE_, NULL, false);
} }
@ -2909,7 +2909,7 @@ static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter, struc
} }
else 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->tim_bitmap &= ~BIT(0);
pstapriv->sta_dz_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 */ /* upate BCN for TIM IE */
/* update_BCNTIM(padapter); */ /* update_BCNTIM(padapter); */
update_mask |= BIT(1); 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); 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 */ /* upate BCN for TIM IE */
/* update_BCNTIM(padapter); */ /* update_BCNTIM(padapter); */
update_mask = BIT(0); update_mask = BIT(0);
@ -3212,7 +3212,7 @@ int rtw_sctx_wait(struct submit_ctx *sctx)
if (!wait_for_completion_timeout(&sctx->done, expire)) { if (!wait_for_completion_timeout(&sctx->done, expire)) {
/* timeout, do something?? */ /* timeout, do something?? */
status = RTW_SCTX_DONE_TIMEOUT; status = RTW_SCTX_DONE_TIMEOUT;
DBG_871X("%s timeout\n", __func__); DBG_88E("%s timeout\n", __func__);
} else { } else {
status = sctx->status; status = sctx->status;
} }
@ -3243,7 +3243,7 @@ void rtw_sctx_done_err(struct submit_ctx **sctx, int status)
{ {
if (*sctx) { if (*sctx) {
if (rtw_sctx_chk_waring_status(status)) 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; (*sctx)->status = status;
complete(&((*sctx)->done)); complete(&((*sctx)->done));
*sctx = NULL; *sctx = NULL;
@ -3273,6 +3273,6 @@ void rtw_ack_tx_done(struct xmit_priv *pxmitpriv, int status)
if (pxmitpriv->ack_tx) { if (pxmitpriv->ack_tx) {
rtw_sctx_done_err(&pack_tx_ops, status); rtw_sctx_done_err(&pack_tx_ops, status);
} else { } else {
DBG_871X("%s ack_tx not set\n", __func__); DBG_88E("%s ack_tx not set\n", __func__);
} }
} }

4
hal/HalPhyRf_8188e.c
View file

@ -273,7 +273,7 @@ odm_TxPwrTrackSetPwr88E(
PHY_SetBBReg(Adapter, rTxAGC_A_CCK1_Mcs32, bMaskByte1, pwr); PHY_SetBBReg(Adapter, rTxAGC_A_CCK1_Mcs32, bMaskByte1, pwr);
TxAGC = (pwr<<16)|(pwr<<8)|(pwr); TxAGC = (pwr<<16)|(pwr<<8)|(pwr);
PHY_SetBBReg(Adapter, rTxAGC_B_CCK11_A_CCK2_11, 0xffffff00, TxAGC); PHY_SetBBReg(Adapter, rTxAGC_B_CCK11_A_CCK2_11, 0xffffff00, TxAGC);
DBG_871X("ODM_TxPwrTrackSetPwr88E: CCK Tx-rf(A) Power = 0x%x\n", TxAGC); DBG_88E("ODM_TxPwrTrackSetPwr88E: CCK Tx-rf(A) Power = 0x%x\n", TxAGC);
pwr = PHY_QueryBBReg(Adapter, rTxAGC_A_Rate18_06, 0xFF); pwr = PHY_QueryBBReg(Adapter, rTxAGC_A_Rate18_06, 0xFF);
pwr += (pDM_Odm->BbSwingIdxOfdm - pDM_Odm->BbSwingIdxOfdmBase); pwr += (pDM_Odm->BbSwingIdxOfdm - pDM_Odm->BbSwingIdxOfdmBase);
@ -284,7 +284,7 @@ odm_TxPwrTrackSetPwr88E(
PHY_SetBBReg(Adapter, rTxAGC_A_Mcs07_Mcs04, bMaskDWord, TxAGC); PHY_SetBBReg(Adapter, rTxAGC_A_Mcs07_Mcs04, bMaskDWord, TxAGC);
PHY_SetBBReg(Adapter, rTxAGC_A_Mcs11_Mcs08, bMaskDWord, TxAGC); PHY_SetBBReg(Adapter, rTxAGC_A_Mcs11_Mcs08, bMaskDWord, TxAGC);
PHY_SetBBReg(Adapter, rTxAGC_A_Mcs15_Mcs12, bMaskDWord, TxAGC); PHY_SetBBReg(Adapter, rTxAGC_A_Mcs15_Mcs12, bMaskDWord, TxAGC);
DBG_871X("ODM_TxPwrTrackSetPwr88E: OFDM Tx-rf(A) Power = 0x%x\n", TxAGC); DBG_88E("ODM_TxPwrTrackSetPwr88E: OFDM Tx-rf(A) Power = 0x%x\n", TxAGC);
} }
} }

2
hal/HalPwrSeqCmd.c
View file

@ -112,7 +112,7 @@ u8 HalPwrSeqCmdParsing(
rtw_udelay_os(10); rtw_udelay_os(10);
if (pollingCount++ > maxPollingCnt) { if (pollingCount++ > maxPollingCnt) {
DBG_871X("Fail to polling Offset[%#x]\n", offset); DBG_88E("Fail to polling Offset[%#x]\n", offset);
return false; return false;
} }
} while (!bPollingBit); } while (!bPollingBit);

8
hal/hal_com.c
View file

@ -65,7 +65,7 @@ void dump_chip_info(struct hal_version ChipVersion)
cnt += sprintf((buf+cnt), "RomVer(%d)\n", ChipVersion.ROMVer); cnt += sprintf((buf+cnt), "RomVer(%d)\n", ChipVersion.ROMVer);
DBG_871X("%s", buf); DBG_88E("%s", buf);
} }
@ -357,7 +357,7 @@ s32 c2h_evt_read(struct adapter *adapter, u8 *buf)
&c2h_evt , sizeof(c2h_evt)); &c2h_evt , sizeof(c2h_evt));
if (0) { if (0) {
DBG_871X("%s id:%u, len:%u, seq:%u, trigger:0x%02x\n", __func__ DBG_88E("%s id:%u, len:%u, seq:%u, trigger:0x%02x\n", __func__
, c2h_evt->id, c2h_evt->plen, c2h_evt->seq, trigger); , c2h_evt->id, c2h_evt->plen, c2h_evt->seq, trigger);
} }
@ -401,7 +401,7 @@ SetHalDefVar(struct adapter *adapter, enum HAL_DEF_VARIABLE variable, void *valu
ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_DBG_LEVEL, *((u32*)value)); ODM_CmnInfoUpdate(pDM_Odm, ODM_CMNINFO_DBG_LEVEL, *((u32*)value));
break; break;
default: default:
DBG_871X_LEVEL(_drv_always_, "%s: [WARNING] HAL_DEF_VARIABLE(%d) not defined!\n", __FUNCTION__, variable); DBG_88E_LEVEL(_drv_always_, "%s: [WARNING] HAL_DEF_VARIABLE(%d) not defined!\n", __FUNCTION__, variable);
bResult = _FAIL; bResult = _FAIL;
break; break;
} }
@ -427,7 +427,7 @@ GetHalDefVar(struct adapter *adapter, enum HAL_DEF_VARIABLE variable, void *valu
*((u32*)value) = pHalData->odmpriv.SupportAbility; *((u32*)value) = pHalData->odmpriv.SupportAbility;
break; break;
default: default:
DBG_871X_LEVEL(_drv_always_, "%s: [WARNING] HAL_DEF_VARIABLE(%d) not defined!\n", __FUNCTION__, variable); DBG_88E_LEVEL(_drv_always_, "%s: [WARNING] HAL_DEF_VARIABLE(%d) not defined!\n", __FUNCTION__, variable);
bResult = _FAIL; bResult = _FAIL;
break; break;
} }

16
hal/hal_intf.c
View file

@ -124,7 +124,7 @@ uint rtw_hal_init(struct adapter *padapter)
padapter = dvobj->padapters[i]; padapter = dvobj->padapters[i];
padapter->hw_init_completed = false; padapter->hw_init_completed = false;
} }
DBG_871X("rtw_hal_init: hal__init fail\n"); DBG_88E("rtw_hal_init: hal__init fail\n");
} }
RT_TRACE(_module_hal_init_c_,_drv_err_,("-rtl871x_hal_init:status=0x%x\n",status)); RT_TRACE(_module_hal_init_c_,_drv_err_,("-rtl871x_hal_init:status=0x%x\n",status));
@ -141,7 +141,7 @@ uint rtw_hal_deinit(struct adapter *padapter)
; ;
if (!is_primary_adapter(padapter)) { if (!is_primary_adapter(padapter)) {
DBG_871X(" rtw_hal_deinit: Secondary adapter return l\n"); DBG_88E(" rtw_hal_deinit: Secondary adapter return l\n");
return status; return status;
} }
@ -155,7 +155,7 @@ uint rtw_hal_deinit(struct adapter *padapter)
} }
else else
{ {
DBG_871X("\n rtw_hal_deinit: hal_init fail\n"); DBG_88E("\n rtw_hal_deinit: hal_init fail\n");
} }
return status; return status;
} }
@ -201,28 +201,28 @@ void rtw_hal_get_odm_var(struct adapter *padapter, enum HAL_ODM_VARIABLE eVariab
void rtw_hal_enable_interrupt(struct adapter *padapter) void rtw_hal_enable_interrupt(struct adapter *padapter)
{ {
if (!is_primary_adapter(padapter)) { if (!is_primary_adapter(padapter)) {
DBG_871X(" rtw_hal_enable_interrupt: Secondary adapter return l\n"); DBG_88E(" rtw_hal_enable_interrupt: Secondary adapter return l\n");
return; return;
} }
if (padapter->HalFunc.enable_interrupt) if (padapter->HalFunc.enable_interrupt)
padapter->HalFunc.enable_interrupt(padapter); padapter->HalFunc.enable_interrupt(padapter);
else else
DBG_871X("%s: HalFunc.enable_interrupt is NULL!\n", __FUNCTION__); DBG_88E("%s: HalFunc.enable_interrupt is NULL!\n", __FUNCTION__);
} }
void rtw_hal_disable_interrupt(struct adapter *padapter) void rtw_hal_disable_interrupt(struct adapter *padapter)
{ {
if (!is_primary_adapter(padapter)) { if (!is_primary_adapter(padapter)) {
DBG_871X(" rtw_hal_disable_interrupt: Secondary adapter return l\n"); DBG_88E(" rtw_hal_disable_interrupt: Secondary adapter return l\n");
return; return;
} }
if (padapter->HalFunc.disable_interrupt) if (padapter->HalFunc.disable_interrupt)
padapter->HalFunc.disable_interrupt(padapter); padapter->HalFunc.disable_interrupt(padapter);
else else
DBG_871X("%s: HalFunc.disable_interrupt is NULL!\n", __FUNCTION__); DBG_88E("%s: HalFunc.disable_interrupt is NULL!\n", __FUNCTION__);
} }
@ -232,7 +232,7 @@ u32 rtw_hal_inirp_init(struct adapter *padapter)
if (padapter->HalFunc.inirp_init) if (padapter->HalFunc.inirp_init)
rst = padapter->HalFunc.inirp_init(padapter); rst = padapter->HalFunc.inirp_init(padapter);
else else
DBG_871X(" %s HalFunc.inirp_init is NULL!!!\n",__FUNCTION__); DBG_88E(" %s HalFunc.inirp_init is NULL!!!\n",__FUNCTION__);
return rst; return rst;
} }

2
hal/odm.c
View file

@ -3897,7 +3897,7 @@ void odm_dtc(PDM_ODM_T pDM_Odm)
resp_txagc = resp_txagc | (resp_txagc << 5); resp_txagc = resp_txagc | (resp_txagc << 5);
ODM_Write1Byte(pDM_Odm, 0x06d9, resp_txagc); ODM_Write1Byte(pDM_Odm, 0x06d9, resp_txagc);
DBG_871X("%s RSSI_Min:%u, set RESP_TXAGC to %s %u\n", DBG_88E("%s RSSI_Min:%u, set RESP_TXAGC to %s %u\n",
__func__, pDM_Odm->RSSI_Min, sign?"minus":"plus", dtc_steps); __func__, pDM_Odm->RSSI_Min, sign?"minus":"plus", dtc_steps);
#endif /* CONFIG_RESP_TXAGC_ADJUST */ #endif /* CONFIG_RESP_TXAGC_ADJUST */
} }

42
hal/rtl8188e_cmd.c
View file

@ -228,7 +228,7 @@ void rtl8188e_Add_RateATid(struct adapter *pAdapter, u32 bitmap, u8 arg, u8 rssi
bitmap &= 0x0fffffff; bitmap &= 0x0fffffff;
DBG_871X("%s=> mac_id:%d , raid:%d , ra_bitmap=0x%x, shortGIrate=0x%02x\n", DBG_88E("%s=> mac_id:%d , raid:%d , ra_bitmap=0x%x, shortGIrate=0x%02x\n",
__FUNCTION__,macid ,raid ,bitmap, shortGIrate); __FUNCTION__,macid ,raid ,bitmap, shortGIrate);
@ -251,7 +251,7 @@ void rtl8188e_set_FwPwrMode_cmd(struct adapter *padapter, u8 Mode)
u8 RLBM = 0; /* 0:Min, 1:Max , 2:User define */ u8 RLBM = 0; /* 0:Min, 1:Max , 2:User define */
; ;
DBG_871X("%s: Mode=%d SmartPS=%d UAPSD=%d\n", __FUNCTION__, DBG_88E("%s: Mode=%d SmartPS=%d UAPSD=%d\n", __FUNCTION__,
Mode, pwrpriv->smart_ps, padapter->registrypriv.uapsd_enable); Mode, pwrpriv->smart_ps, padapter->registrypriv.uapsd_enable);
H2CSetPwrMode.AwakeInterval = 2; /* DTIM =1 */ H2CSetPwrMode.AwakeInterval = 2; /* DTIM =1 */
@ -309,7 +309,7 @@ void rtl8188e_set_FwMediaStatus_cmd(struct adapter *padapter, __le16 mstatus_rpt
u32 reg_macid_no_link = REG_MACID_NO_LINK_0; u32 reg_macid_no_link = REG_MACID_NO_LINK_0;
opmode = (u8) mst_rpt; opmode = (u8) mst_rpt;
macid = (u8)(mst_rpt >> 8) ; macid = (u8)(mst_rpt >> 8) ;
DBG_871X("### %s: MStatus=%x MACID=%d\n", __FUNCTION__,opmode,macid); DBG_88E("### %s: MStatus=%x MACID=%d\n", __FUNCTION__,opmode,macid);
FillH2CCmd_88E(padapter, H2C_COM_MEDIA_STATUS_RPT, sizeof(mst_rpt), (u8 *)&mst_rpt); FillH2CCmd_88E(padapter, H2C_COM_MEDIA_STATUS_RPT, sizeof(mst_rpt), (u8 *)&mst_rpt);
if (macid > 31) { if (macid > 31) {
@ -342,7 +342,7 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength)
u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; u8 bc_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
/* DBG_871X("%s\n", __FUNCTION__); */ /* DBG_88E("%s\n", __FUNCTION__); */
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
@ -378,7 +378,7 @@ static void ConstructBeacon(struct adapter *padapter, u8 *pframe, u32 *pLength)
if ( (pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE) if ( (pmlmeinfo->state&0x03) == WIFI_FW_AP_STATE)
{ {
/* DBG_871X("ie len=%d\n", cur_network->IELength); */ /* DBG_88E("ie len=%d\n", cur_network->IELength); */
pktlen += cur_network->IELength - sizeof(struct ndis_802_11_fixed_ies); pktlen += cur_network->IELength - sizeof(struct ndis_802_11_fixed_ies);
memcpy(pframe, cur_network->IEs+sizeof(struct ndis_802_11_fixed_ies), pktlen); memcpy(pframe, cur_network->IEs+sizeof(struct ndis_802_11_fixed_ies), pktlen);
@ -423,13 +423,13 @@ _ConstructBeacon:
if ((pktlen + TXDESC_SIZE) > 512) if ((pktlen + TXDESC_SIZE) > 512)
{ {
DBG_871X("beacon frame too large\n"); DBG_88E("beacon frame too large\n");
return; return;
} }
*pLength = pktlen; *pLength = pktlen;
/* DBG_871X("%s bcn_sz=%d\n", __FUNCTION__, pktlen); */ /* DBG_88E("%s bcn_sz=%d\n", __FUNCTION__, pktlen); */
} }
@ -441,7 +441,7 @@ static void ConstructPSPoll(struct adapter *padapter, u8 *pframe, u32 *pLength)
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
/* DBG_871X("%s\n", __FUNCTION__); */ /* DBG_88E("%s\n", __FUNCTION__); */
pwlanhdr = (struct rtw_ieee80211_hdr *)pframe; pwlanhdr = (struct rtw_ieee80211_hdr *)pframe;
@ -482,7 +482,7 @@ static void ConstructNullFunctionData(
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
/* DBG_871X("%s:%d\n", __FUNCTION__, bForcePowerSave); */ /* DBG_88E("%s:%d\n", __FUNCTION__, bForcePowerSave); */
pwlanhdr = (struct rtw_ieee80211_hdr*)pframe; pwlanhdr = (struct rtw_ieee80211_hdr*)pframe;
@ -541,7 +541,7 @@ static void rtl8188e_set_FwRsvdPage_cmd(struct adapter *padapter, PRSVDPAGE_LOC
u8 u1H2CRsvdPageParm[H2C_8188E_RSVDPAGE_LOC_LEN]={0}; u8 u1H2CRsvdPageParm[H2C_8188E_RSVDPAGE_LOC_LEN]={0};
u8 u1H2CAoacRsvdPageParm[H2C_8188E_AOAC_RSVDPAGE_LOC_LEN]={0}; u8 u1H2CAoacRsvdPageParm[H2C_8188E_AOAC_RSVDPAGE_LOC_LEN]={0};
/* DBG_871X("8188RsvdPageLoc: PsPoll=%d Null=%d QoSNull=%d\n", */ /* DBG_88E("8188RsvdPageLoc: PsPoll=%d Null=%d QoSNull=%d\n", */
/* rsvdpageloc->LocPsPoll, rsvdpageloc->LocNullData, rsvdpageloc->LocQosNull); */ /* rsvdpageloc->LocPsPoll, rsvdpageloc->LocNullData, rsvdpageloc->LocQosNull); */
SET_8188E_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1H2CRsvdPageParm, rsvdpageloc->LocPsPoll); SET_8188E_H2CCMD_RSVDPAGE_LOC_PSPOLL(u1H2CRsvdPageParm, rsvdpageloc->LocPsPoll);
@ -597,11 +597,11 @@ static void SetFwRsvdPagePkt(struct adapter *padapter, bool bDLFinished)
u32 TotalPacketLen; u32 TotalPacketLen;
RSVDPAGE_LOC RsvdPageLoc; RSVDPAGE_LOC RsvdPageLoc;
DBG_871X("%s\n", __FUNCTION__); DBG_88E("%s\n", __FUNCTION__);
ReservedPagePacket = (u8*)rtw_zmalloc(RTL88E_RSVDPAGE_SIZE); ReservedPagePacket = (u8*)rtw_zmalloc(RTL88E_RSVDPAGE_SIZE);
if (ReservedPagePacket == NULL) { if (ReservedPagePacket == NULL) {
DBG_871X("%s: alloc ReservedPagePacket fail!\n", __FUNCTION__); DBG_88E("%s: alloc ReservedPagePacket fail!\n", __FUNCTION__);
return; return;
} }
@ -683,11 +683,11 @@ static void SetFwRsvdPagePkt(struct adapter *padapter, bool bDLFinished)
if (TotalPacketLen < RTL88E_RSVDPAGE_SIZE) if (TotalPacketLen < RTL88E_RSVDPAGE_SIZE)
memcpy(pmgntframe->buf_addr, ReservedPagePacket, TotalPacketLen); memcpy(pmgntframe->buf_addr, ReservedPagePacket, TotalPacketLen);
else else
DBG_871X("%s: memory copy fail at Line: %d\n", __FUNCTION__, __LINE__); DBG_88E("%s: memory copy fail at Line: %d\n", __FUNCTION__, __LINE__);
rtw_hal_mgnt_xmit(padapter, pmgntframe); rtw_hal_mgnt_xmit(padapter, pmgntframe);
DBG_871X("%s: Set RSVD page location to Fw\n", __FUNCTION__); DBG_88E("%s: Set RSVD page location to Fw\n", __FUNCTION__);
rtl8188e_set_FwRsvdPage_cmd(padapter, &RsvdPageLoc); rtl8188e_set_FwRsvdPage_cmd(padapter, &RsvdPageLoc);
/* FillH2CCmd_88E(padapter, H2C_COM_RSVD_PAGE, sizeof(RsvdPageLoc), (u8*)&RsvdPageLoc); */ /* FillH2CCmd_88E(padapter, H2C_COM_RSVD_PAGE, sizeof(RsvdPageLoc), (u8*)&RsvdPageLoc); */
@ -706,7 +706,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *padapter, u8 mstatus)
u8 DLBcnCount=0; u8 DLBcnCount=0;
u32 poll = 0; u32 poll = 0;
DBG_871X("%s mstatus(%x)\n", __FUNCTION__,mstatus); DBG_88E("%s mstatus(%x)\n", __FUNCTION__,mstatus);
if (mstatus == 1) { if (mstatus == 1) {
/* We should set AID, correct TSF, HW seq enable before set JoinBssReport to Fw in 88/92C. */ /* We should set AID, correct TSF, HW seq enable before set JoinBssReport to Fw in 88/92C. */
@ -732,7 +732,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *padapter, u8 mstatus)
if (pHalData->RegFwHwTxQCtrl&BIT6) if (pHalData->RegFwHwTxQCtrl&BIT6)
{ {
DBG_871X("HalDownloadRSVDPage(): There is an Adapter is sending beacon.\n"); DBG_88E("HalDownloadRSVDPage(): There is an Adapter is sending beacon.\n");
bSendBeacon = true; bSendBeacon = true;
} }
@ -765,9 +765,9 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *padapter, u8 mstatus)
{ {
} }
else if (!bcn_valid) else if (!bcn_valid)
DBG_871X("%s: 1 Download RSVD page failed! DLBcnCount:%u, poll:%u\n", __FUNCTION__ ,DLBcnCount, poll); DBG_88E("%s: 1 Download RSVD page failed! DLBcnCount:%u, poll:%u\n", __FUNCTION__ ,DLBcnCount, poll);
else else
DBG_871X("%s: 1 Download RSVD success! DLBcnCount:%u, poll:%u\n", __FUNCTION__, DLBcnCount, poll); DBG_88E("%s: 1 Download RSVD success! DLBcnCount:%u, poll:%u\n", __FUNCTION__, DLBcnCount, poll);
/* */ /* */
/* We just can send the reserved page twice during the time that Tx thread is stopped (e.g. pnpsetpower) */ /* We just can send the reserved page twice during the time that Tx thread is stopped (e.g. pnpsetpower) */
/* becuase we need to free the Tx BCN Desc which is used by the first reserved page packet. */ /* becuase we need to free the Tx BCN Desc which is used by the first reserved page packet. */
@ -802,9 +802,9 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *padapter, u8 mstatus)
{ {
} }
else if (!bcn_valid) else if (!bcn_valid)
DBG_871X("%s: 2 Download RSVD page failed! DLBcnCount:%u, poll:%u\n", __FUNCTION__ ,DLBcnCount, poll); DBG_88E("%s: 2 Download RSVD page failed! DLBcnCount:%u, poll:%u\n", __FUNCTION__ ,DLBcnCount, poll);
else else
DBG_871X("%s: 2 Download RSVD success! DLBcnCount:%u, poll:%u\n", __FUNCTION__, DLBcnCount, poll); DBG_88E("%s: 2 Download RSVD success! DLBcnCount:%u, poll:%u\n", __FUNCTION__, DLBcnCount, poll);
} }
} }
@ -831,7 +831,7 @@ void rtl8188e_set_FwJoinBssReport_cmd(struct adapter *padapter, u8 mstatus)
if (bcn_valid) if (bcn_valid)
{ {
rtw_hal_set_hwreg(padapter, HW_VAR_BCN_VALID, NULL); rtw_hal_set_hwreg(padapter, HW_VAR_BCN_VALID, NULL);
DBG_871X("Set RSVD page location to Fw.\n"); DBG_88E("Set RSVD page location to Fw.\n");
/* FillH2CCmd88E(Adapter, H2C_88E_RSVDPAGE, H2C_RSVDPAGE_LOC_LENGTH, pMgntInfo->u1RsvdPageLoc); */ /* FillH2CCmd88E(Adapter, H2C_88E_RSVDPAGE, H2C_RSVDPAGE_LOC_LENGTH, pMgntInfo->u1RsvdPageLoc); */
} }

112
hal/rtl8188e_hal_init.c
View file

@ -37,7 +37,7 @@ static void iol_mode_enable(struct adapter *padapter, u8 enable)
{ {
/* Enable initial offload */ /* Enable initial offload */
reg_0xf0 = rtw_read8(padapter, REG_SYS_CFG); reg_0xf0 = rtw_read8(padapter, REG_SYS_CFG);
/* DBG_871X("%s reg_0xf0:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0xf0, reg_0xf0|SW_OFFLOAD_EN); */ /* DBG_88E("%s reg_0xf0:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0xf0, reg_0xf0|SW_OFFLOAD_EN); */
rtw_write8(padapter, REG_SYS_CFG, reg_0xf0|SW_OFFLOAD_EN); rtw_write8(padapter, REG_SYS_CFG, reg_0xf0|SW_OFFLOAD_EN);
if (padapter->bFWReady == false) if (padapter->bFWReady == false)
@ -51,7 +51,7 @@ static void iol_mode_enable(struct adapter *padapter, u8 enable)
{ {
/* disable initial offload */ /* disable initial offload */
reg_0xf0 = rtw_read8(padapter, REG_SYS_CFG); reg_0xf0 = rtw_read8(padapter, REG_SYS_CFG);
/* DBG_871X("%s reg_0xf0:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0xf0, reg_0xf0& ~SW_OFFLOAD_EN); */ /* DBG_88E("%s reg_0xf0:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0xf0, reg_0xf0& ~SW_OFFLOAD_EN); */
rtw_write8(padapter, REG_SYS_CFG, reg_0xf0 & ~SW_OFFLOAD_EN); rtw_write8(padapter, REG_SYS_CFG, reg_0xf0 & ~SW_OFFLOAD_EN);
} }
} }
@ -65,7 +65,7 @@ static s32 iol_execute(struct adapter *padapter, u8 control)
u32 t1,t2; u32 t1,t2;
control = control&0x0f; control = control&0x0f;
reg_0x88 = rtw_read8(padapter, REG_HMEBOX_E0); reg_0x88 = rtw_read8(padapter, REG_HMEBOX_E0);
/* DBG_871X("%s reg_0x88:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0x88, reg_0x88|control); */ /* DBG_88E("%s reg_0x88:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0x88, reg_0x88|control); */
rtw_write8(padapter, REG_HMEBOX_E0, reg_0x88|control); rtw_write8(padapter, REG_HMEBOX_E0, reg_0x88|control);
t1 = start = jiffies; t1 = start = jiffies;
@ -74,7 +74,7 @@ static s32 iol_execute(struct adapter *padapter, u8 control)
(reg_0x88=rtw_read8(padapter, REG_HMEBOX_E0)) & control (reg_0x88=rtw_read8(padapter, REG_HMEBOX_E0)) & control
&& (passing_time=rtw_get_passing_time_ms(start))<1000 && (passing_time=rtw_get_passing_time_ms(start))<1000
) { ) {
/* DBG_871X("%s polling reg_0x88:0x%02x,reg_0x1c7:0x%02x\n", __FUNCTION__, reg_0x88,rtw_read8(padapter, 0x1c7) ); */ /* DBG_88E("%s polling reg_0x88:0x%02x,reg_0x1c7:0x%02x\n", __FUNCTION__, reg_0x88,rtw_read8(padapter, 0x1c7) ); */
/* rtw_udelay_os(100); */ /* rtw_udelay_os(100); */
} }
@ -84,7 +84,7 @@ static s32 iol_execute(struct adapter *padapter, u8 control)
status = _FAIL; status = _FAIL;
t2= jiffies; t2= jiffies;
/* printk("==> step iol_execute : %5u reg-0x1c0= 0x%02x\n",rtw_get_time_interval_ms(t1,t2),rtw_read8(padapter, 0x1c0)); */ /* printk("==> step iol_execute : %5u reg-0x1c0= 0x%02x\n",rtw_get_time_interval_ms(t1,t2),rtw_read8(padapter, 0x1c0)); */
/* DBG_871X("%s in %u ms, reg_0x88:0x%02x\n", __FUNCTION__, passing_time, reg_0x88); */ /* DBG_88E("%s in %u ms, reg_0x88:0x%02x\n", __FUNCTION__, passing_time, reg_0x88); */
return status; return status;
} }
@ -96,7 +96,7 @@ static s32 iol_InitLLTTable(
{ {
s32 rst = _SUCCESS; s32 rst = _SUCCESS;
iol_mode_enable(padapter, 1); iol_mode_enable(padapter, 1);
/* DBG_871X("%s txpktbuf_bndy:%u\n", __FUNCTION__, txpktbuf_bndy); */ /* DBG_88E("%s txpktbuf_bndy:%u\n", __FUNCTION__, txpktbuf_bndy); */
rtw_write8(padapter, REG_TDECTRL+1, txpktbuf_bndy); rtw_write8(padapter, REG_TDECTRL+1, txpktbuf_bndy);
rst = iol_execute(padapter, CMD_INIT_LLT); rst = iol_execute(padapter, CMD_INIT_LLT);
iol_mode_enable(padapter, 0); iol_mode_enable(padapter, 0);
@ -120,14 +120,14 @@ efuse_phymap_to_logical(u8 * phymap, u16 _offset, u16 _size_byte, u8 *pbuf)
efuseTbl = (u8*)rtw_zmalloc(EFUSE_MAP_LEN_88E); efuseTbl = (u8*)rtw_zmalloc(EFUSE_MAP_LEN_88E);
if (efuseTbl == NULL) if (efuseTbl == NULL)
{ {
DBG_871X("%s: alloc efuseTbl fail!\n", __FUNCTION__); DBG_88E("%s: alloc efuseTbl fail!\n", __FUNCTION__);
goto exit; goto exit;
} }
eFuseWord= (u16 **)rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(u16)); eFuseWord= (u16 **)rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(u16));
if (eFuseWord == NULL) if (eFuseWord == NULL)
{ {
DBG_871X("%s: alloc eFuseWord fail!\n", __FUNCTION__); DBG_88E("%s: alloc eFuseWord fail!\n", __FUNCTION__);
goto exit; goto exit;
} }
@ -149,7 +149,7 @@ efuse_phymap_to_logical(u8 * phymap, u16 _offset, u16 _size_byte, u8 *pbuf)
} }
else else
{ {
DBG_871X("EFUSE is empty efuse_Addr-%d efuse_data=%x\n", eFuse_Addr, rtemp8); DBG_88E("EFUSE is empty efuse_Addr-%d efuse_data=%x\n", eFuse_Addr, rtemp8);
goto exit; goto exit;
} }
@ -302,28 +302,28 @@ static void efuse_read_phymap_from_txpktbuf(
if (bcnhead<0) /* if not valid */ if (bcnhead<0) /* if not valid */
bcnhead = rtw_read8(adapter, REG_TDECTRL+1); bcnhead = rtw_read8(adapter, REG_TDECTRL+1);
DBG_871X("%s bcnhead:%d\n", __FUNCTION__, bcnhead); DBG_88E("%s bcnhead:%d\n", __FUNCTION__, bcnhead);
/* reg_0x106 = rtw_read8(adapter, REG_PKT_BUFF_ACCESS_CTRL); */ /* reg_0x106 = rtw_read8(adapter, REG_PKT_BUFF_ACCESS_CTRL); */
/* DBG_871X("%s reg_0x106:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0x106, 0x69); */ /* DBG_88E("%s reg_0x106:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0x106, 0x69); */
rtw_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT); rtw_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT);
/* DBG_871X("%s reg_0x106:0x%02x\n", __FUNCTION__, rtw_read8(adapter, 0x106)); */ /* DBG_88E("%s reg_0x106:0x%02x\n", __FUNCTION__, rtw_read8(adapter, 0x106)); */
dbg_addr = bcnhead*128/8; /* 8-bytes addressing */ dbg_addr = bcnhead*128/8; /* 8-bytes addressing */
while (1) while (1)
{ {
/* DBG_871X("%s dbg_addr:0x%x\n", __FUNCTION__, dbg_addr+i); */ /* DBG_88E("%s dbg_addr:0x%x\n", __FUNCTION__, dbg_addr+i); */
rtw_write16(adapter, REG_PKTBUF_DBG_ADDR, dbg_addr+i); rtw_write16(adapter, REG_PKTBUF_DBG_ADDR, dbg_addr+i);
/* DBG_871X("%s write reg_0x143:0x00\n", __FUNCTION__); */ /* DBG_88E("%s write reg_0x143:0x00\n", __FUNCTION__); */
rtw_write8(adapter, REG_TXPKTBUF_DBG, 0); rtw_write8(adapter, REG_TXPKTBUF_DBG, 0);
start = jiffies; start = jiffies;
while (!(reg_0x143=rtw_read8(adapter, REG_TXPKTBUF_DBG))/* dbg */ while (!(reg_0x143=rtw_read8(adapter, REG_TXPKTBUF_DBG))/* dbg */
/* while (rtw_read8(adapter, REG_TXPKTBUF_DBG) & BIT0 */ /* while (rtw_read8(adapter, REG_TXPKTBUF_DBG) & BIT0 */
&& (passing_time=rtw_get_passing_time_ms(start))<1000 && (passing_time=rtw_get_passing_time_ms(start))<1000
) { ) {
DBG_871X("%s polling reg_0x143:0x%02x, reg_0x106:0x%02x\n", __FUNCTION__, reg_0x143, rtw_read8(adapter, 0x106)); DBG_88E("%s polling reg_0x143:0x%02x, reg_0x106:0x%02x\n", __FUNCTION__, reg_0x143, rtw_read8(adapter, 0x106));
rtw_usleep_os(100); rtw_usleep_os(100);
} }
@ -342,7 +342,7 @@ static void efuse_read_phymap_from_txpktbuf(
len = le32_to_cpu(lo32) & 0x0000ffff; len = le32_to_cpu(lo32) & 0x0000ffff;
limit = (len - 2 < limit) ? len - 2 : limit; limit = (len - 2 < limit) ? len - 2 : limit;
DBG_871X("%s len:%u, lenc:%u\n", __func__, len, lenc); DBG_88E("%s len:%u, lenc:%u\n", __func__, len, lenc);
memcpy(pos, ((u8*)&lo32)+2, (limit>=count+2)?2:limit-count); memcpy(pos, ((u8*)&lo32)+2, (limit>=count+2)?2:limit-count);
count+= (limit>=count+2)?2:limit-count; count+= (limit>=count+2)?2:limit-count;
@ -366,7 +366,7 @@ static void efuse_read_phymap_from_txpktbuf(
rtw_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, DISABLE_TRXPKT_BUF_ACCESS); rtw_write8(adapter, REG_PKT_BUFF_ACCESS_CTRL, DISABLE_TRXPKT_BUF_ACCESS);
DBG_871X("%s read count:%u\n", __FUNCTION__, count); DBG_88E("%s read count:%u\n", __FUNCTION__, count);
*size = count; *size = count;
} }
@ -389,9 +389,9 @@ static s32 iol_read_efuse(
memset(physical_map, 0xFF, 512); memset(physical_map, 0xFF, 512);
/* reg_0x106 = rtw_read8(padapter, REG_PKT_BUFF_ACCESS_CTRL); */ /* reg_0x106 = rtw_read8(padapter, REG_PKT_BUFF_ACCESS_CTRL); */
/* DBG_871X("%s reg_0x106:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0x106, 0x69); */ /* DBG_88E("%s reg_0x106:0x%02x, write 0x%02x\n", __FUNCTION__, reg_0x106, 0x69); */
rtw_write8(padapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT); rtw_write8(padapter, REG_PKT_BUFF_ACCESS_CTRL, TXPKT_BUF_SELECT);
/* DBG_871X("%s reg_0x106:0x%02x\n", __FUNCTION__, rtw_read8(padapter, 0x106)); */ /* DBG_88E("%s reg_0x106:0x%02x\n", __FUNCTION__, rtw_read8(padapter, 0x106)); */
status = iol_execute(padapter, CMD_READ_EFUSE_MAP); status = iol_execute(padapter, CMD_READ_EFUSE_MAP);
@ -426,7 +426,7 @@ static s32 iol_ioconfig(
{ {
s32 rst = _SUCCESS; s32 rst = _SUCCESS;
/* DBG_871X("%s iocfg_bndy:%u\n", __FUNCTION__, iocfg_bndy); */ /* DBG_88E("%s iocfg_bndy:%u\n", __FUNCTION__, iocfg_bndy); */
rtw_write8(padapter, REG_TDECTRL+1, iocfg_bndy); rtw_write8(padapter, REG_TDECTRL+1, iocfg_bndy);
rst = iol_execute(padapter, CMD_IOCONFIG); rst = iol_execute(padapter, CMD_IOCONFIG);
@ -726,7 +726,7 @@ void _8051Reset88E(struct adapter *padapter)
_MCUIO_Reset88E(padapter,false); _MCUIO_Reset88E(padapter,false);
rtw_write8(padapter, REG_SYS_FUNC_EN+1, u1bTmp|(BIT2)); rtw_write8(padapter, REG_SYS_FUNC_EN+1, u1bTmp|(BIT2));
DBG_871X("=====> _8051Reset88E(): 8051 reset success .\n"); DBG_88E("=====> _8051Reset88E(): 8051 reset success .\n");
} }
static s32 _FWFreeToGo(struct adapter *padapter) static s32 _FWFreeToGo(struct adapter *padapter)
@ -742,10 +742,10 @@ static s32 _FWFreeToGo(struct adapter *padapter)
} while (counter++ < POLLING_READY_TIMEOUT_COUNT); } while (counter++ < POLLING_READY_TIMEOUT_COUNT);
if (counter >= POLLING_READY_TIMEOUT_COUNT) { if (counter >= POLLING_READY_TIMEOUT_COUNT) {
DBG_871X("%s: chksum report fail! REG_MCUFWDL:0x%08x\n", __FUNCTION__, value32); DBG_88E("%s: chksum report fail! REG_MCUFWDL:0x%08x\n", __FUNCTION__, value32);
return _FAIL; return _FAIL;
} }
DBG_871X("%s: Checksum report OK! REG_MCUFWDL:0x%08x\n", __FUNCTION__, value32); DBG_88E("%s: Checksum report OK! REG_MCUFWDL:0x%08x\n", __FUNCTION__, value32);
value32 = rtw_read32(padapter, REG_MCUFWDL); value32 = rtw_read32(padapter, REG_MCUFWDL);
@ -760,13 +760,13 @@ static s32 _FWFreeToGo(struct adapter *padapter)
do { do {
value32 = rtw_read32(padapter, REG_MCUFWDL); value32 = rtw_read32(padapter, REG_MCUFWDL);
if (value32 & WINTINI_RDY) { if (value32 & WINTINI_RDY) {
DBG_871X("%s: Polling FW ready success!! REG_MCUFWDL:0x%08x\n", __FUNCTION__, value32); DBG_88E("%s: Polling FW ready success!! REG_MCUFWDL:0x%08x\n", __FUNCTION__, value32);
return _SUCCESS; return _SUCCESS;
} }
rtw_udelay_os(5); rtw_udelay_os(5);
} while (counter++ < POLLING_READY_TIMEOUT_COUNT); } while (counter++ < POLLING_READY_TIMEOUT_COUNT);
DBG_871X ("%s: Polling FW ready fail!! REG_MCUFWDL:0x%08x\n", __FUNCTION__, value32); DBG_88E ("%s: Polling FW ready fail!! REG_MCUFWDL:0x%08x\n", __FUNCTION__, value32);
return _FAIL; return _FAIL;
} }
@ -803,7 +803,7 @@ static int load_firmware(struct rt_firmware *pFirmware, struct device *device, c
memcpy(pFirmware->szFwBuffer, fw->data, fw->size); memcpy(pFirmware->szFwBuffer, fw->data, fw->size);
pFirmware->ulFwLength = fw->size; pFirmware->ulFwLength = fw->size;
release_firmware(fw); release_firmware(fw);
DBG_871X_LEVEL(_drv_info_, "+%s: !bUsedWoWLANFw, FmrmwareLen:%d+\n", __func__, pFirmware->ulFwLength); DBG_88E_LEVEL(_drv_info_, "+%s: !bUsedWoWLANFw, FmrmwareLen:%d+\n", __func__, pFirmware->ulFwLength);
Exit: Exit:
return rtStatus; return rtStatus;
@ -873,19 +873,19 @@ s32 rtl8188e_FirmwareDownload(struct adapter *padapter)
(rtw_get_passing_time_ms(fwdl_start_time) > 500 && writeFW_retry++ >= 3)) (rtw_get_passing_time_ms(fwdl_start_time) > 500 && writeFW_retry++ >= 3))
break; break;
DBG_871X("%s writeFW_retry:%u, time after fwdl_start_time:%ums\n", DBG_88E("%s writeFW_retry:%u, time after fwdl_start_time:%ums\n",
__func__, writeFW_retry, rtw_get_passing_time_ms(fwdl_start_time) __func__, writeFW_retry, rtw_get_passing_time_ms(fwdl_start_time)
); );
} }
_FWDownloadEnable(padapter, false); _FWDownloadEnable(padapter, false);
if (_SUCCESS != rtStatus) { if (_SUCCESS != rtStatus) {
DBG_871X("DL Firmware failed!\n"); DBG_88E("DL Firmware failed!\n");
goto Exit; goto Exit;
} }
rtStatus = _FWFreeToGo(padapter); rtStatus = _FWFreeToGo(padapter);
if (_SUCCESS != rtStatus) { if (_SUCCESS != rtStatus) {
DBG_871X("DL Firmware failed!\n"); DBG_88E("DL Firmware failed!\n");
goto Exit; goto Exit;
} }
RT_TRACE(_module_hal_init_c_, _drv_info_, ("Firmware is ready to run!\n")); RT_TRACE(_module_hal_init_c_, _drv_info_, ("Firmware is ready to run!\n"));
@ -1080,14 +1080,14 @@ Hal_EfuseReadEFuse88E(
efuseTbl = (u8*)rtw_zmalloc(EFUSE_MAP_LEN_88E); efuseTbl = (u8*)rtw_zmalloc(EFUSE_MAP_LEN_88E);
if (efuseTbl == NULL) if (efuseTbl == NULL)
{ {
DBG_871X("%s: alloc efuseTbl fail!\n", __FUNCTION__); DBG_88E("%s: alloc efuseTbl fail!\n", __FUNCTION__);
goto exit; goto exit;
} }
eFuseWord= (u16 **)rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(u16)); eFuseWord= (u16 **)rtw_malloc2d(EFUSE_MAX_SECTION_88E, EFUSE_MAX_WORD_UNIT, sizeof(u16));
if (eFuseWord == NULL) if (eFuseWord == NULL)
{ {
DBG_871X("%s: alloc eFuseWord fail!\n", __FUNCTION__); DBG_88E("%s: alloc eFuseWord fail!\n", __FUNCTION__);
goto exit; goto exit;
} }
@ -1109,7 +1109,7 @@ Hal_EfuseReadEFuse88E(
} }
else else
{ {
DBG_871X("EFUSE is empty efuse_Addr-%d efuse_data=%x\n", eFuse_Addr, *rtemp8); DBG_88E("EFUSE is empty efuse_Addr-%d efuse_data=%x\n", eFuse_Addr, *rtemp8);
goto exit; goto exit;
} }
@ -1335,16 +1335,16 @@ exit:
if (_rtw_memcmp(logical_map, Adapter->eeprompriv.efuse_eeprom_data, 0x130) == false) if (_rtw_memcmp(logical_map, Adapter->eeprompriv.efuse_eeprom_data, 0x130) == false)
{ {
int i; int i;
DBG_871X("%s compare first 0x130 byte fail\n", __FUNCTION__); DBG_88E("%s compare first 0x130 byte fail\n", __FUNCTION__);
for (i=0;i<512;i++) for (i=0;i<512;i++)
{ {
if (i%16== 0) if (i%16== 0)
DBG_871X("0x%03x: ", i); DBG_88E("0x%03x: ", i);
DBG_871X("%02x ", logical_map[i]); DBG_88E("%02x ", logical_map[i]);
if (i%16==15) if (i%16==15)
DBG_871X("\n"); DBG_88E("\n");
} }
DBG_871X("\n"); DBG_88E("\n");
} }
#endif #endif
@ -2605,10 +2605,10 @@ void rtl8188e_stop_thread(struct adapter *padapter)
static void hal_notch_filter_8188e(struct adapter *adapter, bool enable) static void hal_notch_filter_8188e(struct adapter *adapter, bool enable)
{ {
if (enable) { if (enable) {
DBG_871X("Enable notch filter\n"); DBG_88E("Enable notch filter\n");
rtw_write8(adapter, rOFDM0_RxDSP+1, rtw_read8(adapter, rOFDM0_RxDSP+1) | BIT1); rtw_write8(adapter, rOFDM0_RxDSP+1, rtw_read8(adapter, rOFDM0_RxDSP+1) | BIT1);
} else { } else {
DBG_871X("Disable notch filter\n"); DBG_88E("Disable notch filter\n");
rtw_write8(adapter, rOFDM0_RxDSP+1, rtw_read8(adapter, rOFDM0_RxDSP+1) & ~BIT1); rtw_write8(adapter, rOFDM0_RxDSP+1, rtw_read8(adapter, rOFDM0_RxDSP+1) & ~BIT1);
} }
} }
@ -2843,7 +2843,7 @@ Hal_EfuseParseIDCode88E(
pEEPROM->bautoload_fail_flag = false; pEEPROM->bautoload_fail_flag = false;
} }
DBG_871X("EEPROM ID=0x%04x\n", EEPROMId); DBG_88E("EEPROM ID=0x%04x\n", EEPROMId);
} }
static void static void
@ -3176,9 +3176,9 @@ Hal_ReadTxPowerInfo88E(
if (bIn24G) if (bIn24G)
{ {
DBG_871X("======= Path %d, Channel %d =======\n",rfPath,ch+1 ); DBG_88E("======= Path %d, Channel %d =======\n",rfPath,ch+1 );
DBG_871X("Index24G_CCK_Base[%d][%d] = 0x%x\n",rfPath,ch+1 ,pHalData->Index24G_CCK_Base[rfPath][ch]); DBG_88E("Index24G_CCK_Base[%d][%d] = 0x%x\n",rfPath,ch+1 ,pHalData->Index24G_CCK_Base[rfPath][ch]);
DBG_871X("Index24G_BW40_Base[%d][%d] = 0x%x\n",rfPath,ch+1 ,pHalData->Index24G_BW40_Base[rfPath][ch]); DBG_88E("Index24G_BW40_Base[%d][%d] = 0x%x\n",rfPath,ch+1 ,pHalData->Index24G_BW40_Base[rfPath][ch]);
} }
} }
@ -3189,11 +3189,11 @@ Hal_ReadTxPowerInfo88E(
pHalData->BW20_24G_Diff[rfPath][TxCount]=pwrInfo24G.BW20_Diff[rfPath][TxCount]; pHalData->BW20_24G_Diff[rfPath][TxCount]=pwrInfo24G.BW20_Diff[rfPath][TxCount];
pHalData->BW40_24G_Diff[rfPath][TxCount]=pwrInfo24G.BW40_Diff[rfPath][TxCount]; pHalData->BW40_24G_Diff[rfPath][TxCount]=pwrInfo24G.BW40_Diff[rfPath][TxCount];
#if DBG #if DBG
DBG_871X("======= TxCount %d =======\n",TxCount ); DBG_88E("======= TxCount %d =======\n",TxCount );
DBG_871X("CCK_24G_Diff[%d][%d]= %d\n",rfPath,TxCount,pHalData->CCK_24G_Diff[rfPath][TxCount]); DBG_88E("CCK_24G_Diff[%d][%d]= %d\n",rfPath,TxCount,pHalData->CCK_24G_Diff[rfPath][TxCount]);
DBG_871X("OFDM_24G_Diff[%d][%d]= %d\n",rfPath,TxCount,pHalData->OFDM_24G_Diff[rfPath][TxCount]); DBG_88E("OFDM_24G_Diff[%d][%d]= %d\n",rfPath,TxCount,pHalData->OFDM_24G_Diff[rfPath][TxCount]);
DBG_871X("BW20_24G_Diff[%d][%d]= %d\n",rfPath,TxCount,pHalData->BW20_24G_Diff[rfPath][TxCount]); DBG_88E("BW20_24G_Diff[%d][%d]= %d\n",rfPath,TxCount,pHalData->BW20_24G_Diff[rfPath][TxCount]);
DBG_871X("BW40_24G_Diff[%d][%d]= %d\n",rfPath,TxCount,pHalData->BW40_24G_Diff[rfPath][TxCount]); DBG_88E("BW40_24G_Diff[%d][%d]= %d\n",rfPath,TxCount,pHalData->BW40_24G_Diff[rfPath][TxCount]);
#endif #endif
} }
} }
@ -3216,7 +3216,7 @@ Hal_ReadTxPowerInfo88E(
{ {
pHalData->EEPROMRegulatory = 0; pHalData->EEPROMRegulatory = 0;
} }
DBG_871X("EEPROMRegulatory = 0x%x\n", pHalData->EEPROMRegulatory); DBG_88E("EEPROMRegulatory = 0x%x\n", pHalData->EEPROMRegulatory);
} }
@ -3240,7 +3240,7 @@ Hal_EfuseParseXtal_8188E(
{ {
pHalData->CrystalCap = EEPROM_Default_CrystalCap_88E; pHalData->CrystalCap = EEPROM_Default_CrystalCap_88E;
} }
DBG_871X("CrystalCap: 0x%2x\n", pHalData->CrystalCap); DBG_88E("CrystalCap: 0x%2x\n", pHalData->CrystalCap);
} }
void void
@ -3256,7 +3256,7 @@ Hal_EfuseParseBoardType88E(
pHalData->BoardType = ((hwinfo[EEPROM_RF_BOARD_OPTION_88E]&0xE0)>>5); pHalData->BoardType = ((hwinfo[EEPROM_RF_BOARD_OPTION_88E]&0xE0)>>5);
else else
pHalData->BoardType = 0; pHalData->BoardType = 0;
DBG_871X("Board Type: 0x%2x\n", pHalData->BoardType); DBG_88E("Board Type: 0x%2x\n", pHalData->BoardType);
} }
void void
@ -3295,7 +3295,7 @@ rtl8188e_EfuseParseChnlPlan(
, AutoLoadFail , AutoLoadFail
); );
DBG_871X("mlmepriv.ChannelPlan = 0x%02x\n", padapter->mlmepriv.ChannelPlan); DBG_88E("mlmepriv.ChannelPlan = 0x%02x\n", padapter->mlmepriv.ChannelPlan);
} }
void void
@ -3317,8 +3317,8 @@ Hal_EfuseParseCustomerID88E(
pHalData->EEPROMCustomerID = 0; pHalData->EEPROMCustomerID = 0;
pHalData->EEPROMSubCustomerID = 0; pHalData->EEPROMSubCustomerID = 0;
} }
DBG_871X("EEPROM Customer ID: 0x%2x\n", pHalData->EEPROMCustomerID); DBG_88E("EEPROM Customer ID: 0x%2x\n", pHalData->EEPROMCustomerID);
/* DBG_871X("EEPROM SubCustomer ID: 0x%02x\n", pHalData->EEPROMSubCustomerID); */ /* DBG_88E("EEPROM SubCustomer ID: 0x%02x\n", pHalData->EEPROMSubCustomerID); */
} }
@ -3365,7 +3365,7 @@ Hal_ReadAntennaDiversity88E(
pHalData->TRxAntDivType = pHalData->TRxAntDivType; /* The value in the driver setting of device manager. */ pHalData->TRxAntDivType = pHalData->TRxAntDivType; /* The value in the driver setting of device manager. */
} }
DBG_871X("EEPROM : AntDivCfg = %x, TRxAntDivType = %x\n",pHalData->AntDivCfg, pHalData->TRxAntDivType); DBG_88E("EEPROM : AntDivCfg = %x, TRxAntDivType = %x\n",pHalData->AntDivCfg, pHalData->TRxAntDivType);
} }
@ -3395,7 +3395,7 @@ Hal_ReadThermalMeter_88E(
} }
/* pHalData->ThermalMeter[0] = pHalData->EEPROMThermalMeter; */ /* pHalData->ThermalMeter[0] = pHalData->EEPROMThermalMeter; */
DBG_871X("ThermalMeter = 0x%x\n", pHalData->EEPROMThermalMeter); DBG_88E("ThermalMeter = 0x%x\n", pHalData->EEPROMThermalMeter);
} }

2
hal/rtl8188e_phycfg.c
View file

@ -1872,7 +1872,7 @@ static void _PHY_SwChnl8192C(struct adapter *Adapter, u8 channel)
if ( Adapter->bNotifyChannelChange ) if ( Adapter->bNotifyChannelChange )
{ {
DBG_871X( "[%s] ch = %d\n", __FUNCTION__, channel ); DBG_88E( "[%s] ch = %d\n", __FUNCTION__, channel );
} }
/* s1. pre common command - CmdID_SetTxPowerLevel */ /* s1. pre common command - CmdID_SetTxPowerLevel */

6
hal/rtl8188e_rf6052.c
View file

@ -295,7 +295,7 @@ static void getPowerBase88E(
powerBase0 = (powerBase0<<24) | (powerBase0<<16) |(powerBase0<<8) |powerBase0; powerBase0 = (powerBase0<<24) | (powerBase0<<16) |(powerBase0<<8) |powerBase0;
*(OfdmBase+i) = powerBase0; *(OfdmBase+i) = powerBase0;
/* DBG_871X(" [OFDM power base index rf(%c) = 0x%x]\n", ((i== 0)?'A':'B'), *(OfdmBase+i)); */ /* DBG_88E(" [OFDM power base index rf(%c) = 0x%x]\n", ((i== 0)?'A':'B'), *(OfdmBase+i)); */
} }
for (i=0; i<pHalData->NumTotalRFPath; i++) for (i=0; i<pHalData->NumTotalRFPath; i++)
@ -312,7 +312,7 @@ static void getPowerBase88E(
powerBase1 = powerlevel[i]; powerBase1 = powerlevel[i];
powerBase1 = (powerBase1<<24) | (powerBase1<<16) |(powerBase1<<8) |powerBase1; powerBase1 = (powerBase1<<24) | (powerBase1<<16) |(powerBase1<<8) |powerBase1;
*(MCSBase+i) = powerBase1; *(MCSBase+i) = powerBase1;
/* DBG_871X(" [MCS power base index rf(%c) = 0x%x]\n", ((i== 0)?'A':'B'), *(MCSBase+i)); */ /* DBG_88E(" [MCS power base index rf(%c) = 0x%x]\n", ((i== 0)?'A':'B'), *(MCSBase+i)); */
} }
} }
@ -541,7 +541,7 @@ rtl8188e_PHY_RF6052SetOFDMTxPower(
u8 index = 0; u8 index = 0;
/* DBG_871X("PHY_RF6052SetOFDMTxPower, channel(%d)\n", Channel); */ /* DBG_88E("PHY_RF6052SetOFDMTxPower, channel(%d)\n", Channel); */
getPowerBase88E(Adapter, pPowerLevelOFDM,pPowerLevelBW20,pPowerLevelBW40, Channel, &powerBase0[0], &powerBase1[0]); getPowerBase88E(Adapter, pPowerLevelOFDM,pPowerLevelBW20,pPowerLevelBW40, Channel, &powerBase0[0], &powerBase1[0]);

4
hal/rtl8188e_sreset.c
View file

@ -33,7 +33,7 @@ void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
u32 txdma_status; u32 txdma_status;
if ( (txdma_status=rtw_read32(padapter, REG_TXDMA_STATUS)) !=0x00) { if ( (txdma_status=rtw_read32(padapter, REG_TXDMA_STATUS)) !=0x00) {
DBG_871X("%s REG_TXDMA_STATUS:0x%08x\n", __FUNCTION__, txdma_status); DBG_88E("%s REG_TXDMA_STATUS:0x%08x\n", __FUNCTION__, txdma_status);
rtw_hal_sreset_reset(padapter); rtw_hal_sreset_reset(padapter);
} }
current_time = jiffies; current_time = jiffies;
@ -53,7 +53,7 @@ void rtl8188e_sreset_xmit_status_check(struct adapter *padapter)
rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DM_FUNC, &ability); rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DM_FUNC, &ability);
DBG_871X("%s tx hang %s\n", __FUNCTION__, DBG_88E("%s tx hang %s\n", __FUNCTION__,
(ability & ODM_BB_ADAPTIVITY)? "ODM_BB_ADAPTIVITY" : ""); (ability & ODM_BB_ADAPTIVITY)? "ODM_BB_ADAPTIVITY" : "");
if (!(ability & ODM_BB_ADAPTIVITY)) if (!(ability & ODM_BB_ADAPTIVITY))

6
hal/rtl8188e_xmit.c
View file

@ -28,7 +28,7 @@ void dump_txrpt_ccx_88e(void *buf)
{ {
struct txrpt_ccx_88e *txrpt_ccx = (struct txrpt_ccx_88e *)buf; struct txrpt_ccx_88e *txrpt_ccx = (struct txrpt_ccx_88e *)buf;
DBG_871X("%s:\n" DBG_88E("%s:\n"
"tag1:%u, pkt_num:%u, txdma_underflow:%u, int_bt:%u, int_tri:%u, int_ccx:%u\n" "tag1:%u, pkt_num:%u, txdma_underflow:%u, int_bt:%u, int_tri:%u, int_ccx:%u\n"
"mac_id:%u, pkt_ok:%u, bmc:%u\n" "mac_id:%u, pkt_ok:%u, bmc:%u\n"
"retry_cnt:%u, lifetime_over:%u, retry_over:%u\n" "retry_cnt:%u, lifetime_over:%u, retry_over:%u\n"
@ -68,13 +68,13 @@ void _dbg_dump_tx_info(struct adapter *padapter,int frame_tag,struct tx_desc *pt
rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DUMP_TXPKT, &(bDumpTxPkt)); rtw_hal_get_def_var(padapter, HAL_DEF_DBG_DUMP_TXPKT, &(bDumpTxPkt));
if (bDumpTxPkt ==1) {/* dump txdesc for data frame */ if (bDumpTxPkt ==1) {/* dump txdesc for data frame */
DBG_871X("dump tx_desc for data frame\n"); DBG_88E("dump tx_desc for data frame\n");
if ((frame_tag&0x0f) == DATA_FRAMETAG) { if ((frame_tag&0x0f) == DATA_FRAMETAG) {
bDumpTxDesc = true; bDumpTxDesc = true;
} }
} }
else if (bDumpTxPkt ==2) {/* dump txdesc for mgnt frame */ else if (bDumpTxPkt ==2) {/* dump txdesc for mgnt frame */
DBG_871X("dump tx_desc for mgnt frame\n"); DBG_88E("dump tx_desc for mgnt frame\n");
if ((frame_tag&0x0f) == MGNT_FRAMETAG) { if ((frame_tag&0x0f) == MGNT_FRAMETAG) {
bDumpTxDesc = true; bDumpTxDesc = true;
} }

14
hal/rtl8188eu_xmit.c
View file

@ -367,7 +367,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
#ifdef DBG_CCX #ifdef DBG_CCX
static u16 ccx_sw = 0x123; static u16 ccx_sw = 0x123;
ptxdesc->txdw7 |= cpu_to_le32(((ccx_sw)<<16)&0x0fff0000); ptxdesc->txdw7 |= cpu_to_le32(((ccx_sw)<<16)&0x0fff0000);
DBG_871X("%s set ccx, sw:0x%03x\n", __func__, ccx_sw); DBG_88E("%s set ccx, sw:0x%03x\n", __func__, ccx_sw);
ccx_sw = (ccx_sw+1)%0xfff; ccx_sw = (ccx_sw+1)%0xfff;
#endif #endif
ptxdesc->txdw2 |= cpu_to_le32(BIT(19)); ptxdesc->txdw2 |= cpu_to_le32(BIT(19));
@ -385,7 +385,7 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
#ifdef CONFIG_INTEL_PROXIM #ifdef CONFIG_INTEL_PROXIM
if ((padapter->proximity.proxim_on==true)&&(pattrib->intel_proxim==true)) { if ((padapter->proximity.proxim_on==true)&&(pattrib->intel_proxim==true)) {
DBG_871X("\n %s pattrib->rate=%d\n",__FUNCTION__,pattrib->rate); DBG_88E("\n %s pattrib->rate=%d\n",__FUNCTION__,pattrib->rate);
ptxdesc->txdw5 |= cpu_to_le32( pattrib->rate); ptxdesc->txdw5 |= cpu_to_le32( pattrib->rate);
} }
else else
@ -568,7 +568,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm
if (pxmitbuf == NULL) { if (pxmitbuf == NULL) {
pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv); pxmitbuf = rtw_alloc_xmitbuf(pxmitpriv);
if (pxmitbuf == NULL) { if (pxmitbuf == NULL) {
/* DBG_871X("%s #1, connot alloc xmitbuf!!!!\n",__FUNCTION__); */ /* DBG_88E("%s #1, connot alloc xmitbuf!!!!\n",__FUNCTION__); */
return false; return false;
} }
} }
@ -614,7 +614,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm
pxmitframe->pkt_offset = 1; /* first frame of aggregation, reserve offset */ pxmitframe->pkt_offset = 1; /* first frame of aggregation, reserve offset */
if (rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe) == false) { if (rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe) == false) {
DBG_871X("%s coalesce 1st xmitframe failed\n",__FUNCTION__); DBG_88E("%s coalesce 1st xmitframe failed\n",__FUNCTION__);
continue; continue;
} }
@ -644,13 +644,13 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm
/* psta = pfirstframe->attrib.psta; */ /* psta = pfirstframe->attrib.psta; */
psta = rtw_get_stainfo(&padapter->stapriv, pfirstframe->attrib.ra); psta = rtw_get_stainfo(&padapter->stapriv, pfirstframe->attrib.ra);
if (pfirstframe->attrib.psta != psta) { if (pfirstframe->attrib.psta != psta) {
DBG_871X("%s, pattrib->psta(%p) != psta(%p)\n", __func__, pfirstframe->attrib.psta, psta); DBG_88E("%s, pattrib->psta(%p) != psta(%p)\n", __func__, pfirstframe->attrib.psta, psta);
} }
if (psta == NULL) { if (psta == NULL) {
DBG_8192C("rtw_xmit_classifier: psta == NULL\n"); DBG_8192C("rtw_xmit_classifier: psta == NULL\n");
} }
if (!(psta->state &_FW_LINKED)) { 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);
} }
switch (pfirstframe->attrib.priority) { switch (pfirstframe->attrib.priority) {
@ -731,7 +731,7 @@ s32 rtl8188eu_xmitframe_complete(struct adapter *padapter, struct xmit_priv *pxm
pxmitframe->buf_addr = pxmitbuf->pbuf + pbuf; pxmitframe->buf_addr = pxmitbuf->pbuf + pbuf;
if (rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe) == false) { if (rtw_xmitframe_coalesce(padapter, pxmitframe->pkt, pxmitframe) == false) {
DBG_871X("%s coalesce failed\n",__FUNCTION__); DBG_88E("%s coalesce failed\n",__FUNCTION__);
rtw_free_xmitframe(pxmitpriv, pxmitframe); rtw_free_xmitframe(pxmitpriv, pxmitframe);
continue; continue;
} }

48
hal/usb_halinit.c
View file

@ -67,7 +67,7 @@ _ConfigNormalChipOutEP_8188E(
break; break;
} }
DBG_871X("%s OutEpQueueSel(0x%02x), OutEpNumber(%d)\n",__FUNCTION__,pHalData->OutEpQueueSel,pHalData->OutEpNumber ); DBG_88E("%s OutEpQueueSel(0x%02x), OutEpNumber(%d)\n",__FUNCTION__,pHalData->OutEpQueueSel,pHalData->OutEpNumber );
} }
@ -142,7 +142,7 @@ static u32 InitPowerOn_rtl8188eu(struct adapter *padapter)
if (!HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK, Rtl8188E_NIC_PWR_ON_FLOW)) if (!HalPwrSeqCmdParsing(padapter, PWR_CUT_ALL_MSK, PWR_FAB_ALL_MSK, PWR_INTF_USB_MSK, Rtl8188E_NIC_PWR_ON_FLOW))
{ {
DBG_871X(KERN_ERR "%s: run power on flow fail\n", __func__); DBG_88E(KERN_ERR "%s: run power on flow fail\n", __func__);
return _FAIL; return _FAIL;
} }
@ -1301,7 +1301,7 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)
#endif /* MP_DRIVER == 1 */ #endif /* MP_DRIVER == 1 */
status = rtl8188e_FirmwareDownload(Adapter); status = rtl8188e_FirmwareDownload(Adapter);
if (status != _SUCCESS) { if (status != _SUCCESS) {
DBG_871X("%s: Download Firmware failed!!\n", __FUNCTION__); DBG_88E("%s: Download Firmware failed!!\n", __FUNCTION__);
Adapter->bFWReady = false; Adapter->bFWReady = false;
pHalData->fw_ractrl = false; pHalData->fw_ractrl = false;
return status; return status;
@ -1317,7 +1317,7 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)
status = PHY_MACConfig8188E(Adapter); status = PHY_MACConfig8188E(Adapter);
if (status == _FAIL) if (status == _FAIL)
{ {
DBG_871X(" ### Failed to init MAC ......\n "); DBG_88E(" ### Failed to init MAC ......\n ");
goto exit; goto exit;
} }
#endif #endif
@ -1330,7 +1330,7 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)
status = PHY_BBConfig8188E(Adapter); status = PHY_BBConfig8188E(Adapter);
if (status == _FAIL) if (status == _FAIL)
{ {
DBG_871X(" ### Failed to init BB ......\n "); DBG_88E(" ### Failed to init BB ......\n ");
goto exit; goto exit;
} }
#endif #endif
@ -1341,7 +1341,7 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)
status = PHY_RFConfig8188E(Adapter); status = PHY_RFConfig8188E(Adapter);
if (status == _FAIL) if (status == _FAIL)
{ {
DBG_871X(" ### Failed to init RF ......\n "); DBG_88E(" ### Failed to init RF ......\n ");
goto exit; goto exit;
} }
#endif #endif
@ -1349,7 +1349,7 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_EFUSE_PATCH); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_EFUSE_PATCH);
status = rtl8188e_iol_efuse_patch(Adapter); status = rtl8188e_iol_efuse_patch(Adapter);
if (status == _FAIL) { if (status == _FAIL) {
DBG_871X("%s rtl8188e_iol_efuse_patch failed\n",__FUNCTION__); DBG_88E("%s rtl8188e_iol_efuse_patch failed\n",__FUNCTION__);
goto exit; goto exit;
} }
@ -1522,13 +1522,13 @@ static u32 rtl8188eu_hal_init(struct adapter *Adapter)
exit: exit:
HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_END); HAL_INIT_PROFILE_TAG(HAL_INIT_STAGES_END);
DBG_871X("%s in %dms\n", __FUNCTION__, rtw_get_passing_time_ms(init_start_time)); DBG_88E("%s in %dms\n", __FUNCTION__, rtw_get_passing_time_ms(init_start_time));
#ifdef DBG_HAL_INIT_PROFILING #ifdef DBG_HAL_INIT_PROFILING
hal_init_stages_timestamp[HAL_INIT_STAGES_END]=jiffies; hal_init_stages_timestamp[HAL_INIT_STAGES_END]=jiffies;
for (hal_init_profiling_i=0;hal_init_profiling_i<HAL_INIT_STAGES_NUM-1;hal_init_profiling_i++) { for (hal_init_profiling_i=0;hal_init_profiling_i<HAL_INIT_STAGES_NUM-1;hal_init_profiling_i++) {
DBG_871X("DBG_HAL_INIT_PROFILING: %35s, %u, %5u, %5u\n" DBG_88E("DBG_HAL_INIT_PROFILING: %35s, %u, %5u, %5u\n"
, hal_init_stages_str[hal_init_profiling_i] , hal_init_stages_str[hal_init_profiling_i]
, hal_init_stages_timestamp[hal_init_profiling_i] , hal_init_stages_timestamp[hal_init_profiling_i]
, (hal_init_stages_timestamp[hal_init_profiling_i+1]-hal_init_stages_timestamp[hal_init_profiling_i]) , (hal_init_stages_timestamp[hal_init_profiling_i+1]-hal_init_stages_timestamp[hal_init_profiling_i])
@ -1695,7 +1695,7 @@ static unsigned int rtl8188eu_inirp_init(struct adapter *Adapter)
if (pHalData->RtIntInPipe != 0x05) if (pHalData->RtIntInPipe != 0x05)
{ {
status = _FAIL; status = _FAIL;
DBG_871X("%s =>Warning !! Have not USB Int-IN pipe, pHalData->RtIntInPipe(%d)!!!\n",__FUNCTION__,pHalData->RtIntInPipe); DBG_88E("%s =>Warning !! Have not USB Int-IN pipe, pHalData->RtIntInPipe(%d)!!!\n",__FUNCTION__,pHalData->RtIntInPipe);
goto exit; goto exit;
} }
_read_interrupt = pintfhdl->io_ops._read_interrupt; _read_interrupt = pintfhdl->io_ops._read_interrupt;
@ -1857,8 +1857,8 @@ Hal_EfuseParsePIDVID_8188EU(
pHalData->EEPROMSubCustomerID = EEPROM_Default_SubCustomerID; pHalData->EEPROMSubCustomerID = EEPROM_Default_SubCustomerID;
} }
DBG_871X("VID = 0x%04X, PID = 0x%04X\n", pHalData->EEPROMVID, pHalData->EEPROMPID); DBG_88E("VID = 0x%04X, PID = 0x%04X\n", pHalData->EEPROMVID, pHalData->EEPROMPID);
DBG_871X("Customer ID: 0x%02X, SubCustomer ID: 0x%02X\n", pHalData->EEPROMCustomerID, pHalData->EEPROMSubCustomerID); DBG_88E("Customer ID: 0x%02X, SubCustomer ID: 0x%02X\n", pHalData->EEPROMCustomerID, pHalData->EEPROMSubCustomerID);
} }
static void static void
@ -2088,7 +2088,7 @@ static void hw_var_set_opmode(struct adapter *Adapter, u8 variable, u8* val)
val8 |= mode; val8 |= mode;
rtw_write8(Adapter, MSR, val8); rtw_write8(Adapter, MSR, val8);
DBG_871X("%s()-%d mode = %d\n", __FUNCTION__, __LINE__, mode); DBG_88E("%s()-%d mode = %d\n", __FUNCTION__, __LINE__, mode);
if ((mode == _HW_STATE_STATION_) || (mode == _HW_STATE_NOLINK_)) if ((mode == _HW_STATE_STATION_) || (mode == _HW_STATE_NOLINK_))
{ {
@ -2141,7 +2141,7 @@ static void hw_var_set_opmode(struct adapter *Adapter, u8 variable, u8* val)
/* Reset TSF for STA+AP concurrent mode */ /* Reset TSF for STA+AP concurrent mode */
if ( check_buddy_fwstate(Adapter, (WIFI_STATION_STATE|WIFI_ASOC_STATE)) ) { if ( check_buddy_fwstate(Adapter, (WIFI_STATION_STATE|WIFI_ASOC_STATE)) ) {
if (reset_tsf(Adapter, IFACE_PORT0) == false) if (reset_tsf(Adapter, IFACE_PORT0) == false)
DBG_871X("ERROR! %s()-%d: Reset port0 TSF fail\n", DBG_88E("ERROR! %s()-%d: Reset port0 TSF fail\n",
__FUNCTION__, __LINE__); __FUNCTION__, __LINE__);
} }
#endif /* CONFIG_TSF_RESET_OFFLOAD */ #endif /* CONFIG_TSF_RESET_OFFLOAD */
@ -2446,11 +2446,11 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
break; break;
case HW_VAR_ON_RCR_AM: case HW_VAR_ON_RCR_AM:
rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)|RCR_AM); rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)|RCR_AM);
DBG_871X("%s, %d, RCR= %x\n", __FUNCTION__,__LINE__, rtw_read32(Adapter, REG_RCR)); DBG_88E("%s, %d, RCR= %x\n", __FUNCTION__,__LINE__, rtw_read32(Adapter, REG_RCR));
break; break;
case HW_VAR_OFF_RCR_AM: case HW_VAR_OFF_RCR_AM:
rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)& (~RCR_AM)); rtw_write32(Adapter, REG_RCR, rtw_read32(Adapter, REG_RCR)& (~RCR_AM));
DBG_871X("%s, %d, RCR= %x\n", __FUNCTION__,__LINE__, rtw_read32(Adapter, REG_RCR)); DBG_88E("%s, %d, RCR= %x\n", __FUNCTION__,__LINE__, rtw_read32(Adapter, REG_RCR));
break; break;
case HW_VAR_BEACON_INTERVAL: case HW_VAR_BEACON_INTERVAL:
rtw_write16(Adapter, REG_BCN_INTERVAL, *((u16 *)val)); rtw_write16(Adapter, REG_BCN_INTERVAL, *((u16 *)val));
@ -2507,7 +2507,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
break; break;
case HW_VAR_DM_FLAG: case HW_VAR_DM_FLAG:
podmpriv->SupportAbility = *((u8 *)val); podmpriv->SupportAbility = *((u8 *)val);
/* DBG_871X("HW_VAR_DM_FLAG ==> SupportAbility:0x%08x\n",podmpriv->SupportAbility ); */ /* DBG_88E("HW_VAR_DM_FLAG ==> SupportAbility:0x%08x\n",podmpriv->SupportAbility ); */
break; break;
case HW_VAR_DM_FUNC_OP: case HW_VAR_DM_FUNC_OP:
if (val[0]) if (val[0])
@ -2518,7 +2518,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
{/* restore dm flag */ {/* restore dm flag */
podmpriv->SupportAbility = podmpriv->BK_SupportAbility; podmpriv->SupportAbility = podmpriv->BK_SupportAbility;
} }
/* DBG_871X("HW_VAR_DM_FUNC_OP ==> %s SupportAbility:0x%08x\n", */ /* DBG_88E("HW_VAR_DM_FUNC_OP ==> %s SupportAbility:0x%08x\n", */
/* (val[0]==1)?"Save":"Restore", */ /* (val[0]==1)?"Save":"Restore", */
/* podmpriv->SupportAbility */ /* podmpriv->SupportAbility */
/* ); */ /* ); */
@ -2531,7 +2531,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
else { else {
podmpriv->SupportAbility |= *((u32 *)val); podmpriv->SupportAbility |= *((u32 *)val);
} }
/* DBG_871X("HW_VAR_DM_FUNC_SET ==> SupportAbility:0x%08x\n",podmpriv->SupportAbility ); */ /* DBG_88E("HW_VAR_DM_FUNC_SET ==> SupportAbility:0x%08x\n",podmpriv->SupportAbility ); */
break; break;
case HW_VAR_DM_FUNC_CLR: case HW_VAR_DM_FUNC_CLR:
podmpriv->SupportAbility &= *((u32 *)val); podmpriv->SupportAbility &= *((u32 *)val);
@ -2617,7 +2617,7 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
else else
AcmCtrl &= (~AcmHw_BeqEn); AcmCtrl &= (~AcmHw_BeqEn);
DBG_871X("[HW_VAR_ACM_CTRL] Write 0x%X\n", AcmCtrl ); DBG_88E("[HW_VAR_ACM_CTRL] Write 0x%X\n", AcmCtrl );
rtw_write8(Adapter, REG_ACMHWCTRL, AcmCtrl ); rtw_write8(Adapter, REG_ACMHWCTRL, AcmCtrl );
} }
break; break;
@ -2825,13 +2825,13 @@ static void SetHwReg8188EU(struct adapter *Adapter, u8 variable, u8* val)
break; break;
case HW_VAR_APFM_ON_MAC: case HW_VAR_APFM_ON_MAC:
pHalData->bMacPwrCtrlOn = *val; pHalData->bMacPwrCtrlOn = *val;
DBG_871X("%s: bMacPwrCtrlOn=%d\n", __func__, pHalData->bMacPwrCtrlOn); DBG_88E("%s: bMacPwrCtrlOn=%d\n", __func__, pHalData->bMacPwrCtrlOn);
break; break;
#if (RATE_ADAPTIVE_SUPPORT == 1) #if (RATE_ADAPTIVE_SUPPORT == 1)
case HW_VAR_TX_RPT_MAX_MACID: case HW_VAR_TX_RPT_MAX_MACID:
{ {
u8 maxMacid = *val; u8 maxMacid = *val;
DBG_871X("### MacID(%d),Set Max Tx RPT MID(%d)\n",maxMacid,maxMacid+1); DBG_88E("### MacID(%d),Set Max Tx RPT MID(%d)\n",maxMacid,maxMacid+1);
rtw_write8(Adapter, REG_TX_RPT_CTRL+1, maxMacid+1); rtw_write8(Adapter, REG_TX_RPT_CTRL+1, maxMacid+1);
} }
break; break;
@ -3015,7 +3015,7 @@ static u8 GetHalDefVar8188EUsb(
bLinked = true; bLinked = true;
if (bLinked) { if (bLinked) {
DBG_871X("============ RA status check ===================\n"); DBG_88E("============ RA status check ===================\n");
if (Adapter->bRxRSSIDisplay >30) if (Adapter->bRxRSSIDisplay >30)
Adapter->bRxRSSIDisplay = 1; Adapter->bRxRSSIDisplay = 1;
for (i=0;i< Adapter->bRxRSSIDisplay;i++) { for (i=0;i< Adapter->bRxRSSIDisplay;i++) {
@ -3221,7 +3221,7 @@ static void UpdateHalRAMask8188EUsb(struct adapter *padapter, u32 mac_id, u8 rss
if (shortGIrate==true) if (shortGIrate==true)
arg |= BIT(5); arg |= BIT(5);
mask |= ((raid<<28)&0xf0000000); mask |= ((raid<<28)&0xf0000000);
DBG_871X("update raid entry, mask=0x%x, arg=0x%x\n", mask, arg); DBG_88E("update raid entry, mask=0x%x, arg=0x%x\n", mask, arg);
psta->ra_mask=mask; psta->ra_mask=mask;
#ifdef CONFIG_INTEL_PROXIM #ifdef CONFIG_INTEL_PROXIM
if (padapter->proximity.proxim_on ==true) { if (padapter->proximity.proxim_on ==true) {

10
hal/usb_ops_linux.c
View file

@ -301,13 +301,13 @@ static void interrupt_handler_8188eu(struct adapter *padapter,u16 pkt_len,u8 *pb
memcpy(&(pHalData->IntArray[1]), &(pbuf[USB_INTR_CONTENT_HISRE_OFFSET]), 4); memcpy(&(pHalData->IntArray[1]), &(pbuf[USB_INTR_CONTENT_HISRE_OFFSET]), 4);
if ( pHalData->IntArray[1] & IMR_TXERR_88E ) if ( pHalData->IntArray[1] & IMR_TXERR_88E )
DBG_871X("===> %s Tx Error Flag Interrupt Status\n",__FUNCTION__); DBG_88E("===> %s Tx Error Flag Interrupt Status\n",__FUNCTION__);
if ( pHalData->IntArray[1] & IMR_RXERR_88E ) if ( pHalData->IntArray[1] & IMR_RXERR_88E )
DBG_871X("===> %s Rx Error Flag INT Status\n",__FUNCTION__); DBG_88E("===> %s Rx Error Flag INT Status\n",__FUNCTION__);
if ( pHalData->IntArray[1] & IMR_TXFOVW_88E ) if ( pHalData->IntArray[1] & IMR_TXFOVW_88E )
DBG_871X("===> %s Transmit FIFO Overflow\n",__FUNCTION__); DBG_88E("===> %s Transmit FIFO Overflow\n",__FUNCTION__);
if ( pHalData->IntArray[1] & IMR_RXFOVW_88E ) if ( pHalData->IntArray[1] & IMR_RXFOVW_88E )
DBG_871X("===> %s Receive FIFO Overflow\n",__FUNCTION__); DBG_88E("===> %s Receive FIFO Overflow\n",__FUNCTION__);
/* C2H Event */ /* C2H Event */
if (pbuf[0]!= 0) { if (pbuf[0]!= 0) {
@ -885,5 +885,5 @@ void rtl8188eu_set_hw_type(struct adapter *padapter)
{ {
padapter->chip_type = RTL8188E; padapter->chip_type = RTL8188E;
padapter->HardwareType = HARDWARE_TYPE_RTL8188EU; padapter->HardwareType = HARDWARE_TYPE_RTL8188EU;
DBG_871X("CHIP TYPE: RTL8188E\n"); DBG_88E("CHIP TYPE: RTL8188E\n");
} }

12
include/rtw_debug.h
View file

@ -160,10 +160,10 @@ extern void rtl871x_cedbg(const char *fmt, ...);
#define _func_exit_ do{}while (0) #define _func_exit_ do{}while (0)
#define RT_PRINT_DATA(_Comp, _Level, _TitleString, _HexData, _HexDataLen) do{}while (0) #define RT_PRINT_DATA(_Comp, _Level, _TitleString, _HexData, _HexDataLen) do{}while (0)
#define DBG_871X(x, ...) do {} while (0) #define DBG_88E(x, ...) do {} while (0)
#define MSG_8192C(x, ...) do {} while (0) #define MSG_8192C(x, ...) do {} while (0)
#define DBG_8192C(x,...) do {} while (0) #define DBG_8192C(x,...) do {} while (0)
#define DBG_871X_LEVEL(x,...) do {} while (0) #define DBG_88E_LEVEL(x,...) do {} while (0)
#undef _dbgdump #undef _dbgdump
#define _dbgdump printk #define _dbgdump printk
@ -172,8 +172,8 @@ extern u32 GlobalDebugLevel;
#define DRIVER_PREFIX "R8188EU: " #define DRIVER_PREFIX "R8188EU: "
#if defined (_dbgdump) #if defined (_dbgdump)
#undef DBG_871X_LEVEL #undef DBG_88E_LEVEL
#define DBG_871X_LEVEL(level, fmt, arg...) \ #define DBG_88E_LEVEL(level, fmt, arg...) \
do {\ do {\
if (level <= GlobalDebugLevel) {\ if (level <= GlobalDebugLevel) {\
if (level <= _drv_err_ && level > _drv_always_) \ if (level <= _drv_err_ && level > _drv_always_) \
@ -186,8 +186,8 @@ extern u32 GlobalDebugLevel;
#ifdef CONFIG_DEBUG #ifdef CONFIG_DEBUG
#if defined (_dbgdump) #if defined (_dbgdump)
#undef DBG_871X #undef DBG_88E
#define DBG_871X(...) do {\ #define DBG_88E(...) do {\
_dbgdump(DRIVER_PREFIX __VA_ARGS__);\ _dbgdump(DRIVER_PREFIX __VA_ARGS__);\
}while (0) }while (0)

2
include/rtw_mlme_ext.h
View file

@ -682,7 +682,7 @@ void sa_query_timer_hdl(struct adapter *padapter);
#ifdef CONFIG_IEEE80211W #ifdef CONFIG_IEEE80211W
#define set_sa_query_timer(mlmeext, ms) \ #define set_sa_query_timer(mlmeext, ms) \
do { \ do { \
DBG_871X("%s set_sa_query_timer(%p, %d)\n", __FUNCTION__, (mlmeext), (ms)); \ DBG_88E("%s set_sa_query_timer(%p, %d)\n", __FUNCTION__, (mlmeext), (ms)); \
_set_timer(&(mlmeext)->sa_query_timer, (ms)); \ _set_timer(&(mlmeext)->sa_query_timer, (ms)); \
} while (0) } while (0)
#endif /* CONFIG_IEEE80211W */ #endif /* CONFIG_IEEE80211W */

212
os_dep/ioctl_cfg80211.c
View file

@ -343,7 +343,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl
bssinf_len = pnetwork->network.IELength+sizeof (struct rtw_ieee80211_hdr_3addr); bssinf_len = pnetwork->network.IELength+sizeof (struct rtw_ieee80211_hdr_3addr);
if (bssinf_len > MAX_BSSINFO_LEN) { if (bssinf_len > MAX_BSSINFO_LEN) {
DBG_871X("%s IE Length too long > %d byte\n",__FUNCTION__,MAX_BSSINFO_LEN); DBG_88E("%s IE Length too long > %d byte\n",__FUNCTION__,MAX_BSSINFO_LEN);
goto exit; goto exit;
} }
@ -373,7 +373,7 @@ struct cfg80211_bss *rtw_cfg80211_inform_bss(struct adapter *padapter, struct wl
else if (pssid->SsidLength == ssids[0].ssid_len && else if (pssid->SsidLength == ssids[0].ssid_len &&
_rtw_memcmp(pssid->Ssid, ssids[0].ssid, ssids[0].ssid_len)) _rtw_memcmp(pssid->Ssid, ssids[0].ssid, ssids[0].ssid_len))
{ {
DBG_871X("%s, got sr and ssid match!\n", __func__); DBG_88E("%s, got sr and ssid match!\n", __func__);
} }
else else
{ {
@ -535,7 +535,7 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)
u32 freq; u32 freq;
u16 channel = cur_network->network.Configuration.DSConfig; u16 channel = cur_network->network.Configuration.DSConfig;
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter)); DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
if (pwdev->iftype != NL80211_IFTYPE_ADHOC) if (pwdev->iftype != NL80211_IFTYPE_ADHOC)
{ {
return; return;
@ -551,11 +551,11 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)
memcpy(&cur_network->network, pnetwork, sizeof(struct wlan_bssid_ex)); memcpy(&cur_network->network, pnetwork, sizeof(struct wlan_bssid_ex));
if (cur_network) { if (cur_network) {
if (!rtw_cfg80211_inform_bss(padapter,cur_network)) if (!rtw_cfg80211_inform_bss(padapter,cur_network))
DBG_871X(FUNC_ADPT_FMT" inform fail !!\n", FUNC_ADPT_ARG(padapter)); DBG_88E(FUNC_ADPT_FMT" inform fail !!\n", FUNC_ADPT_ARG(padapter));
else else
DBG_871X(FUNC_ADPT_FMT" inform success !!\n", FUNC_ADPT_ARG(padapter)); DBG_88E(FUNC_ADPT_FMT" inform success !!\n", FUNC_ADPT_ARG(padapter));
} else { } else {
DBG_871X("cur_network is not exist!!!\n"); DBG_88E("cur_network is not exist!!!\n");
return ; return ;
} }
} else { } else {
@ -568,18 +568,18 @@ void rtw_cfg80211_ibss_indicate_connect(struct adapter *padapter)
&& _rtw_memcmp(scanned->network.MacAddress, pnetwork->MacAddress, sizeof(ETH_ALEN)) == true && _rtw_memcmp(scanned->network.MacAddress, pnetwork->MacAddress, sizeof(ETH_ALEN)) == true
) { ) {
if (!rtw_cfg80211_inform_bss(padapter,scanned)) { if (!rtw_cfg80211_inform_bss(padapter,scanned)) {
DBG_871X(FUNC_ADPT_FMT" inform fail !!\n", FUNC_ADPT_ARG(padapter)); DBG_88E(FUNC_ADPT_FMT" inform fail !!\n", FUNC_ADPT_ARG(padapter));
} else { } else {
/* DBG_871X(FUNC_ADPT_FMT" inform success !!\n", FUNC_ADPT_ARG(padapter)); */ /* DBG_88E(FUNC_ADPT_FMT" inform success !!\n", FUNC_ADPT_ARG(padapter)); */
} }
} else { } else {
DBG_871X("scanned & pnetwork compare fail\n"); DBG_88E("scanned & pnetwork compare fail\n");
rtw_warn_on(1); rtw_warn_on(1);
} }
} }
if (!rtw_cfg80211_check_bss(padapter)) if (!rtw_cfg80211_check_bss(padapter))
DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" BSS not found !!\n", FUNC_ADPT_ARG(padapter)); DBG_88E_LEVEL(_drv_always_, FUNC_ADPT_FMT" BSS not found !!\n", FUNC_ADPT_ARG(padapter));
} }
/* notify cfg80211 that device joined an IBSS */ /* notify cfg80211 that device joined an IBSS */
if (channel <= RTW_CH_MAX_2G_CHANNEL) if (channel <= RTW_CH_MAX_2G_CHANNEL)
@ -604,7 +604,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)
#endif #endif
struct cfg80211_bss *bss = NULL; struct cfg80211_bss *bss = NULL;
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter)); DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
if (pwdev->iftype != NL80211_IFTYPE_STATION if (pwdev->iftype != NL80211_IFTYPE_STATION
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
&& pwdev->iftype != NL80211_IFTYPE_P2P_CLIENT && pwdev->iftype != NL80211_IFTYPE_P2P_CLIENT
@ -633,7 +633,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)
struct wlan_bssid_ex *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network); struct wlan_bssid_ex *pnetwork = &(padapter->mlmeextpriv.mlmext_info.network);
struct wlan_network *scanned = pmlmepriv->cur_network_scanned; struct wlan_network *scanned = pmlmepriv->cur_network_scanned;
/* DBG_871X(FUNC_ADPT_FMT" BSS not found\n", FUNC_ADPT_ARG(padapter)); */ /* DBG_88E(FUNC_ADPT_FMT" BSS not found\n", FUNC_ADPT_ARG(padapter)); */
if (scanned == NULL) { if (scanned == NULL) {
rtw_warn_on(1); rtw_warn_on(1);
@ -644,12 +644,12 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)
&& _rtw_memcmp(&(scanned->network.Ssid), &(pnetwork->Ssid), sizeof(struct ndis_802_11_ssid)) == true && _rtw_memcmp(&(scanned->network.Ssid), &(pnetwork->Ssid), sizeof(struct ndis_802_11_ssid)) == true
) { ) {
if (!rtw_cfg80211_inform_bss(padapter,scanned)) { if (!rtw_cfg80211_inform_bss(padapter,scanned)) {
DBG_871X(FUNC_ADPT_FMT" inform fail !!\n", FUNC_ADPT_ARG(padapter)); DBG_88E(FUNC_ADPT_FMT" inform fail !!\n", FUNC_ADPT_ARG(padapter));
} else { } else {
/* DBG_871X(FUNC_ADPT_FMT" inform success !!\n", FUNC_ADPT_ARG(padapter)); */ /* DBG_88E(FUNC_ADPT_FMT" inform success !!\n", FUNC_ADPT_ARG(padapter)); */
} }
} else { } else {
DBG_871X("scanned: %s("MAC_FMT"), cur: %s("MAC_FMT")\n", DBG_88E("scanned: %s("MAC_FMT"), cur: %s("MAC_FMT")\n",
scanned->network.Ssid.Ssid, MAC_ARG(scanned->network.MacAddress), scanned->network.Ssid.Ssid, MAC_ARG(scanned->network.MacAddress),
pnetwork->Ssid.Ssid, MAC_ARG(pnetwork->MacAddress) pnetwork->Ssid.Ssid, MAC_ARG(pnetwork->MacAddress)
); );
@ -659,7 +659,7 @@ void rtw_cfg80211_indicate_connect(struct adapter *padapter)
check_bss: check_bss:
if (!rtw_cfg80211_check_bss(padapter)) if (!rtw_cfg80211_check_bss(padapter))
DBG_871X_LEVEL(_drv_always_, FUNC_ADPT_FMT" BSS not found !!\n", FUNC_ADPT_ARG(padapter)); DBG_88E_LEVEL(_drv_always_, FUNC_ADPT_FMT" BSS not found !!\n", FUNC_ADPT_ARG(padapter));
if (rtw_to_roaming(padapter) > 0) { if (rtw_to_roaming(padapter) > 0) {
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) || defined(COMPAT_KERNEL_RELEASE) #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) || defined(COMPAT_KERNEL_RELEASE)
@ -676,7 +676,7 @@ check_bss:
notify_channel = ieee80211_get_channel(wiphy, freq); notify_channel = ieee80211_get_channel(wiphy, freq);
#endif #endif
DBG_871X(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter)); DBG_88E(FUNC_ADPT_FMT" call cfg80211_roamed\n", FUNC_ADPT_ARG(padapter));
cfg80211_roamed(padapter->pnetdev cfg80211_roamed(padapter->pnetdev
#if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) || defined(COMPAT_KERNEL_RELEASE) #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 39) || defined(COMPAT_KERNEL_RELEASE)
, notify_channel , notify_channel
@ -705,7 +705,7 @@ void rtw_cfg80211_indicate_disconnect(struct adapter *padapter)
struct wifidirect_info *pwdinfo= &(padapter->wdinfo); struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
#endif #endif
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter)); DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
if (pwdev->iftype != NL80211_IFTYPE_STATION if (pwdev->iftype != NL80211_IFTYPE_STATION
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
@ -1287,7 +1287,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param
} }
/* DEBUG_ERR((" param->u.crypt.key_len=%d\n",param->u.crypt.key_len)); */ /* DEBUG_ERR((" param->u.crypt.key_len=%d\n",param->u.crypt.key_len)); */
DBG_871X(" ~~~~set sta key:unicastkey\n"); DBG_88E(" ~~~~set sta key:unicastkey\n");
rtw_setstakey_cmd(padapter, (unsigned char *)psta, true, true); rtw_setstakey_cmd(padapter, (unsigned char *)psta, true, true);
} }
@ -1300,7 +1300,7 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param
memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[24]),8); memcpy(padapter->securitypriv.dot118021XGrprxmickey[param->u.crypt.idx].skey,&(param->u.crypt.key[24]),8);
padapter->securitypriv.binstallGrpkey = true; padapter->securitypriv.binstallGrpkey = true;
/* DEBUG_ERR((" param->u.crypt.key_len=%d\n", param->u.crypt.key_len)); */ /* DEBUG_ERR((" param->u.crypt.key_len=%d\n", param->u.crypt.key_len)); */
DBG_871X(" ~~~~set sta key:groupkey\n"); DBG_88E(" ~~~~set sta key:groupkey\n");
padapter->securitypriv.dot118021XGrpKeyid = param->u.crypt.idx; padapter->securitypriv.dot118021XGrpKeyid = param->u.crypt.idx;
rtw_set_key(padapter,&padapter->securitypriv,param->u.crypt.idx, 1,true); rtw_set_key(padapter,&padapter->securitypriv,param->u.crypt.idx, 1,true);
@ -1309,16 +1309,16 @@ static int rtw_cfg80211_set_encryption(struct net_device *dev, struct ieee_param
else if (strcmp(param->u.crypt.alg, "BIP") == 0) else if (strcmp(param->u.crypt.alg, "BIP") == 0)
{ {
int no; int no;
/* DBG_871X("BIP key_len=%d , index=%d @@@@@@@@@@@@@@@@@@\n", param->u.crypt.key_len, param->u.crypt.idx); */ /* DBG_88E("BIP key_len=%d , index=%d @@@@@@@@@@@@@@@@@@\n", param->u.crypt.key_len, param->u.crypt.idx); */
/* save the IGTK key, length 16 bytes */ /* save the IGTK key, length 16 bytes */
memcpy(padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey, param->u.crypt.key,(param->u.crypt.key_len>16 ?16:param->u.crypt.key_len)); memcpy(padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey, param->u.crypt.key,(param->u.crypt.key_len>16 ?16:param->u.crypt.key_len));
/*DBG_871X("IGTK key below:\n"); /*DBG_88E("IGTK key below:\n");
for (no=0;no<16;no++) for (no=0;no<16;no++)
printk(" %02x ", padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey[no]); printk(" %02x ", padapter->securitypriv.dot11wBIPKey[param->u.crypt.idx].skey[no]);
DBG_871X("\n");*/ DBG_88E("\n");*/
padapter->securitypriv.dot11wBIPKeyid = param->u.crypt.idx; padapter->securitypriv.dot11wBIPKeyid = param->u.crypt.idx;
padapter->securitypriv.binstallBIPkey = true; padapter->securitypriv.binstallBIPkey = true;
DBG_871X(" ~~~~set sta key:IGKT\n"); DBG_88E(" ~~~~set sta key:IGKT\n");
} }
#endif /* CONFIG_IEEE80211W */ #endif /* CONFIG_IEEE80211W */
@ -1381,13 +1381,13 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev,
struct adapter *padapter = wiphy_to_adapter(wiphy); struct adapter *padapter = wiphy_to_adapter(wiphy);
struct mlme_priv *pmlmepriv = &padapter->mlmepriv; struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
DBG_871X(FUNC_NDEV_FMT" adding key for %pM\n", FUNC_NDEV_ARG(ndev), mac_addr); DBG_88E(FUNC_NDEV_FMT" adding key for %pM\n", FUNC_NDEV_ARG(ndev), mac_addr);
DBG_871X("cipher=0x%x\n", params->cipher); DBG_88E("cipher=0x%x\n", params->cipher);
DBG_871X("key_len=0x%x\n", params->key_len); DBG_88E("key_len=0x%x\n", params->key_len);
DBG_871X("seq_len=0x%x\n", params->seq_len); DBG_88E("seq_len=0x%x\n", params->seq_len);
DBG_871X("key_index=%d\n", key_index); DBG_88E("key_index=%d\n", key_index);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
DBG_871X("pairwise=%d\n", pairwise); DBG_88E("pairwise=%d\n", pairwise);
#endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) */ #endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) */
param_len = sizeof(struct ieee_param) + params->key_len; param_len = sizeof(struct ieee_param) + params->key_len;
@ -1490,7 +1490,7 @@ static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev,
void (*callback)(void *cookie, void (*callback)(void *cookie,
struct key_params*)) struct key_params*))
{ {
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return 0; return 0;
} }
@ -1504,7 +1504,7 @@ static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev,
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(ndev); struct adapter *padapter = (struct adapter *)rtw_netdev_priv(ndev);
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
DBG_871X(FUNC_NDEV_FMT" key_index=%d\n", FUNC_NDEV_ARG(ndev), key_index); DBG_88E(FUNC_NDEV_FMT" key_index=%d\n", FUNC_NDEV_ARG(ndev), key_index);
if (key_index == psecuritypriv->dot11PrivacyKeyIndex) if (key_index == psecuritypriv->dot11PrivacyKeyIndex)
{ {
@ -1526,10 +1526,10 @@ static int cfg80211_rtw_set_default_key(struct wiphy *wiphy,
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) || defined(COMPAT_KERNEL_RELEASE) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) || defined(COMPAT_KERNEL_RELEASE)
DBG_871X(FUNC_NDEV_FMT" key_index=%d, unicast=%d, multicast=%d\n", DBG_88E(FUNC_NDEV_FMT" key_index=%d, unicast=%d, multicast=%d\n",
FUNC_NDEV_ARG(ndev), key_index , unicast, multicast); FUNC_NDEV_ARG(ndev), key_index , unicast, multicast);
#else #else
DBG_871X(FUNC_NDEV_FMT" key_index=%d\n", FUNC_NDEV_ARG(ndev), DBG_88E(FUNC_NDEV_FMT" key_index=%d\n", FUNC_NDEV_ARG(ndev),
key_index); key_index);
#endif #endif
@ -1572,7 +1572,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,
sinfo->filled = 0; sinfo->filled = 0;
if (!mac) { if (!mac) {
DBG_871X(FUNC_NDEV_FMT" mac==%p\n", FUNC_NDEV_ARG(ndev), mac); DBG_88E(FUNC_NDEV_FMT" mac==%p\n", FUNC_NDEV_ARG(ndev), mac);
ret = -ENOENT; ret = -ENOENT;
goto exit; goto exit;
} }
@ -1585,7 +1585,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,
} }
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
DBG_871X(FUNC_NDEV_FMT" mac="MAC_FMT"\n", FUNC_NDEV_ARG(ndev), MAC_ARG(mac)); DBG_88E(FUNC_NDEV_FMT" mac="MAC_FMT"\n", FUNC_NDEV_ARG(ndev), MAC_ARG(mac));
#endif #endif
/* for infra./P2PClient mode */ /* for infra./P2PClient mode */
@ -1596,7 +1596,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy,
struct wlan_network *cur_network = &(pmlmepriv->cur_network); struct wlan_network *cur_network = &(pmlmepriv->cur_network);
if (_rtw_memcmp((void *)mac, cur_network->network.MacAddress, ETH_ALEN) == false) { if (_rtw_memcmp((void *)mac, cur_network->network.MacAddress, ETH_ALEN) == false) {
DBG_871X("%s, mismatch bssid="MAC_FMT"\n", __func__, MAC_ARG(cur_network->network.MacAddress)); DBG_88E("%s, mismatch bssid="MAC_FMT"\n", __func__, MAC_ARG(cur_network->network.MacAddress));
ret = -ENOENT; ret = -ENOENT;
goto exit; goto exit;
} }
@ -1650,7 +1650,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
int ret = 0; int ret = 0;
u8 change = false; u8 change = false;
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
if (adapter_to_dvobj(padapter)->processing_dev_remove == true) if (adapter_to_dvobj(padapter)->processing_dev_remove == true)
{ {
@ -1659,7 +1659,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
} }
DBG_871X(FUNC_NDEV_FMT" call netdev_open\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT" call netdev_open\n", FUNC_NDEV_ARG(ndev));
if (netdev_open(ndev) != 0) { if (netdev_open(ndev) != 0) {
ret= -EPERM; ret= -EPERM;
goto exit; goto exit;
@ -1671,7 +1671,7 @@ static int cfg80211_rtw_change_iface(struct wiphy *wiphy,
} }
old_type = rtw_wdev->iftype; old_type = rtw_wdev->iftype;
DBG_871X(FUNC_NDEV_FMT" old_iftype=%d, new_iftype=%d\n", DBG_88E(FUNC_NDEV_FMT" old_iftype=%d, new_iftype=%d\n",
FUNC_NDEV_ARG(ndev), old_type, type); FUNC_NDEV_ARG(ndev), old_type, type);
if (old_type != type) if (old_type != type)
@ -1750,7 +1750,7 @@ void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv, bool abor
/* struct cfg80211_scan_request *scan_request = pwdev_priv->scan_request; */ /* struct cfg80211_scan_request *scan_request = pwdev_priv->scan_request; */
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
DBG_871X("%s with scan req\n", __FUNCTION__); DBG_88E("%s with scan req\n", __FUNCTION__);
#endif #endif
/* avoid WARN_ON(request != wiphy_to_dev(request->wiphy)->scan_req); */ /* avoid WARN_ON(request != wiphy_to_dev(request->wiphy)->scan_req); */
@ -1768,7 +1768,7 @@ void rtw_cfg80211_indicate_scan_done(struct rtw_wdev_priv *pwdev_priv, bool abor
} else { } else {
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
DBG_871X("%s without scan req\n", __FUNCTION__); DBG_88E("%s without scan req\n", __FUNCTION__);
#endif #endif
} }
spin_unlock_bh(&pwdev_priv->scan_req_lock); spin_unlock_bh(&pwdev_priv->scan_req_lock);
@ -1900,7 +1900,7 @@ static int rtw_cfg80211_set_probe_req_wpsp2pie(struct adapter *padapter, char *b
&& attr_contentlen == 5) && attr_contentlen == 5)
{ {
if (wdinfo->listen_channel != listen_ch_attr[4]) { if (wdinfo->listen_channel != listen_ch_attr[4]) {
DBG_871X(FUNC_ADPT_FMT" listen channel - country:%c%c%c, class:%u, ch:%u\n", DBG_88E(FUNC_ADPT_FMT" listen channel - country:%c%c%c, class:%u, ch:%u\n",
FUNC_ADPT_ARG(padapter), listen_ch_attr[0], listen_ch_attr[1], listen_ch_attr[2], FUNC_ADPT_ARG(padapter), listen_ch_attr[0], listen_ch_attr[1], listen_ch_attr[2],
listen_ch_attr[3], listen_ch_attr[4]); listen_ch_attr[3], listen_ch_attr[4]);
wdinfo->listen_channel = listen_ch_attr[4]; wdinfo->listen_channel = listen_ch_attr[4];
@ -1971,7 +1971,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
int social_channel = 0, j = 0; int social_channel = 0, j = 0;
bool need_indicate_scan_done = false; bool need_indicate_scan_done = false;
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter)); DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
spin_lock_bh(&pwdev_priv->scan_req_lock); spin_lock_bh(&pwdev_priv->scan_req_lock);
pwdev_priv->scan_request = request; pwdev_priv->scan_request = request;
@ -1980,7 +1980,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true) if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == true)
{ {
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
DBG_871X("%s under WIFI_AP_STATE\n", __FUNCTION__); DBG_88E("%s under WIFI_AP_STATE\n", __FUNCTION__);
#endif #endif
if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS|_FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) if (check_fwstate(pmlmepriv, WIFI_UNDER_WPS|_FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true)
@ -2047,7 +2047,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
} }
if (rtw_is_scan_deny(padapter)) { 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));
need_indicate_scan_done = true; need_indicate_scan_done = true;
goto check_need_indicate_scan_done; goto check_need_indicate_scan_done;
} }
@ -2081,7 +2081,7 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy
memset(ch, 0, sizeof(struct rtw_ieee80211_channel)*RTW_CHANNEL_SCAN_AMOUNT); memset(ch, 0, sizeof(struct rtw_ieee80211_channel)*RTW_CHANNEL_SCAN_AMOUNT);
for (i=0;i<request->n_channels && i<RTW_CHANNEL_SCAN_AMOUNT;i++) { for (i=0;i<request->n_channels && i<RTW_CHANNEL_SCAN_AMOUNT;i++) {
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
DBG_871X(FUNC_ADPT_FMT CHAN_FMT"\n", FUNC_ADPT_ARG(padapter), CHAN_ARG(request->channels[i])); DBG_88E(FUNC_ADPT_FMT CHAN_FMT"\n", FUNC_ADPT_ARG(padapter), CHAN_ARG(request->channels[i]));
#endif #endif
ch[i].hw_value = request->channels[i]->hw_value; ch[i].hw_value = request->channels[i]->hw_value;
ch[i].flags = request->channels[i]->flags; ch[i].flags = request->channels[i]->flags;
@ -2514,7 +2514,7 @@ exit:
static int cfg80211_rtw_leave_ibss(struct wiphy *wiphy, struct net_device *ndev) static int cfg80211_rtw_leave_ibss(struct wiphy *wiphy, struct net_device *ndev)
{ {
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return 0; return 0;
} }
@ -2539,15 +2539,15 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
padapter->mlmepriv.not_indic_disco = true; padapter->mlmepriv.not_indic_disco = true;
DBG_871X("=>"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E("=>"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
DBG_871X("privacy=%d, key=%p, key_len=%d, key_idx=%d\n", DBG_88E("privacy=%d, key=%p, key_len=%d, key_idx=%d\n",
sme->privacy, sme->key, sme->key_len, sme->key_idx); sme->privacy, sme->key, sme->key_len, sme->key_idx);
if (wdev_to_priv(padapter->rtw_wdev)->block == true) if (wdev_to_priv(padapter->rtw_wdev)->block == true)
{ {
ret = -EBUSY; ret = -EBUSY;
DBG_871X("%s wdev_priv.block is set\n", __FUNCTION__); DBG_88E("%s wdev_priv.block is set\n", __FUNCTION__);
goto exit; goto exit;
} }
@ -2627,7 +2627,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
{ {
u32 wep_key_idx, wep_key_len,wep_total_len; u32 wep_key_idx, wep_key_len,wep_total_len;
struct ndis_802_11_wep *pwep = NULL; struct ndis_802_11_wep *pwep = NULL;
DBG_871X("%s(): Shared/Auto WEP\n",__FUNCTION__); DBG_88E("%s(): Shared/Auto WEP\n",__FUNCTION__);
wep_key_idx = sme->key_idx; wep_key_idx = sme->key_idx;
wep_key_len = sme->key_len; wep_key_len = sme->key_len;
@ -2643,7 +2643,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev,
wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial); wep_total_len = wep_key_len + FIELD_OFFSET(struct ndis_802_11_wep, KeyMaterial);
pwep =(struct ndis_802_11_wep *) rtw_malloc(wep_total_len); pwep =(struct ndis_802_11_wep *) rtw_malloc(wep_total_len);
if (pwep == NULL) { if (pwep == NULL) {
DBG_871X(" wpa_set_encryption: pwep allocate fail !!!\n"); DBG_88E(" wpa_set_encryption: pwep allocate fail !!!\n");
ret = -ENOMEM; ret = -ENOMEM;
goto exit; goto exit;
} }
@ -2718,7 +2718,7 @@ static int cfg80211_rtw_disconnect(struct wiphy *wiphy, struct net_device *ndev,
{ {
struct adapter *padapter = wiphy_to_adapter(wiphy); struct adapter *padapter = wiphy_to_adapter(wiphy);
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
padapter->mlmepriv.not_indic_disco = true; padapter->mlmepriv.not_indic_disco = true;
@ -2730,7 +2730,7 @@ static int cfg80211_rtw_disconnect(struct wiphy *wiphy, struct net_device *ndev,
LeaveAllPowerSaveMode(padapter); LeaveAllPowerSaveMode(padapter);
rtw_disassoc_cmd(padapter, 500, false); rtw_disassoc_cmd(padapter, 500, false);
DBG_871X("%s...call rtw_indicate_disconnect\n", __FUNCTION__); DBG_88E("%s...call rtw_indicate_disconnect\n", __FUNCTION__);
rtw_indicate_disconnect(padapter); rtw_indicate_disconnect(padapter);
@ -2782,7 +2782,7 @@ static int cfg80211_rtw_set_power_mgmt(struct wiphy *wiphy,
struct adapter *padapter = wiphy_to_adapter(wiphy); struct adapter *padapter = wiphy_to_adapter(wiphy);
struct rtw_wdev_priv *rtw_wdev_priv = wdev_to_priv(padapter->rtw_wdev); struct rtw_wdev_priv *rtw_wdev_priv = wdev_to_priv(padapter->rtw_wdev);
DBG_871X(FUNC_NDEV_FMT" enabled:%u, timeout:%d\n", FUNC_NDEV_ARG(ndev), DBG_88E(FUNC_NDEV_FMT" enabled:%u, timeout:%d\n", FUNC_NDEV_ARG(ndev),
enabled, timeout); enabled, timeout);
rtw_wdev_priv->power_mgmt = enabled; rtw_wdev_priv->power_mgmt = enabled;
@ -2801,7 +2801,7 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy,
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
u8 strZeroMacAddress[ ETH_ALEN ] = { 0x00 }; u8 strZeroMacAddress[ ETH_ALEN ] = { 0x00 };
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev));
if ( _rtw_memcmp((void *)pmksa->bssid, strZeroMacAddress, ETH_ALEN ) == true ) if ( _rtw_memcmp((void *)pmksa->bssid, strZeroMacAddress, ETH_ALEN ) == true )
return -EINVAL; return -EINVAL;
@ -2813,7 +2813,7 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy,
{ {
if ( _rtw_memcmp( psecuritypriv->PMKIDList[index].Bssid, (void *)pmksa->bssid, ETH_ALEN) ==true ) if ( _rtw_memcmp( psecuritypriv->PMKIDList[index].Bssid, (void *)pmksa->bssid, ETH_ALEN) ==true )
{ /* BSSID is matched, the same AP => rewrite with new PMKID. */ { /* BSSID is matched, the same AP => rewrite with new PMKID. */
DBG_871X(FUNC_NDEV_FMT" BSSID exists in the PMKList.\n", FUNC_NDEV_ARG(netdev)); DBG_88E(FUNC_NDEV_FMT" BSSID exists in the PMKList.\n", FUNC_NDEV_ARG(netdev));
memcpy( psecuritypriv->PMKIDList[index].PMKID, (void *)pmksa->pmkid, WLAN_PMKID_LEN); memcpy( psecuritypriv->PMKIDList[index].PMKID, (void *)pmksa->pmkid, WLAN_PMKID_LEN);
psecuritypriv->PMKIDList[index].bUsed = true; psecuritypriv->PMKIDList[index].bUsed = true;
@ -2826,7 +2826,7 @@ static int cfg80211_rtw_set_pmksa(struct wiphy *wiphy,
if (!blInserted) if (!blInserted)
{ {
/* Find a new entry */ /* Find a new entry */
DBG_871X(FUNC_NDEV_FMT" Use the new entry index = %d for this PMKID.\n", DBG_88E(FUNC_NDEV_FMT" Use the new entry index = %d for this PMKID.\n",
FUNC_NDEV_ARG(netdev), psecuritypriv->PMKIDIndex ); FUNC_NDEV_ARG(netdev), psecuritypriv->PMKIDIndex );
memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].Bssid, (void *)pmksa->bssid, ETH_ALEN); memcpy(psecuritypriv->PMKIDList[psecuritypriv->PMKIDIndex].Bssid, (void *)pmksa->bssid, ETH_ALEN);
@ -2851,7 +2851,7 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy,
struct adapter *padapter = wiphy_to_adapter(wiphy); struct adapter *padapter = wiphy_to_adapter(wiphy);
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev));
for (index=0 ; index<NUM_PMKID_CACHE; index++) for (index=0 ; index<NUM_PMKID_CACHE; index++)
{ {
@ -2867,7 +2867,7 @@ static int cfg80211_rtw_del_pmksa(struct wiphy *wiphy,
if (false == bMatched) if (false == bMatched)
{ {
DBG_871X(FUNC_NDEV_FMT" do not have matched BSSID\n" DBG_88E(FUNC_NDEV_FMT" do not have matched BSSID\n"
, FUNC_NDEV_ARG(netdev)); , FUNC_NDEV_ARG(netdev));
return -EINVAL; return -EINVAL;
} }
@ -2881,7 +2881,7 @@ static int cfg80211_rtw_flush_pmksa(struct wiphy *wiphy,
struct adapter *padapter = wiphy_to_adapter(wiphy); struct adapter *padapter = wiphy_to_adapter(wiphy);
struct security_priv *psecuritypriv = &padapter->securitypriv; struct security_priv *psecuritypriv = &padapter->securitypriv;
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(netdev));
memset( &psecuritypriv->PMKIDList[ 0 ], 0x00, sizeof( RT_PMKID_LIST ) * NUM_PMKID_CACHE ); memset( &psecuritypriv->PMKIDList[ 0 ], 0x00, sizeof( RT_PMKID_LIST ) * NUM_PMKID_CACHE );
psecuritypriv->PMKIDIndex = 0; psecuritypriv->PMKIDIndex = 0;
@ -2898,7 +2898,7 @@ void rtw_cfg80211_indicate_sta_assoc(struct adapter *padapter, u8 *pmgmt_frame,
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
struct net_device *ndev = padapter->pnetdev; struct net_device *ndev = padapter->pnetdev;
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter)); DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
{ {
struct station_info sinfo; struct station_info sinfo;
@ -2928,7 +2928,7 @@ void rtw_cfg80211_indicate_sta_disassoc(struct adapter *padapter, unsigned char
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct net_device *ndev = padapter->pnetdev; struct net_device *ndev = padapter->pnetdev;
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter)); DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
cfg80211_del_sta(ndev, da, GFP_ATOMIC); cfg80211_del_sta(ndev, da, GFP_ATOMIC);
} }
@ -2966,7 +2966,7 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de
struct ieee80211_radiotap_header *rtap_hdr; struct ieee80211_radiotap_header *rtap_hdr;
struct adapter *padapter = (struct adapter *)rtw_netdev_priv(ndev); struct adapter *padapter = (struct adapter *)rtw_netdev_priv(ndev);
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
if (!skb) if (!skb)
return -1; return -1;
@ -3054,9 +3054,9 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de
goto dump; goto dump;
#endif #endif
if (category == RTW_WLAN_CATEGORY_PUBLIC) if (category == RTW_WLAN_CATEGORY_PUBLIC)
DBG_871X("RTW_Tx:%s\n", action_public_str(action)); DBG_88E("RTW_Tx:%s\n", action_public_str(action));
else else
DBG_871X("RTW_Tx:category(%u), action(%u)\n", category, action); DBG_88E("RTW_Tx:category(%u), action(%u)\n", category, action);
dump: dump:
/* starting alloc mgmt frame to dump it */ /* starting alloc mgmt frame to dump it */
@ -3151,13 +3151,13 @@ static int rtw_cfg80211_add_monitor_if (struct adapter *padapter, char *name, st
struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev); struct rtw_wdev_priv *pwdev_priv = wdev_to_priv(padapter->rtw_wdev);
if (!name ) { if (!name ) {
DBG_871X(FUNC_ADPT_FMT" without specific name\n", FUNC_ADPT_ARG(padapter)); DBG_88E(FUNC_ADPT_FMT" without specific name\n", FUNC_ADPT_ARG(padapter));
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
if (pwdev_priv->pmon_ndev) { if (pwdev_priv->pmon_ndev) {
DBG_871X(FUNC_ADPT_FMT" monitor interface exist: "NDEV_FMT"\n", DBG_88E(FUNC_ADPT_FMT" monitor interface exist: "NDEV_FMT"\n",
FUNC_ADPT_ARG(padapter), NDEV_ARG(pwdev_priv->pmon_ndev)); FUNC_ADPT_ARG(padapter), NDEV_ARG(pwdev_priv->pmon_ndev));
ret = -EBUSY; ret = -EBUSY;
goto out; goto out;
@ -3165,7 +3165,7 @@ static int rtw_cfg80211_add_monitor_if (struct adapter *padapter, char *name, st
mon_ndev = alloc_etherdev(sizeof(struct rtw_netdev_priv_indicator)); mon_ndev = alloc_etherdev(sizeof(struct rtw_netdev_priv_indicator));
if (!mon_ndev) { if (!mon_ndev) {
DBG_871X(FUNC_ADPT_FMT" allocate ndev fail\n", FUNC_ADPT_ARG(padapter)); DBG_88E(FUNC_ADPT_FMT" allocate ndev fail\n", FUNC_ADPT_ARG(padapter));
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
@ -3191,7 +3191,7 @@ static int rtw_cfg80211_add_monitor_if (struct adapter *padapter, char *name, st
/* wdev */ /* wdev */
mon_wdev = (struct wireless_dev *)rtw_zmalloc(sizeof(struct wireless_dev)); mon_wdev = (struct wireless_dev *)rtw_zmalloc(sizeof(struct wireless_dev));
if (!mon_wdev) { if (!mon_wdev) {
DBG_871X(FUNC_ADPT_FMT" allocate mon_wdev fail\n", FUNC_ADPT_ARG(padapter)); DBG_88E(FUNC_ADPT_FMT" allocate mon_wdev fail\n", FUNC_ADPT_ARG(padapter));
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
@ -3246,7 +3246,7 @@ static int
struct net_device* ndev = NULL; struct net_device* ndev = NULL;
struct adapter *padapter = wiphy_to_adapter(wiphy); struct adapter *padapter = wiphy_to_adapter(wiphy);
DBG_871X(FUNC_ADPT_FMT " wiphy:%s, name:%s, type:%d\n", DBG_88E(FUNC_ADPT_FMT " wiphy:%s, name:%s, type:%d\n",
FUNC_ADPT_ARG(padapter), wiphy_name(wiphy), name, type); FUNC_ADPT_ARG(padapter), wiphy_name(wiphy), name, type);
switch (type) { switch (type) {
@ -3275,11 +3275,11 @@ static int
break; break;
default: default:
ret = -ENODEV; ret = -ENODEV;
DBG_871X("Unsupported interface type\n"); DBG_88E("Unsupported interface type\n");
break; break;
} }
DBG_871X(FUNC_ADPT_FMT" ndev:%p, ret:%d\n", FUNC_ADPT_ARG(padapter), ndev, ret); DBG_88E(FUNC_ADPT_FMT" ndev:%p, ret:%d\n", FUNC_ADPT_ARG(padapter), ndev, ret);
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0))
return ndev ? ndev->ieee80211_ptr : ERR_PTR(ret); return ndev ? ndev->ieee80211_ptr : ERR_PTR(ret);
@ -3312,7 +3312,7 @@ static int cfg80211_rtw_del_virtual_intf(struct wiphy *wiphy,
if (ndev == pwdev_priv->pmon_ndev) { if (ndev == pwdev_priv->pmon_ndev) {
pwdev_priv->pmon_ndev = NULL; pwdev_priv->pmon_ndev = NULL;
pwdev_priv->ifname_mon[0] = '\0'; pwdev_priv->ifname_mon[0] = '\0';
DBG_871X(FUNC_NDEV_FMT" remove monitor interface\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT" remove monitor interface\n", FUNC_NDEV_ARG(ndev));
} }
exit: exit:
@ -3427,7 +3427,7 @@ static int cfg80211_rtw_add_beacon(struct wiphy *wiphy, struct net_device *ndev,
int ret=0; int ret=0;
struct adapter *adapter = wiphy_to_adapter(wiphy); struct adapter *adapter = wiphy_to_adapter(wiphy);
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len); ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len);
return ret; return ret;
@ -3439,7 +3439,7 @@ static int cfg80211_rtw_set_beacon(struct wiphy *wiphy, struct net_device *ndev,
struct adapter *padapter = wiphy_to_adapter(wiphy); struct adapter *padapter = wiphy_to_adapter(wiphy);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
pmlmeext->bstart_bss = true; pmlmeext->bstart_bss = true;
@ -3450,7 +3450,7 @@ static int cfg80211_rtw_set_beacon(struct wiphy *wiphy, struct net_device *ndev,
static int cfg80211_rtw_del_beacon(struct wiphy *wiphy, struct net_device *ndev) static int cfg80211_rtw_del_beacon(struct wiphy *wiphy, struct net_device *ndev)
{ {
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return 0; return 0;
} }
@ -3461,7 +3461,7 @@ static int cfg80211_rtw_start_ap(struct wiphy *wiphy, struct net_device *ndev,
int ret = 0; int ret = 0;
struct adapter *adapter = wiphy_to_adapter(wiphy); struct adapter *adapter = wiphy_to_adapter(wiphy);
DBG_871X(FUNC_NDEV_FMT" hidden_ssid:%d, auth_type:%d\n", FUNC_NDEV_ARG(ndev), DBG_88E(FUNC_NDEV_FMT" hidden_ssid:%d, auth_type:%d\n", FUNC_NDEV_ARG(ndev),
settings->hidden_ssid, settings->auth_type); settings->hidden_ssid, settings->auth_type);
ret = rtw_add_beacon(adapter, settings->beacon.head, settings->beacon.head_len, ret = rtw_add_beacon(adapter, settings->beacon.head, settings->beacon.head_len,
@ -3488,7 +3488,7 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd
int ret = 0; int ret = 0;
struct adapter *adapter = wiphy_to_adapter(wiphy); struct adapter *adapter = wiphy_to_adapter(wiphy);
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len); ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len);
@ -3497,7 +3497,7 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd
static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev) static int cfg80211_rtw_stop_ap(struct wiphy *wiphy, struct net_device *ndev)
{ {
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return 0; return 0;
} }
@ -3511,7 +3511,7 @@ static int cfg80211_rtw_add_station(struct wiphy *wiphy, struct net_device *ndev
#endif #endif
struct station_parameters *params) struct station_parameters *params)
{ {
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return 0; return 0;
} }
@ -3539,7 +3539,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev
const u8 *mac = params->mac; const u8 *mac = params->mac;
#endif #endif
DBG_871X("+"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E("+"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
if (check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != true) if (check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != true)
{ {
@ -3610,7 +3610,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev
associated_clients_update(padapter, updated); associated_clients_update(padapter, updated);
DBG_871X("-"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E("-"FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return ret; return ret;
@ -3624,7 +3624,7 @@ static int cfg80211_rtw_change_station(struct wiphy *wiphy, struct net_device *n
#endif #endif
struct station_parameters *params) struct station_parameters *params)
{ {
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return 0; return 0;
} }
@ -3632,7 +3632,7 @@ static int cfg80211_rtw_change_station(struct wiphy *wiphy, struct net_device *n
static int cfg80211_rtw_dump_station(struct wiphy *wiphy, struct net_device *ndev, static int cfg80211_rtw_dump_station(struct wiphy *wiphy, struct net_device *ndev,
int idx, u8 *mac, struct station_info *sinfo) int idx, u8 *mac, struct station_info *sinfo)
{ {
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
/* TODO: dump scanned queue */ /* TODO: dump scanned queue */
@ -3644,7 +3644,7 @@ static int cfg80211_rtw_change_bss(struct wiphy *wiphy, struct net_device *ndev,
{ {
u8 i; u8 i;
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
/* /*
DBG_8192C("use_cts_prot=%d\n", params->use_cts_prot); DBG_8192C("use_cts_prot=%d\n", params->use_cts_prot);
DBG_8192C("use_short_preamble=%d\n", params->use_short_preamble); DBG_8192C("use_short_preamble=%d\n", params->use_short_preamble);
@ -3669,7 +3669,7 @@ static int cfg80211_rtw_set_channel(struct wiphy *wiphy
, struct ieee80211_channel *chan, enum nl80211_channel_type channel_type) , struct ieee80211_channel *chan, enum nl80211_channel_type channel_type)
{ {
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,35))
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
#endif #endif
return 0; return 0;
@ -3678,7 +3678,7 @@ static int cfg80211_rtw_set_channel(struct wiphy *wiphy
static int cfg80211_rtw_auth(struct wiphy *wiphy, struct net_device *ndev, static int cfg80211_rtw_auth(struct wiphy *wiphy, struct net_device *ndev,
struct cfg80211_auth_request *req) struct cfg80211_auth_request *req)
{ {
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return 0; return 0;
} }
@ -3686,7 +3686,7 @@ static int cfg80211_rtw_auth(struct wiphy *wiphy, struct net_device *ndev,
static int cfg80211_rtw_assoc(struct wiphy *wiphy, struct net_device *ndev, static int cfg80211_rtw_assoc(struct wiphy *wiphy, struct net_device *ndev,
struct cfg80211_assoc_request *req) struct cfg80211_assoc_request *req)
{ {
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
return 0; return 0;
} }
@ -3709,7 +3709,7 @@ void rtw_cfg80211_rx_action_p2p(struct adapter *padapter, u8 *pmgmt_frame, uint
goto indicate; goto indicate;
#endif #endif
rtw_action_frame_parse(pmgmt_frame, frame_len, &category, &action); rtw_action_frame_parse(pmgmt_frame, frame_len, &category, &action);
DBG_871X("RTW_Rx:category(%u), action(%u)\n", category, action); DBG_88E("RTW_Rx:category(%u), action(%u)\n", category, action);
indicate: indicate:
if (channel <= RTW_CH_MAX_2G_CHANNEL) if (channel <= RTW_CH_MAX_2G_CHANNEL)
@ -3749,7 +3749,7 @@ void rtw_cfg80211_rx_p2p_action_public(struct adapter *padapter, u8 *pmgmt_frame
} }
#endif #endif
rtw_action_frame_parse(pmgmt_frame, frame_len, &category, &action); rtw_action_frame_parse(pmgmt_frame, frame_len, &category, &action);
DBG_871X("RTW_Rx:category(%u), action(%u)\n", category, action); DBG_88E("RTW_Rx:category(%u), action(%u)\n", category, action);
indicate: indicate:
if (channel <= RTW_CH_MAX_2G_CHANNEL) if (channel <= RTW_CH_MAX_2G_CHANNEL)
@ -3778,9 +3778,9 @@ void rtw_cfg80211_rx_action(struct adapter *adapter, u8 *frame, uint frame_len,
DBG_8192C("RTW_Rx:cur_ch=%d\n", channel); DBG_8192C("RTW_Rx:cur_ch=%d\n", channel);
if (msg) if (msg)
DBG_871X("RTW_Rx:%s\n", msg); DBG_88E("RTW_Rx:%s\n", msg);
else else
DBG_871X("RTW_Rx:category(%u), action(%u)\n", category, action); DBG_88E("RTW_Rx:category(%u), action(%u)\n", category, action);
if (channel <= RTW_CH_MAX_2G_CHANNEL) if (channel <= RTW_CH_MAX_2G_CHANNEL)
freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ); freq = rtw_ieee80211_channel_to_frequency(channel, IEEE80211_BAND_2GHZ);
@ -3831,7 +3831,7 @@ void rtw_cfg80211_issue_p2p_provision_request(struct adapter *padapter, const u8
size_t frame_body_len = len - sizeof(struct rtw_ieee80211_hdr_3addr); size_t frame_body_len = len - sizeof(struct rtw_ieee80211_hdr_3addr);
__be16 be_tmp; __be16 be_tmp;
DBG_871X( "[%s] In\n", __FUNCTION__ ); DBG_88E( "[%s] In\n", __FUNCTION__ );
/* prepare for building provision_request frame */ /* prepare for building provision_request frame */
memcpy(pwdinfo->tx_prov_disc_info.peerIFAddr, GetAddr1Ptr(buf), ETH_ALEN); memcpy(pwdinfo->tx_prov_disc_info.peerIFAddr, GetAddr1Ptr(buf), ETH_ALEN);
@ -4029,7 +4029,7 @@ static s32 cfg80211_rtw_remain_on_channel(struct wiphy *wiphy,
u8 remain_ch = (u8) ieee80211_frequency_to_channel(channel->center_freq); u8 remain_ch = (u8) ieee80211_frequency_to_channel(channel->center_freq);
u8 ready_on_channel = false; u8 ready_on_channel = false;
DBG_871X(FUNC_ADPT_FMT" ch:%u duration:%d\n", FUNC_ADPT_ARG(padapter), remain_ch, duration); DBG_88E(FUNC_ADPT_FMT" ch:%u duration:%d\n", FUNC_ADPT_ARG(padapter), remain_ch, duration);
if (pcfg80211_wdinfo->is_ro_ch == true) if (pcfg80211_wdinfo->is_ro_ch == true)
{ {
@ -4082,7 +4082,7 @@ static s32 cfg80211_rtw_remain_on_channel(struct wiphy *wiphy,
if (remain_ch != rtw_get_oper_ch(padapter) ) if (remain_ch != rtw_get_oper_ch(padapter) )
ready_on_channel = true; ready_on_channel = true;
} else { } else {
DBG_871X("%s remain_ch:%u not in channel plan!!!!\n", __FUNCTION__, remain_ch); DBG_88E("%s remain_ch:%u not in channel plan!!!!\n", __FUNCTION__, remain_ch);
} }
@ -4123,7 +4123,7 @@ static s32 cfg80211_rtw_cancel_remain_on_channel(struct wiphy *wiphy,
struct wifidirect_info *pwdinfo = &padapter->wdinfo; struct wifidirect_info *pwdinfo = &padapter->wdinfo;
struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo; struct cfg80211_wifidirect_info *pcfg80211_wdinfo = &padapter->cfg80211_wdinfo;
DBG_871X(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter)); DBG_88E(FUNC_ADPT_FMT"\n", FUNC_ADPT_ARG(padapter));
if (pcfg80211_wdinfo->is_ro_ch == true) { if (pcfg80211_wdinfo->is_ro_ch == true) {
DBG_8192C("%s, cancel ro ch timer\n", __func__); DBG_8192C("%s, cancel ro ch timer\n", __func__);
@ -4298,7 +4298,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy,
*cookie = (unsigned long) buf; *cookie = (unsigned long) buf;
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
DBG_871X(FUNC_ADPT_FMT" len=%zu, ch=%d" DBG_88E(FUNC_ADPT_FMT" len=%zu, ch=%d"
#if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0)) #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,8,0))
", ch_type=%d" ", ch_type=%d"
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37)) || defined(COMPAT_KERNEL_RELEASE)
@ -4336,9 +4336,9 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy,
} }
#endif #endif
if (category == RTW_WLAN_CATEGORY_PUBLIC) if (category == RTW_WLAN_CATEGORY_PUBLIC)
DBG_871X("RTW_Tx:%s\n", action_public_str(action)); DBG_88E("RTW_Tx:%s\n", action_public_str(action));
else else
DBG_871X("RTW_Tx:category(%u), action(%u)\n", category, action); DBG_88E("RTW_Tx:category(%u), action(%u)\n", category, action);
dump: dump:
do { do {
@ -4347,7 +4347,7 @@ dump:
} while (dump_cnt < dump_limit && tx_ret != _SUCCESS); } while (dump_cnt < dump_limit && tx_ret != _SUCCESS);
if (tx_ret != _SUCCESS || dump_cnt > 1) { if (tx_ret != _SUCCESS || dump_cnt > 1) {
DBG_871X(FUNC_ADPT_FMT" %s (%d/%d) in %d ms\n", FUNC_ADPT_ARG(padapter), DBG_88E(FUNC_ADPT_FMT" %s (%d/%d) in %d ms\n", FUNC_ADPT_ARG(padapter),
tx_ret==_SUCCESS?"OK":"FAIL", dump_cnt, dump_limit, rtw_get_passing_time_ms(start)); tx_ret==_SUCCESS?"OK":"FAIL", dump_cnt, dump_limit, rtw_get_passing_time_ms(start));
} }
@ -4359,7 +4359,7 @@ dump:
if (pwdev_priv->invit_info.flags & BIT(0) if (pwdev_priv->invit_info.flags & BIT(0)
&& pwdev_priv->invit_info.status == 0) && pwdev_priv->invit_info.status == 0)
{ {
DBG_871X(FUNC_ADPT_FMT" agree with invitation of persistent group\n", DBG_88E(FUNC_ADPT_FMT" agree with invitation of persistent group\n",
FUNC_ADPT_ARG(padapter)); FUNC_ADPT_ARG(padapter));
rtw_set_scan_deny(padapter, 5000); rtw_set_scan_deny(padapter, 5000);
rtw_pwr_wakeup_ex(padapter, 5000); rtw_pwr_wakeup_ex(padapter, 5000);
@ -4383,7 +4383,7 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy,
struct adapter *adapter = wiphy_to_adapter(wiphy); struct adapter *adapter = wiphy_to_adapter(wiphy);
#ifdef CONFIG_DEBUG_CFG80211 #ifdef CONFIG_DEBUG_CFG80211
DBG_871X(FUNC_ADPT_FMT" frame_type:%x, reg:%d\n", FUNC_ADPT_ARG(adapter), DBG_88E(FUNC_ADPT_FMT" frame_type:%x, reg:%d\n", FUNC_ADPT_ARG(adapter),
frame_type, reg); frame_type, reg);
#endif #endif
@ -4407,7 +4407,7 @@ static int rtw_cfg80211_set_beacon_wpsp2pie(struct net_device *ndev, char *buf,
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv); struct mlme_ext_priv *pmlmeext = &(padapter->mlmeextpriv);
DBG_871X(FUNC_NDEV_FMT" ielen=%d\n", FUNC_NDEV_ARG(ndev), len); DBG_88E(FUNC_NDEV_FMT" ielen=%d\n", FUNC_NDEV_ARG(ndev), len);
if (len>0) if (len>0)
{ {
@ -4540,7 +4540,7 @@ static int rtw_cfg80211_set_probe_resp_wpsp2pie(struct net_device *net, char *bu
if (sr != 0) if (sr != 0)
{ {
DBG_871X("%s, got sr\n", __func__); DBG_88E("%s, got sr\n", __func__);
} }
else else
{ {

790
os_dep/ioctl_linux.c
View file

File diff suppressed because it is too large Load diff

16
os_dep/mlme_linux.c
View file

@ -296,7 +296,7 @@ void rtw_indicate_sta_assoc_event(struct adapter *padapter, struct sta_info *pst
memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN); memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN);
DBG_871X("+rtw_indicate_sta_assoc_event\n"); DBG_88E("+rtw_indicate_sta_assoc_event\n");
} }
void rtw_indicate_sta_disassoc_event(struct adapter *padapter, struct sta_info *psta) void rtw_indicate_sta_disassoc_event(struct adapter *padapter, struct sta_info *psta)
@ -318,7 +318,7 @@ void rtw_indicate_sta_disassoc_event(struct adapter *padapter, struct sta_info *
memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN); memcpy(wrqu.addr.sa_data, psta->hwaddr, ETH_ALEN);
DBG_871X("+rtw_indicate_sta_disassoc_event\n"); DBG_88E("+rtw_indicate_sta_disassoc_event\n");
} }
#ifdef CONFIG_HOSTAPD_MLME #ifdef CONFIG_HOSTAPD_MLME
@ -328,7 +328,7 @@ static int mgnt_xmit_entry(struct sk_buff *skb, struct net_device *pnetdev)
struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev); struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev);
struct adapter *padapter = (struct adapter *)phostapdpriv->padapter; struct adapter *padapter = (struct adapter *)phostapdpriv->padapter;
/* DBG_871X("%s\n", __FUNCTION__); */ /* DBG_88E("%s\n", __FUNCTION__); */
return rtw_hal_hostap_mgnt_xmit_entry(padapter, skb); return rtw_hal_hostap_mgnt_xmit_entry(padapter, skb);
} }
@ -337,7 +337,7 @@ static int mgnt_netdev_open(struct net_device *pnetdev)
{ {
struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev); struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev);
DBG_871X("mgnt_netdev_open: MAC Address:" MAC_FMT "\n", MAC_ARG(pnetdev->dev_addr)); DBG_88E("mgnt_netdev_open: MAC Address:" MAC_FMT "\n", MAC_ARG(pnetdev->dev_addr));
init_usb_anchor(&phostapdpriv->anchored); init_usb_anchor(&phostapdpriv->anchored);
@ -355,7 +355,7 @@ static int mgnt_netdev_close(struct net_device *pnetdev)
{ {
struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev); struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev);
DBG_871X("%s\n", __FUNCTION__); DBG_88E("%s\n", __FUNCTION__);
usb_kill_anchored_urbs(&phostapdpriv->anchored); usb_kill_anchored_urbs(&phostapdpriv->anchored);
@ -404,7 +404,7 @@ int hostapd_mode_init(struct adapter *padapter)
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29))
DBG_871X("register rtl871x_mgnt_netdev_ops to netdev_ops\n"); DBG_88E("register rtl871x_mgnt_netdev_ops to netdev_ops\n");
pnetdev->netdev_ops = &rtl871x_mgnt_netdev_ops; pnetdev->netdev_ops = &rtl871x_mgnt_netdev_ops;
@ -420,7 +420,7 @@ int hostapd_mode_init(struct adapter *padapter)
pnetdev->watchdog_timeo = HZ; /* 1 second timeout */ pnetdev->watchdog_timeo = HZ; /* 1 second timeout */
if (dev_alloc_name(pnetdev,"mgnt.wlan%d") < 0) if (dev_alloc_name(pnetdev,"mgnt.wlan%d") < 0)
DBG_871X("hostapd_mode_init(): dev_alloc_name, fail!\n"); DBG_88E("hostapd_mode_init(): dev_alloc_name, fail!\n");
mac[0]=0x00; mac[0]=0x00;
mac[1]=0xe0; mac[1]=0xe0;
@ -437,7 +437,7 @@ int hostapd_mode_init(struct adapter *padapter)
/* Tell the network stack we exist */ /* Tell the network stack we exist */
if (register_netdev(pnetdev) != 0) { if (register_netdev(pnetdev) != 0) {
DBG_871X("hostapd_mode_init(): register_netdev fail!\n"); DBG_88E("hostapd_mode_init(): register_netdev fail!\n");
if (pnetdev) if (pnetdev)
rtw_free_netdev(pnetdev); rtw_free_netdev(pnetdev);
} }

78
os_dep/os_intfs.c
View file

@ -360,7 +360,7 @@ static int rtw_net_set_mac_address(struct net_device *pnetdev, void *p)
if (padapter->bup == false) if (padapter->bup == false)
{ {
/* DBG_871X("r8711_net_set_mac_address(), MAC=%x:%x:%x:%x:%x:%x\n", addr->sa_data[0], addr->sa_data[1], addr->sa_data[2], addr->sa_data[3], */ /* DBG_88E("r8711_net_set_mac_address(), MAC=%x:%x:%x:%x:%x:%x\n", addr->sa_data[0], addr->sa_data[1], addr->sa_data[2], addr->sa_data[3], */
/* addr->sa_data[4], addr->sa_data[5]); */ /* addr->sa_data[4], addr->sa_data[5]); */
memcpy(padapter->eeprompriv.mac_addr, addr->sa_data, ETH_ALEN); memcpy(padapter->eeprompriv.mac_addr, addr->sa_data, ETH_ALEN);
/* memcpy(pnetdev->dev_addr, addr->sa_data, ETH_ALEN); */ /* memcpy(pnetdev->dev_addr, addr->sa_data, ETH_ALEN); */
@ -513,7 +513,7 @@ int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname)
TargetNetdev = dev_get_by_name(devnet, "wlan0"); TargetNetdev = dev_get_by_name(devnet, "wlan0");
#endif #endif
if (TargetNetdev) { if (TargetNetdev) {
DBG_871X("Force onboard module driver disappear !!!\n"); DBG_88E("Force onboard module driver disappear !!!\n");
TargetAdapter = rtw_netdev_priv(TargetNetdev); TargetAdapter = rtw_netdev_priv(TargetNetdev);
TargetAdapter->DriverState = DRIVER_DISAPPEAR; TargetAdapter->DriverState = DRIVER_DISAPPEAR;
@ -568,7 +568,7 @@ struct net_device *rtw_init_netdev(struct adapter *old_padapter)
/* pnetdev->init = NULL; */ /* pnetdev->init = NULL; */
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29))
DBG_871X("register rtw_netdev_ops to netdev_ops\n"); DBG_88E("register rtw_netdev_ops to netdev_ops\n");
pnetdev->netdev_ops = &rtw_netdev_ops; pnetdev->netdev_ops = &rtw_netdev_ops;
#else #else
pnetdev->open = netdev_open; pnetdev->open = netdev_open;
@ -805,14 +805,14 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
if (_rtw_init_xmit_priv(&padapter->xmitpriv, padapter) == _FAIL) if (_rtw_init_xmit_priv(&padapter->xmitpriv, padapter) == _FAIL)
{ {
DBG_871X("Can't _rtw_init_xmit_priv\n"); DBG_88E("Can't _rtw_init_xmit_priv\n");
ret8=_FAIL; ret8=_FAIL;
goto exit; goto exit;
} }
if (_rtw_init_recv_priv(&padapter->recvpriv, padapter) == _FAIL) if (_rtw_init_recv_priv(&padapter->recvpriv, padapter) == _FAIL)
{ {
DBG_871X("Can't _rtw_init_recv_priv\n"); DBG_88E("Can't _rtw_init_recv_priv\n");
ret8=_FAIL; ret8=_FAIL;
goto exit; goto exit;
} }
@ -826,7 +826,7 @@ u8 rtw_init_drv_sw(struct adapter *padapter)
if (_rtw_init_sta_priv(&padapter->stapriv) == _FAIL) if (_rtw_init_sta_priv(&padapter->stapriv) == _FAIL)
{ {
DBG_871X("Can't _rtw_init_sta_priv\n"); DBG_88E("Can't _rtw_init_sta_priv\n");
ret8=_FAIL; ret8=_FAIL;
goto exit; goto exit;
} }
@ -1000,7 +1000,7 @@ void netdev_br_init(struct net_device *netdev)
memcpy(adapter->br_mac, br_netdev->dev_addr, ETH_ALEN); memcpy(adapter->br_mac, br_netdev->dev_addr, ETH_ALEN);
dev_put(br_netdev); dev_put(br_netdev);
} else } else
DBG_871X("%s()-%d: dev_get_by_name(%s) failed!", __FUNCTION__, __LINE__, CONFIG_BR_EXT_BRNAME); DBG_88E("%s()-%d: dev_get_by_name(%s) failed!", __FUNCTION__, __LINE__, CONFIG_BR_EXT_BRNAME);
} }
adapter->ethBrExtInfo.addPPPoETag = 1; adapter->ethBrExtInfo.addPPPoETag = 1;
@ -1024,12 +1024,12 @@ static int _rtw_drv_register_netdev(struct adapter *padapter, char *name)
/* Tell the network stack we exist */ /* Tell the network stack we exist */
if (register_netdev(pnetdev) != 0) { if (register_netdev(pnetdev) != 0) {
DBG_871X(FUNC_NDEV_FMT "Failed!\n", FUNC_NDEV_ARG(pnetdev)); DBG_88E(FUNC_NDEV_FMT "Failed!\n", FUNC_NDEV_ARG(pnetdev));
ret = _FAIL; ret = _FAIL;
goto error_register_netdev; goto error_register_netdev;
} }
DBG_871X("%s, MAC Address (if%d) = " MAC_FMT "\n", __FUNCTION__, (padapter->iface_id+1), MAC_ARG(pnetdev->dev_addr)); DBG_88E("%s, MAC Address (if%d) = " MAC_FMT "\n", __FUNCTION__, (padapter->iface_id+1), MAC_ARG(pnetdev->dev_addr));
return ret; return ret;
@ -1084,7 +1084,7 @@ int _netdev_open(struct net_device *pnetdev)
struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrctrlpriv = adapter_to_pwrctl(padapter);
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+871x_drv - dev_open\n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("+871x_drv - dev_open\n"));
DBG_871X("+871x_drv - drv_open, bup=%d\n", padapter->bup); DBG_88E("+871x_drv - drv_open, bup=%d\n", padapter->bup);
if (pwrctrlpriv->ps_flag == true) { if (pwrctrlpriv->ps_flag == true) {
padapter->net_closed = false; padapter->net_closed = false;
@ -1104,12 +1104,12 @@ int _netdev_open(struct net_device *pnetdev)
goto netdev_open_error; goto netdev_open_error;
} }
DBG_871X("MAC Address = "MAC_FMT"\n", MAC_ARG(pnetdev->dev_addr)); DBG_88E("MAC Address = "MAC_FMT"\n", MAC_ARG(pnetdev->dev_addr));
status=rtw_start_drv_threads(padapter); status=rtw_start_drv_threads(padapter);
if (status ==_FAIL) if (status ==_FAIL)
{ {
DBG_871X("Initialize driver software resource Failed!\n"); DBG_88E("Initialize driver software resource Failed!\n");
goto netdev_open_error; goto netdev_open_error;
} }
@ -1151,7 +1151,7 @@ int _netdev_open(struct net_device *pnetdev)
netdev_open_normal_process: netdev_open_normal_process:
RT_TRACE(_module_os_intfs_c_,_drv_info_,("-871x_drv - dev_open\n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("-871x_drv - dev_open\n"));
DBG_871X("-871x_drv - drv_open, bup=%d\n", padapter->bup); DBG_88E("-871x_drv - drv_open, bup=%d\n", padapter->bup);
return 0; return 0;
@ -1163,7 +1163,7 @@ netdev_open_error:
rtw_netif_stop_queue(pnetdev); rtw_netif_stop_queue(pnetdev);
RT_TRACE(_module_os_intfs_c_,_drv_err_,("-871x_drv - dev_open, fail!\n")); RT_TRACE(_module_os_intfs_c_,_drv_err_,("-871x_drv - dev_open, fail!\n"));
DBG_871X("-871x_drv - drv_open fail, bup=%d\n", padapter->bup); DBG_88E("-871x_drv - drv_open fail, bup=%d\n", padapter->bup);
return (-1); return (-1);
@ -1185,7 +1185,7 @@ static int ips_netdrv_open(struct adapter *padapter)
{ {
int status = _SUCCESS; int status = _SUCCESS;
padapter->net_closed = false; padapter->net_closed = false;
DBG_871X("===> %s.........\n",__FUNCTION__); DBG_88E("===> %s.........\n",__FUNCTION__);
padapter->bDriverStopped = false; padapter->bDriverStopped = false;
@ -1208,7 +1208,7 @@ static int ips_netdrv_open(struct adapter *padapter)
netdev_open_error: netdev_open_error:
/* padapter->bup = false; */ /* padapter->bup = false; */
DBG_871X("-ips_netdrv_open - drv_open failure, bup=%d\n", padapter->bup); DBG_88E("-ips_netdrv_open - drv_open failure, bup=%d\n", padapter->bup);
return _FAIL; return _FAIL;
} }
@ -1218,14 +1218,14 @@ int rtw_ips_pwr_up(struct adapter *padapter)
{ {
int result; int result;
u32 start_time = jiffies; u32 start_time = jiffies;
DBG_871X("===> rtw_ips_pwr_up..............\n"); DBG_88E("===> rtw_ips_pwr_up..............\n");
rtw_reset_drv_sw(padapter); rtw_reset_drv_sw(padapter);
result = ips_netdrv_open(padapter); result = ips_netdrv_open(padapter);
rtw_led_control(padapter, LED_CTL_NO_LINK); rtw_led_control(padapter, LED_CTL_NO_LINK);
DBG_871X("<=== rtw_ips_pwr_up.............. in %dms\n", rtw_get_passing_time_ms(start_time)); DBG_88E("<=== rtw_ips_pwr_up.............. in %dms\n", rtw_get_passing_time_ms(start_time));
return result; return result;
} }
@ -1233,7 +1233,7 @@ int rtw_ips_pwr_up(struct adapter *padapter)
void rtw_ips_pwr_down(struct adapter *padapter) void rtw_ips_pwr_down(struct adapter *padapter)
{ {
u32 start_time = jiffies; u32 start_time = jiffies;
DBG_871X("===> rtw_ips_pwr_down...................\n"); DBG_88E("===> rtw_ips_pwr_down...................\n");
padapter->bCardDisableWOHSM = true; padapter->bCardDisableWOHSM = true;
padapter->net_closed = true; padapter->net_closed = true;
@ -1242,14 +1242,14 @@ void rtw_ips_pwr_down(struct adapter *padapter)
rtw_ips_dev_unload(padapter); rtw_ips_dev_unload(padapter);
padapter->bCardDisableWOHSM = false; padapter->bCardDisableWOHSM = false;
DBG_871X("<=== rtw_ips_pwr_down..................... in %dms\n", rtw_get_passing_time_ms(start_time)); DBG_88E("<=== rtw_ips_pwr_down..................... in %dms\n", rtw_get_passing_time_ms(start_time));
} }
void rtw_ips_dev_unload(struct adapter *padapter) void rtw_ips_dev_unload(struct adapter *padapter)
{ {
struct net_device *pnetdev= (struct net_device*)padapter->pnetdev; struct net_device *pnetdev= (struct net_device*)padapter->pnetdev;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv); struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
DBG_871X("====> %s...\n",__FUNCTION__); DBG_88E("====> %s...\n",__FUNCTION__);
rtw_hal_set_hwreg(padapter, HW_VAR_FIFO_CLEARN_UP, NULL); rtw_hal_set_hwreg(padapter, HW_VAR_FIFO_CLEARN_UP, NULL);
@ -1294,7 +1294,7 @@ static int netdev_close(struct net_device *pnetdev)
padapter->net_closed = true; padapter->net_closed = true;
if (adapter_to_pwrctl(padapter)->rf_pwrstate == rf_on) { if (adapter_to_pwrctl(padapter)->rf_pwrstate == rf_on) {
DBG_871X("(2)871x_drv - drv_close, bup=%d, hw_init_completed=%d\n", padapter->bup, padapter->hw_init_completed); DBG_88E("(2)871x_drv - drv_close, bup=%d, hw_init_completed=%d\n", padapter->bup, padapter->hw_init_completed);
/* s1. */ /* s1. */
if (pnetdev) if (pnetdev)
@ -1337,14 +1337,14 @@ static int netdev_close(struct net_device *pnetdev)
padapter->rtw_wdev->iftype = NL80211_IFTYPE_MONITOR; /* set this at the end */ padapter->rtw_wdev->iftype = NL80211_IFTYPE_MONITOR; /* set this at the end */
RT_TRACE(_module_os_intfs_c_,_drv_info_,("-871x_drv - drv_close\n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("-871x_drv - drv_close\n"));
DBG_871X("-871x_drv - drv_close, bup=%d\n", padapter->bup); DBG_88E("-871x_drv - drv_close, bup=%d\n", padapter->bup);
return 0; return 0;
} }
void rtw_ndev_destructor(struct net_device *ndev) void rtw_ndev_destructor(struct net_device *ndev)
{ {
DBG_871X(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev)); DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
if (ndev->ieee80211_ptr) if (ndev->ieee80211_ptr)
rtw_mfree((u8 *)ndev->ieee80211_ptr, sizeof(struct wireless_dev)); rtw_mfree((u8 *)ndev->ieee80211_ptr, sizeof(struct wireless_dev));
@ -1576,7 +1576,7 @@ static int get_defaultgw(u32 *ip_addr ,char mac[])
if ( !(*ip_addr) || !gw_index ) if ( !(*ip_addr) || !gw_index )
{ {
/* DBG_871X("No default GW\n"); */ /* DBG_88E("No default GW\n"); */
return -1; return -1;
} }
@ -1584,13 +1584,13 @@ static int get_defaultgw(u32 *ip_addr ,char mac[])
if (gw_dev == NULL) if (gw_dev == NULL)
{ {
/* DBG_871X("get Oif Device Fail\n"); */ /* DBG_88E("get Oif Device Fail\n"); */
return -1; return -1;
} }
if (!arp_query(mac, *ip_addr, gw_dev)) if (!arp_query(mac, *ip_addr, gw_dev))
{ {
/* DBG_871X( "arp query failed\n"); */ /* DBG_88E( "arp query failed\n"); */
dev_put(gw_dev); dev_put(gw_dev);
return -1; return -1;
@ -1616,12 +1616,12 @@ int rtw_gw_addr_query(struct adapter *padapter)
pmlmepriv->gw_ip[2] = (gw_addr&0xff0000)>>16; pmlmepriv->gw_ip[2] = (gw_addr&0xff0000)>>16;
pmlmepriv->gw_ip[3] = (gw_addr&0xff000000)>>24; pmlmepriv->gw_ip[3] = (gw_addr&0xff000000)>>24;
memcpy(pmlmepriv->gw_mac_addr, gw_mac, 6); memcpy(pmlmepriv->gw_mac_addr, gw_mac, 6);
DBG_871X("%s Gateway Mac:\t" MAC_FMT "\n", __FUNCTION__, MAC_ARG(pmlmepriv->gw_mac_addr)); DBG_88E("%s Gateway Mac:\t" MAC_FMT "\n", __FUNCTION__, MAC_ARG(pmlmepriv->gw_mac_addr));
DBG_871X("%s Gateway IP:\t" IP_FMT "\n", __FUNCTION__, IP_ARG(pmlmepriv->gw_ip)); DBG_88E("%s Gateway IP:\t" IP_FMT "\n", __FUNCTION__, IP_ARG(pmlmepriv->gw_ip));
} }
else else
{ {
/* DBG_871X("Get Gateway IP/MAC fail!\n"); */ /* DBG_88E("Get Gateway IP/MAC fail!\n"); */
} }
return res; return res;
@ -1634,7 +1634,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
struct net_device *pnetdev = padapter->pnetdev; struct net_device *pnetdev = padapter->pnetdev;
struct wifidirect_info* pwdinfo = &padapter->wdinfo; struct wifidirect_info* pwdinfo = &padapter->wdinfo;
DBG_871X("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter)); DBG_88E("==> "FUNC_ADPT_FMT" entry....\n", FUNC_ADPT_ARG(padapter));
rtw_cancel_all_timer(padapter); rtw_cancel_all_timer(padapter);
if (pnetdev) { if (pnetdev) {
@ -1644,7 +1644,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED) && rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED) && rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE))
{ {
DBG_871X("%s %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n",__FUNCTION__, DBG_88E("%s %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n",__FUNCTION__,
pmlmepriv->cur_network.network.Ssid.Ssid, pmlmepriv->cur_network.network.Ssid.Ssid,
MAC_ARG(pmlmepriv->cur_network.network.MacAddress), MAC_ARG(pmlmepriv->cur_network.network.MacAddress),
pmlmepriv->cur_network.network.Ssid.SsidLength, pmlmepriv->cur_network.network.Ssid.SsidLength,
@ -1679,7 +1679,7 @@ static int rtw_suspend_free_assoc_resource(struct adapter *padapter)
if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY))
rtw_indicate_scan_done(padapter, 1); rtw_indicate_scan_done(padapter, 1);
DBG_871X("==> "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter)); DBG_88E("==> "FUNC_ADPT_FMT" exit....\n", FUNC_ADPT_ARG(padapter));
return 0; return 0;
} }
@ -1714,9 +1714,9 @@ int rtw_resume_common(struct adapter *padapter)
rtw_reset_drv_sw(padapter); rtw_reset_drv_sw(padapter);
pwrpriv->bkeepfwalive = false; pwrpriv->bkeepfwalive = false;
DBG_871X("bkeepfwalive(%x)\n",pwrpriv->bkeepfwalive); DBG_88E("bkeepfwalive(%x)\n",pwrpriv->bkeepfwalive);
if (pm_netdev_open(pnetdev,true) != 0) { if (pm_netdev_open(pnetdev,true) != 0) {
DBG_871X("%s ==> pm_netdev_open failed\n",__FUNCTION__); DBG_88E("%s ==> pm_netdev_open failed\n",__FUNCTION__);
ret = -1; ret = -1;
return ret; return ret;
} }
@ -1725,15 +1725,15 @@ int rtw_resume_common(struct adapter *padapter)
netif_carrier_on(pnetdev); netif_carrier_on(pnetdev);
if (check_fwstate(mlmepriv, WIFI_STATION_STATE)) { 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));
rtw_roaming(padapter, NULL); rtw_roaming(padapter, NULL);
} else if (check_fwstate(mlmepriv, WIFI_AP_STATE)) { } 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); rtw_ap_restore_network(padapter);
} else if (check_fwstate(mlmepriv, WIFI_ADHOC_STATE)) { } 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 { } 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));
} }
return ret; return ret;
} }

64
os_dep/osdep_service.c
View file

@ -225,7 +225,7 @@ void rtw_mstat_dump(void)
char buf[768] = {0}; char buf[768] = {0};
_rtw_mstat_dump(buf, 768); _rtw_mstat_dump(buf, 768);
DBG_871X("\n%s", buf); DBG_88E("\n%s", buf);
} }
void rtw_mstat_update(const enum mstat_f flags, const MSTAT_STATUS status, u32 sz) void rtw_mstat_update(const enum mstat_f flags, const MSTAT_STATUS status, u32 sz)
@ -291,7 +291,7 @@ void rtw_mstat_update(const enum mstat_f flags, const MSTAT_STATUS status, u32 s
inline u8* dbg_rtw_vmalloc(u32 sz, const enum mstat_f flags, const char *func, const int line) inline u8* dbg_rtw_vmalloc(u32 sz, const enum mstat_f flags, const char *func, const int line)
{ {
u8 *p; u8 *p;
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */ /* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
p=_rtw_vmalloc((sz)); p=_rtw_vmalloc((sz));
@ -307,7 +307,7 @@ inline u8* dbg_rtw_vmalloc(u32 sz, const enum mstat_f flags, const char *func, c
inline u8* dbg_rtw_zvmalloc(u32 sz, const enum mstat_f flags, const char *func, const int line) inline u8* dbg_rtw_zvmalloc(u32 sz, const enum mstat_f flags, const char *func, const int line)
{ {
u8 *p; u8 *p;
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */ /* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
p=_rtw_zvmalloc((sz)); p=_rtw_zvmalloc((sz));
@ -322,7 +322,7 @@ inline u8* dbg_rtw_zvmalloc(u32 sz, const enum mstat_f flags, const char *func,
inline void dbg_rtw_vmfree(u8 *pbuf, u32 sz, const enum mstat_f flags, const char *func, const int line) inline void dbg_rtw_vmfree(u8 *pbuf, u32 sz, const enum mstat_f flags, const char *func, const int line)
{ {
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%p,%d)\n", func, line, __FUNCTION__, (pbuf), (sz)); */ /* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%p,%d)\n", func, line, __FUNCTION__, (pbuf), (sz)); */
_rtw_vmfree((pbuf), (sz)); _rtw_vmfree((pbuf), (sz));
@ -338,10 +338,10 @@ inline u8* dbg_rtw_malloc(u32 sz, const enum mstat_f flags, const char *func, co
u8 *p; u8 *p;
/* if (sz>=153 && sz<=306) */ /* if (sz>=153 && sz<=306) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */ /* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
/* if ((sz)>4096) */ /* if ((sz)>4096) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */ /* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
p=_rtw_malloc((sz)); p=_rtw_malloc((sz));
@ -359,10 +359,10 @@ inline u8* dbg_rtw_zmalloc(u32 sz, const enum mstat_f flags, const char *func, c
u8 *p; u8 *p;
/* if (sz>=153 && sz<=306) */ /* if (sz>=153 && sz<=306) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */ /* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
/* if ((sz)>4096) */ /* if ((sz)>4096) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */ /* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
p = _rtw_zmalloc((sz)); p = _rtw_zmalloc((sz));
@ -378,10 +378,10 @@ inline u8* dbg_rtw_zmalloc(u32 sz, const enum mstat_f flags, const char *func, c
inline void dbg_rtw_mfree(u8 *pbuf, u32 sz, const enum mstat_f flags, const char *func, const int line) inline void dbg_rtw_mfree(u8 *pbuf, u32 sz, const enum mstat_f flags, const char *func, const int line)
{ {
/* if (sz>=153 && sz<=306) */ /* if (sz>=153 && sz<=306) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */ /* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, (sz)); */
/* if ((sz)>4096) */ /* if ((sz)>4096) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%p,%d)\n", func, line, __FUNCTION__, (pbuf), (sz)); */ /* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%p,%d)\n", func, line, __FUNCTION__, (pbuf), (sz)); */
_rtw_mfree((pbuf), (sz)); _rtw_mfree((pbuf), (sz));
@ -403,7 +403,7 @@ inline struct sk_buff * dbg_rtw_skb_alloc(unsigned int size, const enum mstat_f
truesize = skb->truesize; truesize = skb->truesize;
if (!skb || truesize < size /*|| size > 4096*/) if (!skb || truesize < size /*|| size > 4096*/)
DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d), skb:%p, truesize=%u\n", func, line, __FUNCTION__, size, skb, truesize); DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d), skb:%p, truesize=%u\n", func, line, __FUNCTION__, size, skb, truesize);
rtw_mstat_update( rtw_mstat_update(
flags flags
@ -419,7 +419,7 @@ inline void dbg_rtw_skb_free(struct sk_buff *skb, const enum mstat_f flags, cons
unsigned int truesize = skb->truesize; unsigned int truesize = skb->truesize;
/* if (truesize > 4096) */ /* if (truesize > 4096) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __FUNCTION__, truesize); */ /* DBG_88E("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __FUNCTION__, truesize); */
_rtw_skb_free(skb); _rtw_skb_free(skb);
@ -441,7 +441,7 @@ inline struct sk_buff *dbg_rtw_skb_copy(const struct sk_buff *skb, const enum ms
cp_truesize = skb_cp->truesize; cp_truesize = skb_cp->truesize;
if (!skb_cp || cp_truesize != truesize /*||cp_truesize > 4096*/) if (!skb_cp || cp_truesize != truesize /*||cp_truesize > 4096*/)
DBG_871X("DBG_MEM_ALLOC %s:%d %s(%u), skb_cp:%p, cp_truesize=%u\n", func, line, __FUNCTION__, truesize, skb_cp, cp_truesize); DBG_88E("DBG_MEM_ALLOC %s:%d %s(%u), skb_cp:%p, cp_truesize=%u\n", func, line, __FUNCTION__, truesize, skb_cp, cp_truesize);
rtw_mstat_update( rtw_mstat_update(
flags flags
@ -463,7 +463,7 @@ inline struct sk_buff *dbg_rtw_skb_clone(struct sk_buff *skb, const enum mstat_f
cl_truesize = skb_cl->truesize; cl_truesize = skb_cl->truesize;
if (!skb_cl || cl_truesize != truesize /*|| cl_truesize > 4096*/) if (!skb_cl || cl_truesize != truesize /*|| cl_truesize > 4096*/)
DBG_871X("DBG_MEM_ALLOC %s:%d %s(%u), skb_cl:%p, cl_truesize=%u\n", func, line, __FUNCTION__, truesize, skb_cl, cl_truesize); DBG_88E("DBG_MEM_ALLOC %s:%d %s(%u), skb_cl:%p, cl_truesize=%u\n", func, line, __FUNCTION__, truesize, skb_cl, cl_truesize);
rtw_mstat_update( rtw_mstat_update(
flags flags
@ -480,7 +480,7 @@ inline int dbg_rtw_netif_rx(struct net_device * ndev, struct sk_buff *skb, cons
unsigned int truesize = skb->truesize; unsigned int truesize = skb->truesize;
/* if (truesize > 4096) */ /* if (truesize > 4096) */
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __FUNCTION__, truesize); */ /* DBG_88E("DBG_MEM_ALLOC %s:%d %s, truesize=%u\n", func, line, __FUNCTION__, truesize); */
ret = _rtw_netif_rx(ndev, skb); ret = _rtw_netif_rx(ndev, skb);
@ -504,7 +504,7 @@ inline void dbg_rtw_skb_queue_purge(struct sk_buff_head *list, enum mstat_f flag
inline void *dbg_rtw_usb_buffer_alloc(struct usb_device *dev, size_t size, dma_addr_t *dma, const enum mstat_f flags, const char *func, int line) inline void *dbg_rtw_usb_buffer_alloc(struct usb_device *dev, size_t size, dma_addr_t *dma, const enum mstat_f flags, const char *func, int line)
{ {
void *p; void *p;
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, size); */ /* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, size); */
p = _rtw_usb_buffer_alloc(dev, size, dma); p = _rtw_usb_buffer_alloc(dev, size, dma);
@ -519,7 +519,7 @@ inline void *dbg_rtw_usb_buffer_alloc(struct usb_device *dev, size_t size, dma_a
inline void dbg_rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *addr, dma_addr_t dma, const enum mstat_f flags, const char *func, int line) inline void dbg_rtw_usb_buffer_free(struct usb_device *dev, size_t size, void *addr, dma_addr_t dma, const enum mstat_f flags, const char *func, int line)
{ {
/* DBG_871X("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, size); */ /* DBG_88E("DBG_MEM_ALLOC %s:%d %s(%d)\n", func, line, __FUNCTION__, size); */
_rtw_usb_buffer_free(dev, size, addr, dma); _rtw_usb_buffer_free(dev, size, addr, dma);
@ -538,7 +538,7 @@ void* rtw_malloc2d(int h, int w, int size)
void **a = (void **) rtw_zmalloc( h*sizeof(void *) + h*w*size ); void **a = (void **) rtw_zmalloc( h*sizeof(void *) + h*w*size );
if (a == NULL) if (a == NULL)
{ {
DBG_871X("%s: alloc memory fail!\n", __FUNCTION__); DBG_88E("%s: alloc memory fail!\n", __FUNCTION__);
return NULL; return NULL;
} }
@ -717,13 +717,13 @@ void rtw_usleep_os(int us)
#ifdef DBG_DELAY_OS #ifdef DBG_DELAY_OS
void _rtw_mdelay_os(int ms, const char *func, const int line) void _rtw_mdelay_os(int ms, const char *func, const int line)
{ {
DBG_871X("%s:%d %s(%d)\n", func, line, __FUNCTION__, ms); DBG_88E("%s:%d %s(%d)\n", func, line, __FUNCTION__, ms);
mdelay((unsigned long)ms); mdelay((unsigned long)ms);
} }
void _rtw_udelay_os(int us, const char *func, const int line) void _rtw_udelay_os(int us, const char *func, const int line)
{ {
DBG_871X("%s:%d %s(%d)\n", func, line, __FUNCTION__, us); DBG_88E("%s:%d %s(%d)\n", func, line, __FUNCTION__, us);
udelay((unsigned long)us); udelay((unsigned long)us);
} }
#else #else
@ -789,7 +789,7 @@ inline void rtw_lock_suspend(void)
#endif #endif
#if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER) #if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER)
/* DBG_871X("####%s: suspend_lock_count:%d####\n", __FUNCTION__, rtw_suspend_lock.stat.count); */ /* DBG_88E("####%s: suspend_lock_count:%d####\n", __FUNCTION__, rtw_suspend_lock.stat.count); */
#endif #endif
} }
@ -802,7 +802,7 @@ inline void rtw_unlock_suspend(void)
#endif #endif
#if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER) #if defined(CONFIG_WAKELOCK) || defined(CONFIG_ANDROID_POWER)
/* DBG_871X("####%s: suspend_lock_count:%d####\n", __FUNCTION__, rtw_suspend_lock.stat.count); */ /* DBG_88E("####%s: suspend_lock_count:%d####\n", __FUNCTION__, rtw_suspend_lock.stat.count); */
#endif #endif
} }
@ -993,20 +993,20 @@ static int retriveFromFile(char *path, u8* buf, u32 sz)
if (path && buf) { if (path && buf) {
if ( 0 == (ret=openFile(&fp,path, O_RDONLY, 0)) ) { if ( 0 == (ret=openFile(&fp,path, O_RDONLY, 0)) ) {
DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp); DBG_88E("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);
oldfs = get_fs(); set_fs(get_ds()); oldfs = get_fs(); set_fs(get_ds());
ret=readFile(fp, buf, sz); ret=readFile(fp, buf, sz);
set_fs(oldfs); set_fs(oldfs);
closeFile(fp); closeFile(fp);
DBG_871X("%s readFile, ret:%d\n",__FUNCTION__, ret); DBG_88E("%s readFile, ret:%d\n",__FUNCTION__, ret);
} else { } else {
DBG_871X("%s openFile path:%s Fail, ret:%d\n",__FUNCTION__, path, ret); DBG_88E("%s openFile path:%s Fail, ret:%d\n",__FUNCTION__, path, ret);
} }
} else { } else {
DBG_871X("%s NULL pointer\n",__FUNCTION__); DBG_88E("%s NULL pointer\n",__FUNCTION__);
ret = -EINVAL; ret = -EINVAL;
} }
return ret; return ret;
@ -1027,20 +1027,20 @@ static int storeToFile(char *path, u8* buf, u32 sz)
if (path && buf) { if (path && buf) {
if ( 0 == (ret=openFile(&fp, path, O_CREAT|O_WRONLY, 0666)) ) { if ( 0 == (ret=openFile(&fp, path, O_CREAT|O_WRONLY, 0666)) ) {
DBG_871X("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp); DBG_88E("%s openFile path:%s fp=%p\n",__FUNCTION__, path ,fp);
oldfs = get_fs(); set_fs(get_ds()); oldfs = get_fs(); set_fs(get_ds());
ret=writeFile(fp, buf, sz); ret=writeFile(fp, buf, sz);
set_fs(oldfs); set_fs(oldfs);
closeFile(fp); closeFile(fp);
DBG_871X("%s writeFile, ret:%d\n",__FUNCTION__, ret); DBG_88E("%s writeFile, ret:%d\n",__FUNCTION__, ret);
} else { } else {
DBG_871X("%s openFile path:%s Fail, ret:%d\n",__FUNCTION__, path, ret); DBG_88E("%s openFile path:%s Fail, ret:%d\n",__FUNCTION__, path, ret);
} }
} else { } else {
DBG_871X("%s NULL pointer\n",__FUNCTION__); DBG_88E("%s NULL pointer\n",__FUNCTION__);
ret = -EINVAL; ret = -EINVAL;
} }
return ret; return ret;
@ -1318,7 +1318,7 @@ bool rtw_cbuf_push(struct rtw_cbuf *cbuf, void *buf)
return _FAIL; return _FAIL;
if (0) if (0)
DBG_871X("%s on %u\n", __func__, cbuf->write); DBG_88E("%s on %u\n", __func__, cbuf->write);
cbuf->bufs[cbuf->write] = buf; cbuf->bufs[cbuf->write] = buf;
cbuf->write = (cbuf->write+1)%cbuf->size; cbuf->write = (cbuf->write+1)%cbuf->size;
@ -1339,7 +1339,7 @@ void *rtw_cbuf_pop(struct rtw_cbuf *cbuf)
return NULL; return NULL;
if (0) if (0)
DBG_871X("%s on %u\n", __func__, cbuf->read); DBG_88E("%s on %u\n", __func__, cbuf->read);
buf = cbuf->bufs[cbuf->read]; buf = cbuf->bufs[cbuf->read];
cbuf->read = (cbuf->read+1)%cbuf->size; cbuf->read = (cbuf->read+1)%cbuf->size;

8
os_dep/recv_linux.c
View file

@ -240,11 +240,11 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib; struct rx_pkt_attrib *pattrib = &precv_frame->u.hdr.attrib;
int bmcast = IS_MCAST(pattrib->dst); int bmcast = IS_MCAST(pattrib->dst);
/* DBG_871X("bmcast=%d\n", bmcast); */ /* DBG_88E("bmcast=%d\n", bmcast); */
if (_rtw_memcmp(pattrib->dst, myid(&padapter->eeprompriv), ETH_ALEN)==false) if (_rtw_memcmp(pattrib->dst, myid(&padapter->eeprompriv), ETH_ALEN)==false)
{ {
/* DBG_871X("not ap psta=%p, addr=%pM\n", psta, pattrib->dst); */ /* DBG_88E("not ap psta=%p, addr=%pM\n", psta, pattrib->dst); */
if (bmcast) if (bmcast)
{ {
@ -258,7 +258,7 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
{ {
struct net_device *pnetdev= (struct net_device*)padapter->pnetdev; struct net_device *pnetdev= (struct net_device*)padapter->pnetdev;
/* DBG_871X("directly forwarding to the rtw_xmit_entry\n"); */ /* DBG_88E("directly forwarding to the rtw_xmit_entry\n"); */
/* skb->ip_summed = CHECKSUM_NONE; */ /* skb->ip_summed = CHECKSUM_NONE; */
skb->dev = pnetdev; skb->dev = pnetdev;
@ -283,7 +283,7 @@ int rtw_recv_indicatepkt(struct adapter *padapter, union recv_frame *precv_frame
} }
else/* to APself */ else/* to APself */
{ {
/* DBG_871X("to APSelf\n"); */ /* DBG_88E("to APSelf\n"); */
} }
} }

56
os_dep/rtw_android.c
View file

@ -152,7 +152,7 @@ static int wl_android_set_pno_setup(struct net_device *dev, char *command, int t
DHD_INFO(("%s: command=%s, len=%d\n", __FUNCTION__, command, total_len)); DHD_INFO(("%s: command=%s, len=%d\n", __FUNCTION__, command, total_len));
if (total_len < (strlen(CMD_PNOSETUP_SET) + sizeof(cmd_tlv_t))) { if (total_len < (strlen(CMD_PNOSETUP_SET) + sizeof(cmd_tlv_t))) {
DBG_871X("%s argument=%d less min size\n", __FUNCTION__, total_len); DBG_88E("%s argument=%d less min size\n", __FUNCTION__, total_len);
goto exit_proc; goto exit_proc;
} }
@ -179,11 +179,11 @@ static int wl_android_set_pno_setup(struct net_device *dev, char *command, int t
if ((nssid = wl_iw_parse_ssid_list_tlv(&str_ptr, ssids_local, if ((nssid = wl_iw_parse_ssid_list_tlv(&str_ptr, ssids_local,
MAX_PFN_LIST_COUNT, &tlv_size_left)) <= 0) { MAX_PFN_LIST_COUNT, &tlv_size_left)) <= 0) {
DBG_871X("SSID is not presented or corrupted ret=%d\n", nssid); DBG_88E("SSID is not presented or corrupted ret=%d\n", nssid);
goto exit_proc; goto exit_proc;
} else { } else {
if ((str_ptr[0] != PNO_TLV_TYPE_TIME) || (tlv_size_left <= 1)) { if ((str_ptr[0] != PNO_TLV_TYPE_TIME) || (tlv_size_left <= 1)) {
DBG_871X("%s scan duration corrupted field size %d\n", DBG_88E("%s scan duration corrupted field size %d\n",
__FUNCTION__, tlv_size_left); __FUNCTION__, tlv_size_left);
goto exit_proc; goto exit_proc;
} }
@ -193,7 +193,7 @@ static int wl_android_set_pno_setup(struct net_device *dev, char *command, int t
if (str_ptr[0] != 0) { if (str_ptr[0] != 0) {
if ((str_ptr[0] != PNO_TLV_FREQ_REPEAT)) { if ((str_ptr[0] != PNO_TLV_FREQ_REPEAT)) {
DBG_871X("%s pno repeat : corrupted field\n", DBG_88E("%s pno repeat : corrupted field\n",
__FUNCTION__); __FUNCTION__);
goto exit_proc; goto exit_proc;
} }
@ -201,7 +201,7 @@ static int wl_android_set_pno_setup(struct net_device *dev, char *command, int t
pno_repeat = simple_strtoul(str_ptr, &str_ptr, 16); pno_repeat = simple_strtoul(str_ptr, &str_ptr, 16);
DHD_INFO(("%s :got pno_repeat=%d\n", __FUNCTION__, pno_repeat)); DHD_INFO(("%s :got pno_repeat=%d\n", __FUNCTION__, pno_repeat));
if (str_ptr[0] != PNO_TLV_FREQ_EXPO_MAX) { if (str_ptr[0] != PNO_TLV_FREQ_EXPO_MAX) {
DBG_871X("%s FREQ_EXPO_MAX corrupted field size\n", DBG_88E("%s FREQ_EXPO_MAX corrupted field size\n",
__FUNCTION__); __FUNCTION__);
goto exit_proc; goto exit_proc;
} }
@ -212,7 +212,7 @@ static int wl_android_set_pno_setup(struct net_device *dev, char *command, int t
} }
} }
} else { } else {
DBG_871X("%s get wrong TLV command\n", __FUNCTION__); DBG_88E("%s get wrong TLV command\n", __FUNCTION__);
goto exit_proc; goto exit_proc;
} }
@ -347,17 +347,17 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
goto exit; goto exit;
} }
/* DBG_871X("%s priv_cmd.buf=%p priv_cmd.total_len=%d priv_cmd.used_len=%d\n",__func__,priv_cmd.buf,priv_cmd.total_len,priv_cmd.used_len); */ /* DBG_88E("%s priv_cmd.buf=%p priv_cmd.total_len=%d priv_cmd.used_len=%d\n",__func__,priv_cmd.buf,priv_cmd.total_len,priv_cmd.used_len); */
command = rtw_zmalloc(priv_cmd.total_len); command = rtw_zmalloc(priv_cmd.total_len);
if (!command) if (!command)
{ {
DBG_871X("%s: failed to allocate memory\n", __FUNCTION__); DBG_88E("%s: failed to allocate memory\n", __FUNCTION__);
ret = -ENOMEM; ret = -ENOMEM;
goto exit; goto exit;
} }
if (!access_ok(VERIFY_READ, (const void __user *)priv_cmd.buf, priv_cmd.total_len)) { if (!access_ok(VERIFY_READ, (const void __user *)priv_cmd.buf, priv_cmd.total_len)) {
DBG_871X("%s: failed to access memory\n", __FUNCTION__); DBG_88E("%s: failed to access memory\n", __FUNCTION__);
ret = -EFAULT; ret = -EFAULT;
goto exit; goto exit;
} }
@ -366,7 +366,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
goto exit; goto exit;
} }
DBG_871X("%s: Android private cmd \"%s\" on %s\n" DBG_88E("%s: Android private cmd \"%s\" on %s\n"
, __FUNCTION__, command, ifr->ifr_name); , __FUNCTION__, command, ifr->ifr_name);
cmd_num = rtw_android_cmdstr_to_num(command); cmd_num = rtw_android_cmdstr_to_num(command);
@ -380,7 +380,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
} }
if (!g_wifi_on) { if (!g_wifi_on) {
DBG_871X("%s: Ignore private cmd \"%s\" - iface %s is down\n" DBG_88E("%s: Ignore private cmd \"%s\" - iface %s is down\n"
,__FUNCTION__, command, ifr->ifr_name); ,__FUNCTION__, command, ifr->ifr_name);
ret = 0; ret = 0;
goto exit; goto exit;
@ -511,7 +511,7 @@ int rtw_android_priv_cmd(struct net_device *net, struct ifreq *ifr, int cmd)
} }
#endif #endif
default: default:
DBG_871X("Unknown PRIVATE command %s - ignored\n", command); DBG_88E("Unknown PRIVATE command %s - ignored\n", command);
snprintf(command, 3, "OK"); snprintf(command, 3, "OK");
bytes_written = strlen("OK"); bytes_written = strlen("OK");
} }
@ -521,14 +521,14 @@ response:
if ((bytes_written == 0) && (priv_cmd.total_len > 0)) if ((bytes_written == 0) && (priv_cmd.total_len > 0))
command[0] = '\0'; command[0] = '\0';
if (bytes_written >= priv_cmd.total_len) { if (bytes_written >= priv_cmd.total_len) {
DBG_871X("%s: bytes_written = %d\n", __FUNCTION__, bytes_written); DBG_88E("%s: bytes_written = %d\n", __FUNCTION__, bytes_written);
bytes_written = priv_cmd.total_len; bytes_written = priv_cmd.total_len;
} else { } else {
bytes_written++; bytes_written++;
} }
priv_cmd.used_len = bytes_written; priv_cmd.used_len = bytes_written;
if (copy_to_user((void __user *)priv_cmd.buf, command, bytes_written)) { if (copy_to_user((void __user *)priv_cmd.buf, command, bytes_written)) {
DBG_871X("%s: failed to copy data to user buffer\n", __FUNCTION__); DBG_88E("%s: failed to copy data to user buffer\n", __FUNCTION__);
ret = -EFAULT; ret = -EFAULT;
} }
} }
@ -566,7 +566,7 @@ int rtw_android_wifictrl_func_add(void)
ret = wifi_add_dev(); ret = wifi_add_dev();
if (ret) { if (ret) {
DBG_871X("%s: platform_driver_register failed\n", __FUNCTION__); DBG_88E("%s: platform_driver_register failed\n", __FUNCTION__);
return ret; return ret;
} }
g_wifidev_registered = 1; g_wifidev_registered = 1;
@ -574,7 +574,7 @@ int rtw_android_wifictrl_func_add(void)
/* Waiting callback after platform_driver_register is done or exit with error */ /* Waiting callback after platform_driver_register is done or exit with error */
if (down_timeout(&wifi_control_sem, msecs_to_jiffies(1000)) != 0) { if (down_timeout(&wifi_control_sem, msecs_to_jiffies(1000)) != 0) {
ret = -EINVAL; ret = -EINVAL;
DBG_871X("%s: platform_driver_register timeout\n", __FUNCTION__); DBG_88E("%s: platform_driver_register timeout\n", __FUNCTION__);
} }
return ret; return ret;
@ -595,14 +595,14 @@ void *wl_android_prealloc(int section, unsigned long size)
if (wifi_control_data && wifi_control_data->mem_prealloc) { if (wifi_control_data && wifi_control_data->mem_prealloc) {
alloc_ptr = wifi_control_data->mem_prealloc(section, size); alloc_ptr = wifi_control_data->mem_prealloc(section, size);
if (alloc_ptr) { if (alloc_ptr) {
DBG_871X("success alloc section %d\n", section); DBG_88E("success alloc section %d\n", section);
if (size != 0L) if (size != 0L)
memset(alloc_ptr, 0, size); memset(alloc_ptr, 0, size);
return alloc_ptr; return alloc_ptr;
} }
} }
DBG_871X("can't alloc section %d\n", section); DBG_88E("can't alloc section %d\n", section);
return NULL; return NULL;
} }
@ -621,7 +621,7 @@ int wifi_get_irq_number(unsigned long *irq_flags_ptr)
int wifi_set_power(int on, unsigned long msec) int wifi_set_power(int on, unsigned long msec)
{ {
DBG_871X("%s = %d\n", __FUNCTION__, on); DBG_88E("%s = %d\n", __FUNCTION__, on);
if (wifi_control_data && wifi_control_data->set_power) { if (wifi_control_data && wifi_control_data->set_power) {
wifi_control_data->set_power(on); wifi_control_data->set_power(on);
} }
@ -633,7 +633,7 @@ int wifi_set_power(int on, unsigned long msec)
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35))
int wifi_get_mac_addr(unsigned char *buf) int wifi_get_mac_addr(unsigned char *buf)
{ {
DBG_871X("%s\n", __FUNCTION__); DBG_88E("%s\n", __FUNCTION__);
if (!buf) if (!buf)
return -EINVAL; return -EINVAL;
if (wifi_control_data && wifi_control_data->get_mac_addr) { if (wifi_control_data && wifi_control_data->get_mac_addr) {
@ -646,7 +646,7 @@ int wifi_get_mac_addr(unsigned char *buf)
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) || defined(COMPAT_KERNEL_RELEASE) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) || defined(COMPAT_KERNEL_RELEASE)
void *wifi_get_country_code(char *ccode) void *wifi_get_country_code(char *ccode)
{ {
DBG_871X("%s\n", __FUNCTION__); DBG_88E("%s\n", __FUNCTION__);
if (!ccode) if (!ccode)
return NULL; return NULL;
if (wifi_control_data && wifi_control_data->get_country_code) { if (wifi_control_data && wifi_control_data->get_country_code) {
@ -658,7 +658,7 @@ void *wifi_get_country_code(char *ccode)
static int wifi_set_carddetect(int on) static int wifi_set_carddetect(int on)
{ {
DBG_871X("%s = %d\n", __FUNCTION__, on); DBG_88E("%s = %d\n", __FUNCTION__, on);
if (wifi_control_data && wifi_control_data->set_carddetect) { if (wifi_control_data && wifi_control_data->set_carddetect) {
wifi_control_data->set_carddetect(on); wifi_control_data->set_carddetect(on);
} }
@ -671,7 +671,7 @@ static int wifi_probe(struct platform_device *pdev)
(struct wifi_platform_data *)(pdev->dev.platform_data); (struct wifi_platform_data *)(pdev->dev.platform_data);
int wifi_wake_gpio = 0; int wifi_wake_gpio = 0;
DBG_871X("## %s\n", __FUNCTION__); DBG_88E("## %s\n", __FUNCTION__);
wifi_irqres = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "bcmdhd_wlan_irq"); wifi_irqres = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "bcmdhd_wlan_irq");
if (wifi_irqres == NULL) if (wifi_irqres == NULL)
@ -694,7 +694,7 @@ static int wifi_remove(struct platform_device *pdev)
struct wifi_platform_data *wifi_ctrl = struct wifi_platform_data *wifi_ctrl =
(struct wifi_platform_data *)(pdev->dev.platform_data); (struct wifi_platform_data *)(pdev->dev.platform_data);
DBG_871X("## %s\n", __FUNCTION__); DBG_88E("## %s\n", __FUNCTION__);
wifi_control_data = wifi_ctrl; wifi_control_data = wifi_ctrl;
wifi_set_power(0, 0); /* Power Off */ wifi_set_power(0, 0); /* Power Off */
@ -706,7 +706,7 @@ static int wifi_remove(struct platform_device *pdev)
static int wifi_suspend(struct platform_device *pdev, pm_message_t state) static int wifi_suspend(struct platform_device *pdev, pm_message_t state)
{ {
DBG_871X("##> %s\n", __FUNCTION__); DBG_88E("##> %s\n", __FUNCTION__);
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY) #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY)
bcmsdh_oob_intr_set(0); bcmsdh_oob_intr_set(0);
#endif #endif
@ -715,7 +715,7 @@ static int wifi_suspend(struct platform_device *pdev, pm_message_t state)
static int wifi_resume(struct platform_device *pdev) static int wifi_resume(struct platform_device *pdev)
{ {
DBG_871X("##> %s\n", __FUNCTION__); DBG_88E("##> %s\n", __FUNCTION__);
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY) #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 39)) && defined(OOB_INTR_ONLY)
if (dhd_os_check_if_up(bcmsdh_get_drvdata())) if (dhd_os_check_if_up(bcmsdh_get_drvdata()))
bcmsdh_oob_intr_set(1); bcmsdh_oob_intr_set(1);
@ -746,7 +746,7 @@ static struct platform_driver wifi_device_legacy = {
static int wifi_add_dev(void) static int wifi_add_dev(void)
{ {
DBG_871X("## Calling platform_driver_register\n"); DBG_88E("## Calling platform_driver_register\n");
platform_driver_register(&wifi_device); platform_driver_register(&wifi_device);
platform_driver_register(&wifi_device_legacy); platform_driver_register(&wifi_device_legacy);
return 0; return 0;
@ -754,7 +754,7 @@ static int wifi_add_dev(void)
static void wifi_del_dev(void) static void wifi_del_dev(void)
{ {
DBG_871X("## Unregister platform_driver_register\n"); DBG_88E("## Unregister platform_driver_register\n");
platform_driver_unregister(&wifi_device); platform_driver_unregister(&wifi_device);
platform_driver_unregister(&wifi_device_legacy); platform_driver_unregister(&wifi_device_legacy);
} }

226
os_dep/usb_intf.c
View file

@ -49,7 +49,7 @@ static void rtw_dev_shutdown(struct device *dev)
struct adapter *adapter = dvobj->if1; struct adapter *adapter = dvobj->if1;
int i; int i;
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
for (i = 0; i<dvobj->iface_nums; i++) { for (i = 0; i<dvobj->iface_nums; i++) {
adapter = dvobj->padapters[i]; adapter = dvobj->padapters[i];
@ -220,7 +220,7 @@ static u8 rtw_init_intf_priv(struct dvobj_priv *dvobj)
dvobj->usb_alloc_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE); dvobj->usb_alloc_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE);
if (dvobj->usb_alloc_vendor_req_buf == NULL) { if (dvobj->usb_alloc_vendor_req_buf == NULL) {
DBG_871X("alloc usb_vendor_req_buf failed... /n"); DBG_88E("alloc usb_vendor_req_buf failed... /n");
rst = _FAIL; rst = _FAIL;
goto exit; goto exit;
} }
@ -296,25 +296,25 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
if (phost_endp) { if (phost_endp) {
pendp_desc = &phost_endp->desc; pendp_desc = &phost_endp->desc;
DBG_871X("\nusb_endpoint_descriptor(%d):\n", i); DBG_88E("\nusb_endpoint_descriptor(%d):\n", i);
DBG_871X("bLength=%x\n",pendp_desc->bLength); DBG_88E("bLength=%x\n",pendp_desc->bLength);
DBG_871X("bDescriptorType=%x\n",pendp_desc->bDescriptorType); DBG_88E("bDescriptorType=%x\n",pendp_desc->bDescriptorType);
DBG_871X("bEndpointAddress=%x\n",pendp_desc->bEndpointAddress); DBG_88E("bEndpointAddress=%x\n",pendp_desc->bEndpointAddress);
DBG_871X("wMaxPacketSize=%d\n",le16_to_cpu(pendp_desc->wMaxPacketSize)); DBG_88E("wMaxPacketSize=%d\n",le16_to_cpu(pendp_desc->wMaxPacketSize));
DBG_871X("bInterval=%x\n",pendp_desc->bInterval); DBG_88E("bInterval=%x\n",pendp_desc->bInterval);
if (RT_usb_endpoint_is_bulk_in(pendp_desc)) { if (RT_usb_endpoint_is_bulk_in(pendp_desc)) {
DBG_871X("RT_usb_endpoint_is_bulk_in = %x\n", RT_usb_endpoint_num(pendp_desc)); DBG_88E("RT_usb_endpoint_is_bulk_in = %x\n", RT_usb_endpoint_num(pendp_desc));
pdvobjpriv->RtInPipe[pdvobjpriv->RtNumInPipes] = RT_usb_endpoint_num(pendp_desc); pdvobjpriv->RtInPipe[pdvobjpriv->RtNumInPipes] = RT_usb_endpoint_num(pendp_desc);
pdvobjpriv->RtNumInPipes++; pdvobjpriv->RtNumInPipes++;
} else if (RT_usb_endpoint_is_int_in(pendp_desc)) { } else if (RT_usb_endpoint_is_int_in(pendp_desc)) {
DBG_871X("RT_usb_endpoint_is_int_in = %x, Interval = %x\n", RT_usb_endpoint_num(pendp_desc),pendp_desc->bInterval); DBG_88E("RT_usb_endpoint_is_int_in = %x, Interval = %x\n", RT_usb_endpoint_num(pendp_desc),pendp_desc->bInterval);
pdvobjpriv->RtInPipe[pdvobjpriv->RtNumInPipes] = RT_usb_endpoint_num(pendp_desc); pdvobjpriv->RtInPipe[pdvobjpriv->RtNumInPipes] = RT_usb_endpoint_num(pendp_desc);
pdvobjpriv->RtNumInPipes++; pdvobjpriv->RtNumInPipes++;
} }
else if (RT_usb_endpoint_is_bulk_out(pendp_desc)) else if (RT_usb_endpoint_is_bulk_out(pendp_desc))
{ {
DBG_871X("RT_usb_endpoint_is_bulk_out = %x\n", RT_usb_endpoint_num(pendp_desc)); DBG_88E("RT_usb_endpoint_is_bulk_out = %x\n", RT_usb_endpoint_num(pendp_desc));
pdvobjpriv->RtOutPipe[pdvobjpriv->RtNumOutPipes] = RT_usb_endpoint_num(pendp_desc); pdvobjpriv->RtOutPipe[pdvobjpriv->RtNumOutPipes] = RT_usb_endpoint_num(pendp_desc);
pdvobjpriv->RtNumOutPipes++; pdvobjpriv->RtNumOutPipes++;
} }
@ -322,14 +322,14 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)
} }
} }
DBG_871X("nr_endpoint=%d, in_num=%d, out_num=%d\n\n", pdvobjpriv->nr_endpoint, pdvobjpriv->RtNumInPipes, pdvobjpriv->RtNumOutPipes); DBG_88E("nr_endpoint=%d, in_num=%d, out_num=%d\n\n", pdvobjpriv->nr_endpoint, pdvobjpriv->RtNumInPipes, pdvobjpriv->RtNumOutPipes);
if (pusbd->speed == USB_SPEED_HIGH) { if (pusbd->speed == USB_SPEED_HIGH) {
pdvobjpriv->ishighspeed = true; pdvobjpriv->ishighspeed = true;
DBG_871X("USB_SPEED_HIGH\n"); DBG_88E("USB_SPEED_HIGH\n");
} else { } else {
pdvobjpriv->ishighspeed = false; pdvobjpriv->ishighspeed = false;
DBG_871X("NON USB_SPEED_HIGH\n"); DBG_88E("NON USB_SPEED_HIGH\n");
} }
if (rtw_init_intf_priv(pdvobjpriv) == _FAIL) { if (rtw_init_intf_priv(pdvobjpriv) == _FAIL) {
@ -374,7 +374,7 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf)
if (interface_to_usbdev(usb_intf)->state != USB_STATE_NOTATTACHED) { if (interface_to_usbdev(usb_intf)->state != USB_STATE_NOTATTACHED) {
/* If we didn't unplug usb dongle and remove/insert modlue, driver fails on sitesurvey for the first time when device is up . */ /* If we didn't unplug usb dongle and remove/insert modlue, driver fails on sitesurvey for the first time when device is up . */
/* Reset usb port for sitesurvey fail issue. 2009.8.13, by Thomas */ /* Reset usb port for sitesurvey fail issue. 2009.8.13, by Thomas */
DBG_871X("usb attached..., try to reset usb device\n"); DBG_88E("usb attached..., try to reset usb device\n");
usb_reset_device(interface_to_usbdev(usb_intf)); usb_reset_device(interface_to_usbdev(usb_intf));
} }
} }
@ -386,7 +386,7 @@ static void usb_dvobj_deinit(struct usb_interface *usb_intf)
rtw_mfree((u8*)dvobj, sizeof(*dvobj)); rtw_mfree((u8*)dvobj, sizeof(*dvobj));
} }
/* DBG_871X("%s %d\n", __func__, ATOMIC_READ(&usb_intf->dev.kobj.kref.refcount)); */ /* DBG_88E("%s %d\n", __func__, ATOMIC_READ(&usb_intf->dev.kobj.kref.refcount)); */
usb_put_dev(interface_to_usbdev(usb_intf)); usb_put_dev(interface_to_usbdev(usb_intf));
; ;
@ -442,7 +442,7 @@ void rtw_dev_unload(struct adapter *padapter)
if (padapter->bup == true) if (padapter->bup == true)
{ {
DBG_871X("===> rtw_dev_unload\n"); DBG_88E("===> rtw_dev_unload\n");
padapter->bDriverStopped = true; padapter->bDriverStopped = true;
if (padapter->xmitpriv.ack_tx) if (padapter->xmitpriv.ack_tx)
@ -471,7 +471,7 @@ void rtw_dev_unload(struct adapter *padapter)
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("r871x_dev_unload():padapter->bup == false\n" )); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("r871x_dev_unload():padapter->bup == false\n" ));
} }
DBG_871X("<=== rtw_dev_unload\n"); DBG_88E("<=== rtw_dev_unload\n");
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-rtw_dev_unload\n")); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-rtw_dev_unload\n"));
@ -507,14 +507,14 @@ int rtw_hw_suspend(struct adapter *padapter )
if ((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved)) if ((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved))
{ {
DBG_871X("padapter->bup=%d bDriverStopped=%d bSurpriseRemoved = %d\n", DBG_88E("padapter->bup=%d bDriverStopped=%d bSurpriseRemoved = %d\n",
padapter->bup, padapter->bDriverStopped,padapter->bSurpriseRemoved); padapter->bup, padapter->bDriverStopped,padapter->bSurpriseRemoved);
goto error_exit; goto error_exit;
} }
LeaveAllPowerSaveMode(padapter); LeaveAllPowerSaveMode(padapter);
DBG_871X("==> rtw_hw_suspend\n"); DBG_88E("==> rtw_hw_suspend\n");
_enter_pwrlock(&pwrpriv->lock); _enter_pwrlock(&pwrpriv->lock);
pwrpriv->bips_processing = true; pwrpriv->bips_processing = true;
/* s1. */ /* s1. */
@ -558,7 +558,7 @@ int rtw_hw_suspend(struct adapter *padapter )
return 0; return 0;
error_exit: error_exit:
DBG_871X("%s, failed\n",__FUNCTION__); DBG_88E("%s, failed\n",__FUNCTION__);
return (-1); return (-1);
} }
@ -574,7 +574,7 @@ int rtw_hw_resume(struct adapter *padapter)
pwrpriv = adapter_to_pwrctl(padapter); pwrpriv = adapter_to_pwrctl(padapter);
pusb_intf = adapter_to_dvobj(padapter)->pusbintf; pusb_intf = adapter_to_dvobj(padapter)->pusbintf;
pnetdev = padapter->pnetdev; pnetdev = padapter->pnetdev;
DBG_871X("==> rtw_hw_resume\n"); DBG_88E("==> rtw_hw_resume\n");
_enter_pwrlock(&pwrpriv->lock); _enter_pwrlock(&pwrpriv->lock);
pwrpriv->bips_processing = true; pwrpriv->bips_processing = true;
rtw_reset_drv_sw(padapter); rtw_reset_drv_sw(padapter);
@ -605,7 +605,7 @@ int rtw_hw_resume(struct adapter *padapter)
return 0; return 0;
error_exit: error_exit:
DBG_871X("%s, Open net dev failed\n",__FUNCTION__); DBG_88E("%s, Open net dev failed\n",__FUNCTION__);
return (-1); return (-1);
} }
@ -624,7 +624,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
; ;
DBG_871X("==> %s (%s:%d)\n",__FUNCTION__, current->comm, current->pid); DBG_88E("==> %s (%s:%d)\n",__FUNCTION__, current->comm, current->pid);
if (!padapter->bup) { if (!padapter->bup) {
@ -636,7 +636,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
if ((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved)) if ((!padapter->bup) || (padapter->bDriverStopped)||(padapter->bSurpriseRemoved))
{ {
DBG_871X("padapter->bup=%d bDriverStopped=%d bSurpriseRemoved = %d\n", DBG_88E("padapter->bup=%d bDriverStopped=%d bSurpriseRemoved = %d\n",
padapter->bup, padapter->bDriverStopped,padapter->bSurpriseRemoved); padapter->bup, padapter->bDriverStopped,padapter->bSurpriseRemoved);
goto exit; goto exit;
} }
@ -665,7 +665,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message)
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
exit: exit:
DBG_871X("<=== %s return %d.............. in %dms\n", __FUNCTION__ DBG_88E("<=== %s return %d.............. in %dms\n", __FUNCTION__
, ret, rtw_get_passing_time_ms(start_time)); , ret, rtw_get_passing_time_ms(start_time));
return ret; return ret;
@ -704,7 +704,7 @@ int rtw_resume_process(struct adapter *padapter)
#endif /* ifdef CONFIG_BT_COEXIST */ #endif /* ifdef CONFIG_BT_COEXIST */
; ;
DBG_871X("==> %s (%s:%d)\n",__FUNCTION__, current->comm, current->pid); DBG_88E("==> %s (%s:%d)\n",__FUNCTION__, current->comm, current->pid);
if (padapter) { if (padapter) {
pnetdev= padapter->pnetdev; pnetdev= padapter->pnetdev;
@ -717,18 +717,18 @@ int rtw_resume_process(struct adapter *padapter)
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
#ifdef CONFIG_AUTOSUSPEND #ifdef CONFIG_AUTOSUSPEND
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
DBG_871X("%s...pm_usage_cnt(%d) pwrpriv->bAutoResume=%x. ....\n",__func__,atomic_read(&(adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt)),pwrpriv->bAutoResume); DBG_88E("%s...pm_usage_cnt(%d) pwrpriv->bAutoResume=%x. ....\n",__func__,atomic_read(&(adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt)),pwrpriv->bAutoResume);
pm_cnt=atomic_read(&(adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt)); pm_cnt=atomic_read(&(adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt));
#else #else
DBG_871X("...pm_usage_cnt(%d).....\n", adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt); DBG_88E("...pm_usage_cnt(%d).....\n", adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt);
pm_cnt = adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt; pm_cnt = adapter_to_dvobj(padapter)->pusbintf->pm_usage_cnt;
#endif #endif
DBG_871X("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume ); DBG_88E("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume );
if ( true == pwrpriv->bAutoResume ) { if ( true == pwrpriv->bAutoResume ) {
pwrpriv->bInternalAutoSuspend = false; pwrpriv->bInternalAutoSuspend = false;
pwrpriv->bAutoResume=false; pwrpriv->bAutoResume=false;
DBG_871X("pwrpriv->bAutoResume (%x) pwrpriv->bInternalAutoSuspend(%x)\n",pwrpriv->bAutoResume,pwrpriv->bInternalAutoSuspend ); DBG_88E("pwrpriv->bAutoResume (%x) pwrpriv->bInternalAutoSuspend(%x)\n",pwrpriv->bAutoResume,pwrpriv->bInternalAutoSuspend );
} }
#endif /* ifdef CONFIG_AUTOSUSPEND */ #endif /* ifdef CONFIG_AUTOSUSPEND */
@ -736,7 +736,7 @@ int rtw_resume_process(struct adapter *padapter)
if (rtw_resume_common(padapter)!= 0) { if (rtw_resume_common(padapter)!= 0) {
DBG_871X("%s rtw_resume_common failed\n",__FUNCTION__); DBG_88E("%s rtw_resume_common failed\n",__FUNCTION__);
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
goto exit; goto exit;
} }
@ -753,11 +753,11 @@ int rtw_resume_process(struct adapter *padapter)
} }
#endif #endif
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
DBG_871X("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume ); DBG_88E("pwrpriv->bAutoResume (%x)\n",pwrpriv->bAutoResume );
if ( true == pwrpriv->bAutoResume ) { if ( true == pwrpriv->bAutoResume ) {
pwrpriv->bInternalAutoSuspend = false; pwrpriv->bInternalAutoSuspend = false;
pwrpriv->bAutoResume=false; pwrpriv->bAutoResume=false;
DBG_871X("pwrpriv->bAutoResume (%x) pwrpriv->bInternalAutoSuspend(%x)\n",pwrpriv->bAutoResume,pwrpriv->bInternalAutoSuspend ); DBG_88E("pwrpriv->bAutoResume (%x) pwrpriv->bInternalAutoSuspend(%x)\n",pwrpriv->bAutoResume,pwrpriv->bInternalAutoSuspend );
} }
#else /* ifdef CONFIG_BT_COEXIST */ #else /* ifdef CONFIG_BT_COEXIST */
@ -769,14 +769,14 @@ int rtw_resume_process(struct adapter *padapter)
_exit_pwrlock(&pwrpriv->lock); _exit_pwrlock(&pwrpriv->lock);
if ( padapter->pid[1]!=0) { if ( padapter->pid[1]!=0) {
DBG_871X("pid[1]:%d\n",padapter->pid[1]); DBG_88E("pid[1]:%d\n",padapter->pid[1]);
rtw_signal_process(padapter->pid[1], SIGUSR2); rtw_signal_process(padapter->pid[1], SIGUSR2);
} }
ret = 0; ret = 0;
exit: exit:
pwrpriv->bInSuspend = false; pwrpriv->bInSuspend = false;
DBG_871X("<=== %s return %d.............. in %dms\n", __FUNCTION__ DBG_88E("<=== %s return %d.............. in %dms\n", __FUNCTION__
, ret, rtw_get_passing_time_ms(start_time)); , ret, rtw_get_passing_time_ms(start_time));
return ret; return ret;
@ -788,7 +788,7 @@ void autosuspend_enter(struct adapter* padapter)
struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter); struct pwrctrl_priv *pwrpriv = adapter_to_pwrctl(padapter);
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
DBG_871X("==>autosuspend_enter...........\n"); DBG_88E("==>autosuspend_enter...........\n");
pwrpriv->bInternalAutoSuspend = true; pwrpriv->bInternalAutoSuspend = true;
pwrpriv->bips_processing = true; pwrpriv->bips_processing = true;
@ -827,14 +827,14 @@ void autosuspend_enter(struct adapter* padapter)
pwrpriv->autopm_cnt --; pwrpriv->autopm_cnt --;
} }
else else
DBG_871X("0!=pwrpriv->autopm_cnt[%d] didn't usb_autopm_put_interface\n", pwrpriv->autopm_cnt); DBG_88E("0!=pwrpriv->autopm_cnt[%d] didn't usb_autopm_put_interface\n", pwrpriv->autopm_cnt);
#endif /* ifndef CONFIG_BT_COEXIST */ #endif /* ifndef CONFIG_BT_COEXIST */
} }
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
DBG_871X("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt))); DBG_88E("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt)));
#else #else
DBG_871X("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt); DBG_88E("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt);
#endif #endif
} }
@ -847,7 +847,7 @@ int autoresume_enter(struct adapter* padapter)
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info); struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
struct dvobj_priv *dvobj = adapter_to_dvobj(padapter); struct dvobj_priv *dvobj = adapter_to_dvobj(padapter);
DBG_871X("====> autoresume_enter\n"); DBG_88E("====> autoresume_enter\n");
if (rf_off == pwrpriv->rf_pwrstate ) if (rf_off == pwrpriv->rf_pwrstate )
{ {
@ -856,7 +856,7 @@ int autoresume_enter(struct adapter* padapter)
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
if (usb_autopm_get_interface(dvobj->pusbintf) < 0) if (usb_autopm_get_interface(dvobj->pusbintf) < 0)
{ {
DBG_871X( "can't get autopm: %d\n", result); DBG_88E( "can't get autopm: %d\n", result);
result = _FAIL; result = _FAIL;
goto error_exit; goto error_exit;
} }
@ -867,9 +867,9 @@ int autoresume_enter(struct adapter* padapter)
#endif #endif
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
DBG_871X("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt))); DBG_88E("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt)));
#else #else
DBG_871X("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt); DBG_88E("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt);
#endif #endif
#else /* ifndef CONFIG_BT_COEXIST */ #else /* ifndef CONFIG_BT_COEXIST */
pwrpriv->bAutoResume=true; pwrpriv->bAutoResume=true;
@ -877,7 +877,7 @@ int autoresume_enter(struct adapter* padapter)
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
if (usb_autopm_get_interface(dvobj->pusbintf) < 0) if (usb_autopm_get_interface(dvobj->pusbintf) < 0)
{ {
DBG_871X( "can't get autopm: %d\n", result); DBG_88E( "can't get autopm: %d\n", result);
result = _FAIL; result = _FAIL;
goto error_exit; goto error_exit;
} }
@ -887,17 +887,17 @@ int autoresume_enter(struct adapter* padapter)
usb_autoresume_device(dvobj->pusbdev, 1); usb_autoresume_device(dvobj->pusbdev, 1);
#endif #endif
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
DBG_871X("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt))); DBG_88E("...pm_usage_cnt(%d).....\n", atomic_read(&(dvobj->pusbintf->pm_usage_cnt)));
#else #else
DBG_871X("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt); DBG_88E("...pm_usage_cnt(%d).....\n", dvobj->pusbintf->pm_usage_cnt);
#endif #endif
pwrpriv->autopm_cnt++; pwrpriv->autopm_cnt++;
} }
else else
DBG_871X("0!=pwrpriv->autopm_cnt[%d] didn't usb_autopm_get_interface\n",pwrpriv->autopm_cnt); DBG_88E("0!=pwrpriv->autopm_cnt[%d] didn't usb_autopm_get_interface\n",pwrpriv->autopm_cnt);
#endif /* ifndef CONFIG_BT_COEXIST */ #endif /* ifndef CONFIG_BT_COEXIST */
} }
DBG_871X("<==== autoresume_enter\n"); DBG_88E("<==== autoresume_enter\n");
error_exit: error_exit:
return result; return result;
@ -981,8 +981,8 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
dvobj->pusbdev->do_remote_wakeup=1; dvobj->pusbdev->do_remote_wakeup=1;
pusb_intf->needs_remote_wakeup = 1; pusb_intf->needs_remote_wakeup = 1;
device_init_wakeup(&pusb_intf->dev, 1); device_init_wakeup(&pusb_intf->dev, 1);
DBG_871X("\n pwrctrlpriv.bSupportRemoteWakeup~~~~~~\n"); DBG_88E("\n pwrctrlpriv.bSupportRemoteWakeup~~~~~~\n");
DBG_871X("\n pwrctrlpriv.bSupportRemoteWakeup~~~[%d]~~~\n",device_may_wakeup(&pusb_intf->dev)); DBG_88E("\n pwrctrlpriv.bSupportRemoteWakeup~~~[%d]~~~\n",device_may_wakeup(&pusb_intf->dev));
} }
#endif #endif
#endif #endif
@ -1005,9 +1005,9 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
#endif #endif
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,32))
DBG_871X("%s...pm_usage_cnt(%d).....\n",__FUNCTION__,atomic_read(&(dvobj->pusbintf ->pm_usage_cnt))); DBG_88E("%s...pm_usage_cnt(%d).....\n",__FUNCTION__,atomic_read(&(dvobj->pusbintf ->pm_usage_cnt)));
#else #else
DBG_871X("%s...pm_usage_cnt(%d).....\n",__FUNCTION__,dvobj->pusbintf ->pm_usage_cnt); DBG_88E("%s...pm_usage_cnt(%d).....\n",__FUNCTION__,dvobj->pusbintf ->pm_usage_cnt);
#endif #endif
} }
} }
@ -1016,7 +1016,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33)) #if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,33))
if (usb_autopm_get_interface(pusb_intf) < 0) if (usb_autopm_get_interface(pusb_intf) < 0)
{ {
DBG_871X( "can't get autopm:\n"); DBG_88E( "can't get autopm:\n");
} }
#endif #endif
#ifdef CONFIG_BT_COEXIST #ifdef CONFIG_BT_COEXIST
@ -1028,7 +1028,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj,
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
rtw_init_wifidirect_addrs(padapter, padapter->eeprompriv.mac_addr, padapter->eeprompriv.mac_addr); rtw_init_wifidirect_addrs(padapter, padapter->eeprompriv.mac_addr, padapter->eeprompriv.mac_addr);
#endif #endif
DBG_871X("bDriverStopped:%d, bSurpriseRemoved:%d, bup:%d, hw_init_completed:%d\n" DBG_88E("bDriverStopped:%d, bSurpriseRemoved:%d, bup:%d, hw_init_completed:%d\n"
, padapter->bDriverStopped , padapter->bDriverStopped
, padapter->bSurpriseRemoved , padapter->bSurpriseRemoved
, padapter->bup , padapter->bup
@ -1080,7 +1080,7 @@ static void rtw_usb_if1_deinit(struct adapter *if1)
rtw_dev_unload(if1); rtw_dev_unload(if1);
DBG_871X("+r871xu_dev_remove, hw_init_completed=%d\n", if1->hw_init_completed); DBG_88E("+r871xu_dev_remove, hw_init_completed=%d\n", if1->hw_init_completed);
rtw_handle_dualmac(if1, 0); rtw_handle_dualmac(if1, 0);
@ -1124,47 +1124,47 @@ static void dump_usb_interface(struct usb_interface *usb_intf)
struct usb_host_endpoint *host_endp; struct usb_host_endpoint *host_endp;
struct usb_endpoint_descriptor *endp_desc; struct usb_endpoint_descriptor *endp_desc;
DBG_871X("usb_interface:%p, usb_device:%p(num:%d, path:%s), usb_device_descriptor:%p\n", usb_intf, udev, udev->devnum, udev->devpath, dev_desc); DBG_88E("usb_interface:%p, usb_device:%p(num:%d, path:%s), usb_device_descriptor:%p\n", usb_intf, udev, udev->devnum, udev->devpath, dev_desc);
DBG_871X("bLength:%u\n", dev_desc->bLength); DBG_88E("bLength:%u\n", dev_desc->bLength);
DBG_871X("bDescriptorType:0x%02x\n", dev_desc->bDescriptorType); DBG_88E("bDescriptorType:0x%02x\n", dev_desc->bDescriptorType);
DBG_871X("bcdUSB:0x%04x\n", le16_to_cpu(dev_desc->bcdUSB)); DBG_88E("bcdUSB:0x%04x\n", le16_to_cpu(dev_desc->bcdUSB));
DBG_871X("bDeviceClass:0x%02x\n", dev_desc->bDeviceClass); DBG_88E("bDeviceClass:0x%02x\n", dev_desc->bDeviceClass);
DBG_871X("bDeviceSubClass:0x%02x\n", dev_desc->bDeviceSubClass); DBG_88E("bDeviceSubClass:0x%02x\n", dev_desc->bDeviceSubClass);
DBG_871X("bDeviceProtocol:0x%02x\n", dev_desc->bDeviceProtocol); DBG_88E("bDeviceProtocol:0x%02x\n", dev_desc->bDeviceProtocol);
DBG_871X("bMaxPacketSize0:%u\n", dev_desc->bMaxPacketSize0); DBG_88E("bMaxPacketSize0:%u\n", dev_desc->bMaxPacketSize0);
DBG_871X("idVendor:0x%04x\n", le16_to_cpu(dev_desc->idVendor)); DBG_88E("idVendor:0x%04x\n", le16_to_cpu(dev_desc->idVendor));
DBG_871X("idProduct:0x%04x\n", le16_to_cpu(dev_desc->idProduct)); DBG_88E("idProduct:0x%04x\n", le16_to_cpu(dev_desc->idProduct));
DBG_871X("bcdDevice:0x%04x\n", le16_to_cpu(dev_desc->bcdDevice)); DBG_88E("bcdDevice:0x%04x\n", le16_to_cpu(dev_desc->bcdDevice));
DBG_871X("iManufacturer:0x02%x\n", dev_desc->iManufacturer); DBG_88E("iManufacturer:0x02%x\n", dev_desc->iManufacturer);
DBG_871X("iProduct:0x%02x\n", dev_desc->iProduct); DBG_88E("iProduct:0x%02x\n", dev_desc->iProduct);
DBG_871X("iSerialNumber:0x%02x\n", dev_desc->iSerialNumber); DBG_88E("iSerialNumber:0x%02x\n", dev_desc->iSerialNumber);
DBG_871X("bNumConfigurations:%u\n", dev_desc->bNumConfigurations); DBG_88E("bNumConfigurations:%u\n", dev_desc->bNumConfigurations);
DBG_871X("\nact_conf_desc:%p\n", act_conf_desc); DBG_88E("\nact_conf_desc:%p\n", act_conf_desc);
DBG_871X("bLength:%u\n", act_conf_desc->bLength); DBG_88E("bLength:%u\n", act_conf_desc->bLength);
DBG_871X("bDescriptorType:0x%02x\n", act_conf_desc->bDescriptorType); DBG_88E("bDescriptorType:0x%02x\n", act_conf_desc->bDescriptorType);
DBG_871X("wTotalLength:%u\n", le16_to_cpu(act_conf_desc->wTotalLength)); DBG_88E("wTotalLength:%u\n", le16_to_cpu(act_conf_desc->wTotalLength));
DBG_871X("bNumInterfaces:%u\n", act_conf_desc->bNumInterfaces); DBG_88E("bNumInterfaces:%u\n", act_conf_desc->bNumInterfaces);
DBG_871X("bConfigurationValue:0x%02x\n", act_conf_desc->bConfigurationValue); DBG_88E("bConfigurationValue:0x%02x\n", act_conf_desc->bConfigurationValue);
DBG_871X("iConfiguration:0x%02x\n", act_conf_desc->iConfiguration); DBG_88E("iConfiguration:0x%02x\n", act_conf_desc->iConfiguration);
DBG_871X("bmAttributes:0x%02x\n", act_conf_desc->bmAttributes); DBG_88E("bmAttributes:0x%02x\n", act_conf_desc->bmAttributes);
DBG_871X("bMaxPower=%u\n", act_conf_desc->bMaxPower); DBG_88E("bMaxPower=%u\n", act_conf_desc->bMaxPower);
DBG_871X("****** num of altsetting = (%d) ******/\n", usb_intf->num_altsetting); DBG_88E("****** num of altsetting = (%d) ******/\n", usb_intf->num_altsetting);
/* Get he host side alternate setting (the current alternate setting) for this interface*/ /* Get he host side alternate setting (the current alternate setting) for this interface*/
host_iface = usb_intf->cur_altsetting; host_iface = usb_intf->cur_altsetting;
iface_desc = &host_iface->desc; iface_desc = &host_iface->desc;
DBG_871X("\nusb_interface_descriptor:%p:\n", iface_desc); DBG_88E("\nusb_interface_descriptor:%p:\n", iface_desc);
DBG_871X("bLength:%u\n", iface_desc->bLength); DBG_88E("bLength:%u\n", iface_desc->bLength);
DBG_871X("bDescriptorType:0x%02x\n", iface_desc->bDescriptorType); DBG_88E("bDescriptorType:0x%02x\n", iface_desc->bDescriptorType);
DBG_871X("bInterfaceNumber:0x%02x\n", iface_desc->bInterfaceNumber); DBG_88E("bInterfaceNumber:0x%02x\n", iface_desc->bInterfaceNumber);
DBG_871X("bAlternateSetting=%x\n", iface_desc->bAlternateSetting); DBG_88E("bAlternateSetting=%x\n", iface_desc->bAlternateSetting);
DBG_871X("bNumEndpoints=%x\n", iface_desc->bNumEndpoints); DBG_88E("bNumEndpoints=%x\n", iface_desc->bNumEndpoints);
DBG_871X("bInterfaceClass=%x\n", iface_desc->bInterfaceClass); DBG_88E("bInterfaceClass=%x\n", iface_desc->bInterfaceClass);
DBG_871X("bInterfaceSubClass=%x\n", iface_desc->bInterfaceSubClass); DBG_88E("bInterfaceSubClass=%x\n", iface_desc->bInterfaceSubClass);
DBG_871X("bInterfaceProtocol=%x\n", iface_desc->bInterfaceProtocol); DBG_88E("bInterfaceProtocol=%x\n", iface_desc->bInterfaceProtocol);
DBG_871X("iInterface=%x\n", iface_desc->iInterface); DBG_88E("iInterface=%x\n", iface_desc->iInterface);
for (i = 0; i < iface_desc->bNumEndpoints; i++) for (i = 0; i < iface_desc->bNumEndpoints; i++)
{ {
@ -1173,34 +1173,34 @@ static void dump_usb_interface(struct usb_interface *usb_intf)
{ {
endp_desc = &host_endp->desc; endp_desc = &host_endp->desc;
DBG_871X("\nusb_endpoint_descriptor(%d):\n", i); DBG_88E("\nusb_endpoint_descriptor(%d):\n", i);
DBG_871X("bLength=%x\n",endp_desc->bLength); DBG_88E("bLength=%x\n",endp_desc->bLength);
DBG_871X("bDescriptorType=%x\n",endp_desc->bDescriptorType); DBG_88E("bDescriptorType=%x\n",endp_desc->bDescriptorType);
DBG_871X("bEndpointAddress=%x\n",endp_desc->bEndpointAddress); DBG_88E("bEndpointAddress=%x\n",endp_desc->bEndpointAddress);
DBG_871X("bmAttributes=%x\n",endp_desc->bmAttributes); DBG_88E("bmAttributes=%x\n",endp_desc->bmAttributes);
DBG_871X("wMaxPacketSize=%x\n",endp_desc->wMaxPacketSize); DBG_88E("wMaxPacketSize=%x\n",endp_desc->wMaxPacketSize);
DBG_871X("wMaxPacketSize=%x\n",le16_to_cpu(endp_desc->wMaxPacketSize)); DBG_88E("wMaxPacketSize=%x\n",le16_to_cpu(endp_desc->wMaxPacketSize));
DBG_871X("bInterval=%x\n",endp_desc->bInterval); DBG_88E("bInterval=%x\n",endp_desc->bInterval);
if (RT_usb_endpoint_is_bulk_in(endp_desc)) if (RT_usb_endpoint_is_bulk_in(endp_desc))
{ {
DBG_871X("RT_usb_endpoint_is_bulk_in = %x\n", RT_usb_endpoint_num(endp_desc)); DBG_88E("RT_usb_endpoint_is_bulk_in = %x\n", RT_usb_endpoint_num(endp_desc));
} }
else if (RT_usb_endpoint_is_int_in(endp_desc)) else if (RT_usb_endpoint_is_int_in(endp_desc))
{ {
DBG_871X("RT_usb_endpoint_is_int_in = %x, Interval = %x\n", RT_usb_endpoint_num(endp_desc),endp_desc->bInterval); DBG_88E("RT_usb_endpoint_is_int_in = %x, Interval = %x\n", RT_usb_endpoint_num(endp_desc),endp_desc->bInterval);
} }
else if (RT_usb_endpoint_is_bulk_out(endp_desc)) else if (RT_usb_endpoint_is_bulk_out(endp_desc))
{ {
DBG_871X("RT_usb_endpoint_is_bulk_out = %x\n", RT_usb_endpoint_num(endp_desc)); DBG_88E("RT_usb_endpoint_is_bulk_out = %x\n", RT_usb_endpoint_num(endp_desc));
} }
} }
} }
if (udev->speed == USB_SPEED_HIGH) if (udev->speed == USB_SPEED_HIGH)
DBG_871X("USB_SPEED_HIGH\n"); DBG_88E("USB_SPEED_HIGH\n");
else else
DBG_871X("NON USB_SPEED_HIGH\n"); DBG_88E("NON USB_SPEED_HIGH\n");
} }
static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device_id *pdid) static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device_id *pdid)
@ -1226,7 +1226,7 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
#endif #endif
if ((if1 = rtw_usb_if1_init(dvobj, pusb_intf, pdid)) == NULL) { if ((if1 = rtw_usb_if1_init(dvobj, pusb_intf, pdid)) == NULL) {
DBG_871X("rtw_init_primary_adapter Failed!\n"); DBG_88E("rtw_init_primary_adapter Failed!\n");
goto free_dvobj; goto free_dvobj;
} }
@ -1235,7 +1235,7 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device
#endif #endif
if (ui_pid[1]!=0) { if (ui_pid[1]!=0) {
DBG_871X("ui_pid[1]:%d\n",ui_pid[1]); DBG_88E("ui_pid[1]:%d\n",ui_pid[1]);
rtw_signal_process(ui_pid[1], SIGUSR2); rtw_signal_process(ui_pid[1], SIGUSR2);
} }
@ -1276,14 +1276,14 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)
; ;
DBG_871X("+rtw_dev_remove\n"); DBG_88E("+rtw_dev_remove\n");
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+dev_remove()\n")); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+dev_remove()\n"));
dvobj->processing_dev_remove = true; dvobj->processing_dev_remove = true;
rtw_unregister_netdevs(dvobj); rtw_unregister_netdevs(dvobj);
if (usb_drv->drv_registered == true) if (usb_drv->drv_registered == true)
{ {
/* DBG_871X("r871xu_dev_remove():padapter->bSurpriseRemoved == true\n"); */ /* DBG_88E("r871xu_dev_remove():padapter->bSurpriseRemoved == true\n"); */
padapter->bSurpriseRemoved = true; padapter->bSurpriseRemoved = true;
} }
#if defined(CONFIG_HAS_EARLYSUSPEND) || defined(CONFIG_ANDROID_POWER) #if defined(CONFIG_HAS_EARLYSUSPEND) || defined(CONFIG_ANDROID_POWER)
@ -1300,7 +1300,7 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)
usb_dvobj_deinit(pusb_intf); usb_dvobj_deinit(pusb_intf);
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-dev_remove()\n")); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-dev_remove()\n"));
DBG_871X("-r871xu_dev_remove, done\n"); DBG_88E("-r871xu_dev_remove, done\n");
#ifdef CONFIG_INTEL_PROXIM #ifdef CONFIG_INTEL_PROXIM
@ -1320,8 +1320,8 @@ static int __init rtw_drv_entry(void)
{ {
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_entry\n")); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_entry\n"));
DBG_871X(DRV_NAME " driver version=%s\n", DRIVERVERSION); DBG_88E(DRV_NAME " driver version=%s\n", DRIVERVERSION);
DBG_871X("build time: %s %s\n", __DATE__, __TIME__); DBG_88E("build time: %s %s\n", __DATE__, __TIME__);
rtw_suspend_lock_init(); rtw_suspend_lock_init();
@ -1332,13 +1332,13 @@ static int __init rtw_drv_entry(void)
static void __exit rtw_drv_halt(void) static void __exit rtw_drv_halt(void)
{ {
RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_halt\n")); RT_TRACE(_module_hci_intfs_c_,_drv_err_,("+rtw_drv_halt\n"));
DBG_871X("+rtw_drv_halt\n"); DBG_88E("+rtw_drv_halt\n");
usb_drv->drv_registered = false; usb_drv->drv_registered = false;
usb_deregister(&usb_drv->usbdrv); usb_deregister(&usb_drv->usbdrv);
rtw_suspend_lock_uninit(); rtw_suspend_lock_uninit();
DBG_871X("-rtw_drv_halt\n"); DBG_88E("-rtw_drv_halt\n");
rtw_mstat_dump(); rtw_mstat_dump();
} }

16
os_dep/usb_ops_linux.c
View file

@ -220,7 +220,7 @@ static u32 usb_bulkout_zero(struct intf_hdl *pintfhdl, u32 addr)
struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter); struct dvobj_priv *pdvobj = adapter_to_dvobj(padapter);
struct usb_device *pusbd = pdvobj->pusbdev; struct usb_device *pusbd = pdvobj->pusbdev;
/* DBG_871X("%s\n", __func__); */ /* DBG_88E("%s\n", __func__); */
if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(dvobj_to_pwrctl(pdvobj)->pnp_bstop_trx)) if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(dvobj_to_pwrctl(pdvobj)->pnp_bstop_trx))
@ -284,7 +284,7 @@ void usb_read_port_cancel(struct intf_hdl *pintfhdl)
struct adapter *padapter = pintfhdl->padapter; struct adapter *padapter = pintfhdl->padapter;
precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf; precvbuf = (struct recv_buf *)padapter->recvpriv.precv_buf;
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
padapter->bReadPortCancel = true; padapter->bReadPortCancel = true;
@ -354,7 +354,7 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
} else { } else {
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete : purb->status(%d) != 0\n", purb->status)); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port_complete : purb->status(%d) != 0\n", purb->status));
DBG_871X("###=> urb_write_port_complete status(%d)\n",purb->status); DBG_88E("###=> urb_write_port_complete status(%d)\n",purb->status);
if ((purb->status==-EPIPE)||(purb->status==-EPROTO)) if ((purb->status==-EPIPE)||(purb->status==-EPROTO))
{ {
/* usb_clear_halt(pusbdev, purb->pipe); */ /* usb_clear_halt(pusbdev, purb->pipe); */
@ -365,11 +365,11 @@ static void usb_write_port_complete(struct urb *purb, struct pt_regs *regs)
goto check_completion; goto check_completion;
} else if (purb->status == -ENOENT) { } else if (purb->status == -ENOENT) {
DBG_871X("%s: -ENOENT\n", __func__); DBG_88E("%s: -ENOENT\n", __func__);
goto check_completion; goto check_completion;
} else if (purb->status == -ECONNRESET) { } else if (purb->status == -ECONNRESET) {
DBG_871X("%s: -ECONNRESET\n", __func__); DBG_88E("%s: -ECONNRESET\n", __func__);
goto check_completion; goto check_completion;
} else if (purb->status == -ESHUTDOWN) { } else if (purb->status == -ESHUTDOWN) {
@ -430,7 +430,7 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(dvobj_to_pwrctl(pdvobj)->pnp_bstop_trx)) { if ((padapter->bDriverStopped) || (padapter->bSurpriseRemoved) ||(dvobj_to_pwrctl(pdvobj)->pnp_bstop_trx)) {
#ifdef DBG_TX #ifdef DBG_TX
DBG_871X(" DBG_TX %s:%d bDriverStopped%d, bSurpriseRemoved:%d, pnp_bstop_trx:%d\n",__FUNCTION__, __LINE__ DBG_88E(" DBG_TX %s:%d bDriverStopped%d, bSurpriseRemoved:%d, pnp_bstop_trx:%d\n",__FUNCTION__, __LINE__
,padapter->bDriverStopped, padapter->bSurpriseRemoved, dvobj_to_pwrctl(pdvobj)->pnp_bstop_trx ); ,padapter->bDriverStopped, padapter->bSurpriseRemoved, dvobj_to_pwrctl(pdvobj)->pnp_bstop_trx );
#endif #endif
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port:( padapter->bDriverStopped ||padapter->bSurpriseRemoved ||pwrctl->pnp_bstop_trx)!!!\n")); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port:( padapter->bDriverStopped ||padapter->bSurpriseRemoved ||pwrctl->pnp_bstop_trx)!!!\n"));
@ -535,7 +535,7 @@ u32 usb_write_port(struct intf_hdl *pintfhdl, u32 addr, u32 cnt, u8 *wmem)
pHalData->srestpriv.last_tx_time = jiffies; pHalData->srestpriv.last_tx_time = jiffies;
} else { } else {
rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_WRITE_PORT_ERR); rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_WRITE_PORT_ERR);
DBG_871X("usb_write_port, status=%d\n", status); DBG_88E("usb_write_port, status=%d\n", status);
RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port(): usb_submit_urb, status=%x\n", status)); RT_TRACE(_module_hci_ops_os_c_,_drv_err_,("usb_write_port(): usb_submit_urb, status=%x\n", status));
switch (status) { switch (status) {
@ -575,7 +575,7 @@ void usb_write_port_cancel(struct intf_hdl *pintfhdl)
struct adapter *padapter = pintfhdl->padapter; struct adapter *padapter = pintfhdl->padapter;
struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf; struct xmit_buf *pxmitbuf = (struct xmit_buf *)padapter->xmitpriv.pxmitbuf;
DBG_871X("%s\n", __func__); DBG_88E("%s\n", __func__);
padapter->bWritePortCancel = true; padapter->bWritePortCancel = true;

12
os_dep/xmit_linux.c
View file

@ -90,7 +90,7 @@ int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitb
for (i=0; i<8; i++) { for (i=0; i<8; i++) {
pxmitbuf->pxmit_urb[i] = usb_alloc_urb(0, GFP_KERNEL); pxmitbuf->pxmit_urb[i] = usb_alloc_urb(0, GFP_KERNEL);
if (pxmitbuf->pxmit_urb[i] == NULL) { if (pxmitbuf->pxmit_urb[i] == NULL) {
DBG_871X("pxmitbuf->pxmit_urb[i]== NULL"); DBG_88E("pxmitbuf->pxmit_urb[i]== NULL");
return _FAIL; return _FAIL;
} }
@ -183,7 +183,7 @@ static void rtw_check_xmit_resource(struct adapter *padapter, struct sk_buff *pk
if (padapter->registrypriv.wifi_spec) { if (padapter->registrypriv.wifi_spec) {
/* No free space for Tx, tx_worker is too slow */ /* No free space for Tx, tx_worker is too slow */
if (pxmitpriv->hwxmits[queue].accnt > WMM_XMIT_THRESHOLD) { if (pxmitpriv->hwxmits[queue].accnt > WMM_XMIT_THRESHOLD) {
/* DBG_871X("%s(): stop netif_subqueue[%d]\n", __FUNCTION__, queue); */ /* DBG_88E("%s(): stop netif_subqueue[%d]\n", __FUNCTION__, queue); */
netif_stop_subqueue(padapter->pnetdev, queue); netif_stop_subqueue(padapter->pnetdev, queue);
} }
} else { } else {
@ -251,13 +251,13 @@ static int rtw_mlcst2unicst(struct adapter *padapter, struct sk_buff *skb)
memcpy(newskb->data, psta->hwaddr, 6); memcpy(newskb->data, psta->hwaddr, 6);
res = rtw_xmit(padapter, &newskb); res = rtw_xmit(padapter, &newskb);
if (res < 0) { if (res < 0) {
DBG_871X("%s()-%d: rtw_xmit() return error!\n", __FUNCTION__, __LINE__); DBG_88E("%s()-%d: rtw_xmit() return error!\n", __FUNCTION__, __LINE__);
pxmitpriv->tx_drop++; pxmitpriv->tx_drop++;
rtw_skb_free(newskb); rtw_skb_free(newskb);
} else } else
pxmitpriv->tx_pkts++; pxmitpriv->tx_pkts++;
} else { } else {
DBG_871X("%s-%d: rtw_skb_copy() failed!\n", __FUNCTION__, __LINE__); DBG_88E("%s-%d: rtw_skb_copy() failed!\n", __FUNCTION__, __LINE__);
pxmitpriv->tx_drop++; pxmitpriv->tx_drop++;
/* rtw_skb_free(skb); */ /* rtw_skb_free(skb); */
return false; /* Caller shall tx this multicast frame via normal way. */ return false; /* Caller shall tx this multicast frame via normal way. */
@ -285,7 +285,7 @@ int _rtw_xmit_entry(struct sk_buff *pkt, struct net_device * pnetdev)
if (rtw_if_up(padapter) == false) { if (rtw_if_up(padapter) == false) {
RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit_entry: rtw_if_up fail\n")); RT_TRACE(_module_xmit_osdep_c_, _drv_err_, ("rtw_xmit_entry: rtw_if_up fail\n"));
#ifdef DBG_TX_DROP_FRAME #ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s if_up fail\n", __FUNCTION__); DBG_88E("DBG_TX_DROP_FRAME %s if_up fail\n", __FUNCTION__);
#endif #endif
goto drop_packet; goto drop_packet;
} }
@ -310,7 +310,7 @@ int _rtw_xmit_entry(struct sk_buff *pkt, struct net_device * pnetdev)
res = rtw_xmit(padapter, &pkt); res = rtw_xmit(padapter, &pkt);
if (res < 0) { if (res < 0) {
#ifdef DBG_TX_DROP_FRAME #ifdef DBG_TX_DROP_FRAME
DBG_871X("DBG_TX_DROP_FRAME %s rtw_xmit fail\n", __FUNCTION__); DBG_88E("DBG_TX_DROP_FRAME %s rtw_xmit fail\n", __FUNCTION__);
#endif #endif
goto drop_packet; goto drop_packet;
} }