mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2025-05-07 14:03:05 +00:00
rtl8188eu: Remove tests on macro CONFIG_80211N_HT
This one is always selected. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
e9184bd34c
commit
e3e242b712
28 changed files with 46 additions and 428 deletions
|
@ -3086,9 +3086,6 @@ int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe)
|
|||
#ifdef CONFIG_TDLS
|
||||
struct sta_info *psta = prframe->u.hdr.psta;
|
||||
#endif /* CONFIG_TDLS */
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
|
||||
struct ht_priv *phtpriv = &pmlmepriv->htpriv;
|
||||
|
||||
DBG_COUNTER(padapter->rx_logs.core_rx_post_indicate);
|
||||
|
@ -3115,7 +3112,6 @@ int process_recv_indicatepkts(_adapter *padapter, union recv_frame *prframe)
|
|||
}
|
||||
}
|
||||
} else /* B/G mode */
|
||||
#endif
|
||||
{
|
||||
retval = wlanhdr_to_ethhdr(prframe);
|
||||
if (retval != _SUCCESS) {
|
||||
|
@ -3802,7 +3798,6 @@ static int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
|
|||
rtw_wapi_update_info(padapter, prframe);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_80211N_HT
|
||||
ret = process_recv_indicatepkts(padapter, prframe);
|
||||
if (ret != _SUCCESS) {
|
||||
#ifdef DBG_RX_DROP_FRAME
|
||||
|
@ -3812,54 +3807,6 @@ static int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
|
|||
DBG_COUNTER(padapter->rx_logs.core_rx_post_indicate_err);
|
||||
goto _recv_data_drop;
|
||||
}
|
||||
#else /* CONFIG_80211N_HT */
|
||||
if (!pattrib->amsdu) {
|
||||
ret = wlanhdr_to_ethhdr(prframe);
|
||||
if (ret != _SUCCESS) {
|
||||
#ifdef DBG_RX_DROP_FRAME
|
||||
RTW_INFO("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;
|
||||
}
|
||||
|
||||
if (!RTW_CANNOT_RUN(padapter)) {
|
||||
/* indicate this recv_frame */
|
||||
ret = rtw_recv_indicatepkt(padapter, prframe);
|
||||
if (ret != _SUCCESS) {
|
||||
#ifdef DBG_RX_DROP_FRAME
|
||||
RTW_INFO("DBG_RX_DROP_FRAME %s rtw_recv_indicatepkt fail!\n", __func__);
|
||||
#endif
|
||||
goto _recv_data_drop;
|
||||
}
|
||||
} else {
|
||||
|
||||
#ifdef DBG_RX_DROP_FRAME
|
||||
RTW_INFO("DBG_RX_DROP_FRAME %s recv_func:bDriverStopped(%s) OR bSurpriseRemoved(%s)\n", __func__
|
||||
, rtw_is_drv_stopped(padapter) ? "True" : "False"
|
||||
, rtw_is_surprise_removed(padapter) ? "True" : "False");
|
||||
#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
|
||||
RTW_INFO("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
|
||||
RTW_INFO("DBG_RX_DROP_FRAME %s what is this condition??\n", __func__);
|
||||
#endif
|
||||
goto _recv_data_drop;
|
||||
}
|
||||
#endif /* CONFIG_80211N_HT */
|
||||
|
||||
_exit_recv_func:
|
||||
return ret;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue