Skip to content

Commit

Permalink
rtl8192du: Remove DBG_RX_DROP_FRAME
Browse files Browse the repository at this point in the history
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
  • Loading branch information
lwfinger committed Aug 9, 2014
1 parent 48c2f9c commit 69d04e1
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 113 deletions.
6 changes: 0 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
EXTRA_CFLAGS += $(USER_EXTRA_CFLAGS)
EXTRA_CFLAGS += -O1
#EXTRA_CFLAGS += -O3
#EXTRA_CFLAGS += -Wall
#EXTRA_CFLAGS += -Wextra
#EXTRA_CFLAGS += -Werror
#EXTRA_CFLAGS += -pedantic
#EXTRA_CFLAGS += -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes

EXTRA_CFLAGS += -Wno-unused-variable
EXTRA_CFLAGS += -Wno-unused-value
Expand Down
109 changes: 2 additions & 107 deletions core/rtw_recv.c
Original file line number Diff line number Diff line change
Expand Up @@ -977,15 +977,6 @@ static int ap2sta_data_frame(struct rtw_adapter *adapter,
if (_rtw_memcmp(myhwaddr, pattrib->src, ETH_ALEN)) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
(" SA==myself\n"));
#ifdef DBG_RX_DROP_FRAME
DBG_8192D
("DBG_RX_DROP_FRAME %s SA=%x:%x:%x:%x:%x:%x, myhwaddr= %x:%x:%x:%x:%x:%x\n",
__func__, pattrib->src[0], pattrib->src[1],
pattrib->src[2], pattrib->src[3], pattrib->src[4],
pattrib->src[5], *(myhwaddr), *(myhwaddr + 1),
*(myhwaddr + 2), *(myhwaddr + 3), *(myhwaddr + 4),
*(myhwaddr + 5));
#endif
ret = _FAIL;
goto exit;
}
Expand All @@ -995,10 +986,6 @@ static int ap2sta_data_frame(struct rtw_adapter *adapter,
RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,
(" ap2sta_data_frame: compare DA fail; DA=%pM\n",
pattrib->dst));
#ifdef DBG_RX_DROP_FRAME
DBG_8192D("DBG_RX_DROP_FRAME %s DA=%pM\n", __func__,
pattrib->dst);
#endif
ret = _FAIL;
goto exit;
}
Expand All @@ -1012,15 +999,6 @@ static int ap2sta_data_frame(struct rtw_adapter *adapter,
pattrib->bssid));
RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,
("mybssid=%pM\n", mybssid));
#ifdef DBG_RX_DROP_FRAME
DBG_8192D
("DBG_RX_DROP_FRAME %s BSSID=%pM, mybssid=%pM\n",
__func__, pattrib->bssid, mybssid);
DBG_8192D("this adapter = %d, buddy adapter = %d\n",
adapter->adapter_type,
adapter->pbuddy_adapter->adapter_type);
#endif

if (!bmcast) {
DBG_8192D
("issue_deauth to the nonassociated ap=%pM for the reason(7)\n",
Expand All @@ -1041,11 +1019,6 @@ static int ap2sta_data_frame(struct rtw_adapter *adapter,
if (*psta == NULL) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
("ap2sta: can't get psta under STATION_MODE ; drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME
DBG_8192D
("DBG_RX_DROP_FRAME %s can't get psta under STATION_MODE ; drop pkt\n",
__func__);
#endif
ret = _FAIL;
goto exit;
}
Expand All @@ -1072,11 +1045,6 @@ static int ap2sta_data_frame(struct rtw_adapter *adapter,
if (*psta == NULL) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
("can't get psta under MP_MODE ; drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME
DBG_8192D
("DBG_RX_DROP_FRAME %s can't get psta under WIFI_MP_STATE ; drop pkt\n",
__func__);
#endif
ret = _FAIL;
goto exit;
}
Expand All @@ -1099,10 +1067,6 @@ static int ap2sta_data_frame(struct rtw_adapter *adapter,
}

ret = _FAIL;
#ifdef DBG_RX_DROP_FRAME
DBG_8192D("DBG_RX_DROP_FRAME %s fw_state:0x%x\n", __func__,
get_fwstate(pmlmepriv));
#endif
}

exit:
Expand Down Expand Up @@ -1407,10 +1371,6 @@ static int validate_recv_data_frame(struct rtw_adapter *adapter,
}

if (ret == _FAIL) {
#ifdef DBG_RX_DROP_FRAME
DBG_8192D("DBG_RX_DROP_FRAME %s case:%d, res:%d\n", __func__,
pattrib->to_fr_ds, ret);
#endif
goto exit;
} else if (ret == RTW_RX_HANDLED) {
goto exit;
Expand Down Expand Up @@ -1567,11 +1527,6 @@ static int validate_recv_frame(struct rtw_adapter *adapter,
default:
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
("validate_recv_data_frame fail! type=0x%x\n", type));
#ifdef DBG_RX_DROP_FRAME
DBG_8192D
("DBG_RX_DROP_FRAME validate_recv_data_frame fail! type=0x%x\n",
type);
#endif
retval = _FAIL;
break;
}
Expand Down Expand Up @@ -2009,14 +1964,8 @@ static int check_indicate_seq(struct recv_reorder_ctrl *preorder_ctrl, u16 seq_n
}

/* Drop out the packet which SeqNum is smaller than WinStart */
if (SN_LESS(seq_num, preorder_ctrl->indicate_seq)) {
#ifdef DBG_RX_DROP_FRAME
DBG_8192D("%s IndicateSeq: %d > NewSeq: %d\n", __func__,
preorder_ctrl->indicate_seq, seq_num);
#endif

if (SN_LESS(seq_num, preorder_ctrl->indicate_seq))
return false;
}

/* */
/* Sliding window manipulation. Conditions includes: */
Expand Down Expand Up @@ -2327,12 +2276,6 @@ static int process_recv_indicatepkts(struct rtw_adapter *padapter,
if (phtpriv->ht_option == true) /* B/G/N Mode */
{
if (recv_indicatepkt_reorder(padapter, prframe) != _SUCCESS) { /* including perform A-MPDU Rx Ordering Buffer Control */
#ifdef DBG_RX_DROP_FRAME
DBG_8192D
("DBG_RX_DROP_FRAME %s recv_indicatepkt_reorder error!\n",
__func__);
#endif

if ((padapter->bDriverStopped == false) &&
(padapter->bSurpriseRemoved == false)) {
retval = _FAIL;
Expand All @@ -2346,11 +2289,6 @@ static int process_recv_indicatepkts(struct rtw_adapter *padapter,
if (retval != _SUCCESS) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
("wlanhdr_to_ethhdr: drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME
DBG_8192D
("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr error!\n",
__func__);
#endif
return retval;
}

Expand Down Expand Up @@ -2412,33 +2350,20 @@ static int recv_func_posthandle(struct rtw_adapter *padapter,
if (prframe == NULL) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
("decryptor: drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME
DBG_8192D("DBG_RX_DROP_FRAME %s decryptor: drop pkt\n",
__func__);
#endif
ret = _FAIL;
goto _recv_data_drop;
}
prframe = recvframe_chk_defrag(padapter, prframe);
if (prframe == NULL) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
("recvframe_chk_defrag: drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME
DBG_8192D
("DBG_RX_DROP_FRAME %s recvframe_chk_defrag: drop pkt\n",
__func__);
#endif
goto _recv_data_drop;
}

prframe = portctrl(padapter, prframe);
if (prframe == NULL) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
("portctrl: drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME
DBG_8192D("DBG_RX_DROP_FRAME %s portctrl: drop pkt\n",
__func__);
#endif
ret = _FAIL;
goto _recv_data_drop;
}
Expand All @@ -2450,11 +2375,6 @@ static int recv_func_posthandle(struct rtw_adapter *padapter,
if (ret != _SUCCESS) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
("recv_func: process_recv_indicatepkts fail!\n"));
#ifdef DBG_RX_DROP_FRAME
DBG_8192D
("DBG_RX_DROP_FRAME %s recv_func: process_recv_indicatepkts fail!\n",
__func__);
#endif
rtw_free_recvframe(orig_prframe, pfree_recv_queue); /* free this recv_frame */
goto _recv_data_drop;
}
Expand All @@ -2465,11 +2385,6 @@ static int recv_func_posthandle(struct rtw_adapter *padapter,
if (ret != _SUCCESS) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_err_,
("wlanhdr_to_ethhdr: drop pkt\n"));
#ifdef DBG_RX_DROP_FRAME
DBG_8192D
("DBG_RX_DROP_FRAME %s wlanhdr_to_ethhdr: drop pkt\n",
__func__);
#endif
rtw_free_recvframe(orig_prframe, pfree_recv_queue); /* free this recv_frame */
goto _recv_data_drop;
}
Expand All @@ -2480,46 +2395,26 @@ static int recv_func_posthandle(struct rtw_adapter *padapter,
("@@@@ recv_func: recv_func rtw_recv_indicatepkt\n"));
/* indicate this recv_frame */
ret = rtw_recv_indicatepkt(padapter, prframe);
if (ret != _SUCCESS) {
#ifdef DBG_RX_DROP_FRAME
DBG_8192D
("DBG_RX_DROP_FRAME %s rtw_recv_indicatepkt fail!\n",
__func__);
#endif
if (ret != _SUCCESS)
goto _recv_data_drop;
}
} else {
RT_TRACE(_module_rtl871x_recv_c_, _drv_alert_,
("@@@@ recv_func: rtw_free_recvframe\n"));
RT_TRACE(_module_rtl871x_recv_c_, _drv_debug_,
("recv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)",
padapter->bDriverStopped,
padapter->bSurpriseRemoved));
#ifdef DBG_RX_DROP_FRAME
DBG_8192D
("DBG_RX_DROP_FRAME %s ecv_func:bDriverStopped(%d) OR bSurpriseRemoved(%d)\n",
__func__, padapter->bDriverStopped,
padapter->bSurpriseRemoved);
#endif
ret = _FAIL;
rtw_free_recvframe(orig_prframe, pfree_recv_queue); /* free this recv_frame */
}

} else if (pattrib->amsdu == 1) {
ret = amsdu_to_msdu(padapter, prframe);
if (ret != _SUCCESS) {
#ifdef DBG_RX_DROP_FRAME
DBG_8192D("DBG_RX_DROP_FRAME %s amsdu_to_msdu fail\n",
__func__);
#endif
rtw_free_recvframe(orig_prframe, pfree_recv_queue);
goto _recv_data_drop;
}
} else {
#ifdef DBG_RX_DROP_FRAME
DBG_8192D("DBG_RX_DROP_FRAME %s what is this condition??\n",
__func__);
#endif
goto _recv_data_drop;
}
#endif /* CONFIG_80211N_HT */
Expand Down

0 comments on commit 69d04e1

Please sign in to comment.