rtl8188eu: Remove code for platforms other than Linux in core/

Code in #if 0 .. #endif blocks is alsop removed as well as multiple blank lines.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2018-10-20 14:03:14 -05:00
parent 9fad4d2d0d
commit 85ec7cf9ce
12 changed files with 10 additions and 2547 deletions

View file

@ -22,13 +22,6 @@
#include <drv_types.h>
#include <hal_data.h>
#if defined(PLATFORM_LINUX) && defined (PLATFORM_WINDOWS)
#error "Shall be Linux or Windows, but not both!\n"
#endif
#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS
#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
void rtw_signal_stat_timer_hdl(RTW_TIMER_HDL_ARGS);
@ -657,22 +650,10 @@ union recv_frame *decryptor(_adapter *padapter, union recv_frame *precv_frame)
default:
break;
}
} else if (prxattrib->bdecrypted == 1
&& prxattrib->encrypt > 0
&& (psecuritypriv->busetkipkey == 1 || prxattrib->encrypt != _TKIP_)
) {
#if 0
if ((prxstat->icv == 1) && (prxattrib->encrypt != _AES_)) {
psecuritypriv->hw_decrypted = _FALSE;
rtw_free_recvframe(precv_frame, &padapter->recvpriv.free_recv_queue);
return_packet = NULL;
} else
#endif
{
} else if (prxattrib->bdecrypted == 1 &&
prxattrib->encrypt > 0 &&
(psecuritypriv->busetkipkey == 1 ||
prxattrib->encrypt != _TKIP_)) {
DBG_COUNTER(padapter->rx_logs.core_rx_post_decrypt_hw);
psecuritypriv->hw_decrypted = _TRUE;
@ -685,7 +666,6 @@ union recv_frame *decryptor(_adapter *padapter, union recv_frame *precv_frame)
psecuritypriv->hw_decrypted);
#endif
}
} else {
DBG_COUNTER(padapter->rx_logs.core_rx_post_decrypt_unknown);
#ifdef DBG_RX_DECRYPTOR
@ -701,13 +681,10 @@ union recv_frame *decryptor(_adapter *padapter, union recv_frame *precv_frame)
if (res == _FAIL) {
rtw_free_recvframe(return_packet, &padapter->recvpriv.free_recv_queue);
return_packet = NULL;
} else
} else {
prxattrib->bdecrypted = _TRUE;
/* recvframe_chkmic(adapter, precv_frame); */ /* move to recvframme_defrag function */
}
return return_packet;
}
/* ###set the security information in the recv_frame */
union recv_frame *portctrl(_adapter *adapter, union recv_frame *precv_frame);
@ -1672,12 +1649,6 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
/* RTW_INFO("handling ps-poll, q_len=%d, tim=%x\n", psta->sleepq_len, pstapriv->tim_bitmap); */
#if 0
_exit_critical_bh(&psta->sleep_q.lock, &irqL);
if (rtw_hal_xmit(padapter, pxmitframe) == _TRUE)
rtw_os_xmit_complete(padapter, pxmitframe);
_enter_critical_bh(&psta->sleep_q.lock, &irqL);
#endif
rtw_hal_xmitframe_enqueue(padapter, pxmitframe);
if (psta->sleepq_len == 0) {
@ -1729,23 +1700,9 @@ sint validate_recv_ctrl_frame(_adapter *padapter, union recv_frame *precv_frame)
}
union recv_frame *recvframe_chk_defrag(PADAPTER padapter, union recv_frame *precv_frame);
sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame);
sint validate_recv_mgnt_frame(PADAPTER padapter, union recv_frame *precv_frame)
{
/* struct mlme_priv *pmlmepriv = &adapter->mlmepriv; */
#if 0
if (check_fwstate(pmlmepriv, WIFI_AP_STATE) == _TRUE) {
#ifdef CONFIG_NATIVEAP_MLME
mgt_dispatcher(padapter, precv_frame);
#else
rtw_hostapd_mlme_rx(padapter, precv_frame);
#endif
} else
mgt_dispatcher(padapter, precv_frame);
#endif
precv_frame = recvframe_chk_defrag(padapter, precv_frame);
if (precv_frame == NULL) {
return _SUCCESS;
@ -2020,17 +1977,6 @@ static sint validate_80211w_mgmt(_adapter *adapter, union recv_frame *precv_fram
RTW_INFO("%s mgmt allocate fail !!!!!!!!!\n", __FUNCTION__);
goto validate_80211w_fail;
}
#if 0
/* dump the packet content before decrypt */
{
int pp;
RTW_INFO("pattrib->pktlen = %d =>", pattrib->pkt_len);
for (pp = 0; pp < pattrib->pkt_len; pp++)
RTW_INFO(" %02x ", ptr[pp]);
RTW_INFO("\n");
}
#endif
precv_frame = decryptor(adapter, precv_frame);
/* save actual management data frame body */
_rtw_memcpy(mgmt_DATA, ptr + pattrib->hdrlen + pattrib->iv_len, data_len);
@ -2039,16 +1985,6 @@ static sint validate_80211w_mgmt(_adapter *adapter, union recv_frame *precv_fram
/* remove the iv and icv length */
pattrib->pkt_len = pattrib->pkt_len - pattrib->iv_len - pattrib->icv_len;
rtw_mfree(mgmt_DATA, data_len);
#if 0
/* print packet content after decryption */
{
int pp;
RTW_INFO("after decryption pattrib->pktlen = %d @@=>", pattrib->pkt_len);
for (pp = 0; pp < pattrib->pkt_len; pp++)
RTW_INFO(" %02x ", ptr[pp]);
RTW_INFO("\n");
}
#endif
if (!precv_frame) {
RTW_INFO("%s mgmt descrypt fail !!!!!!!!!\n", __FUNCTION__);
goto validate_80211w_fail;
@ -2493,22 +2429,6 @@ sint wlanhdr_to_ethhdr(union recv_frame *precvframe)
} else if (eth_type == 0x8712) { /* append rx status for mp test packets */
/* ptr -= 16; */
/* _rtw_memcpy(ptr, get_rxmem(precvframe), 16); */
} else {
#ifdef PLATFORM_OS_XP
NDIS_PACKET_8021Q_INFO VlanPriInfo;
UINT32 UserPriority = precvframe->u.hdr.attrib.priority;
UINT32 VlanID = (pvlan != NULL ? get_vlan_id(pvlan) : 0);
VlanPriInfo.Value = /* Get current value. */
NDIS_PER_PACKET_INFO_FROM_PACKET(precvframe->u.hdr.pkt, Ieee8021QInfo);
VlanPriInfo.TagHeader.UserPriority = UserPriority;
VlanPriInfo.TagHeader.VlanId = VlanID ;
VlanPriInfo.TagHeader.CanonicalFormatId = 0; /* Should be zero. */
VlanPriInfo.TagHeader.Reserved = 0; /* Should be zero. */
NDIS_PER_PACKET_INFO_FROM_PACKET(precvframe->u.hdr.pkt, Ieee8021QInfo) = VlanPriInfo.Value;
#endif
}
if (eth_type == 0x8712) { /* append rx status for mp test packets */
@ -2533,7 +2453,6 @@ exit:
#if defined(CONFIG_SDIO_HCI) || defined(CONFIG_GSPI_HCI)
#ifdef PLATFORM_LINUX
static void recvframe_expand_pkt(
PADAPTER padapter,
union recv_frame *prframe)
@ -2586,9 +2505,6 @@ static void recvframe_expand_pkt(
pfhdr->rx_tail = skb_tail_pointer(ppkt);
pfhdr->rx_end = skb_end_pointer(ppkt);
}
#else
#warning "recvframe_expand_pkt not implement, defrag may crash system"
#endif
#endif
/* perform defrag */
@ -3019,12 +2935,6 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
phead = get_list_head(ppending_recvframe_queue);
plist = get_next(phead);
#if 0
/* Check if there is any other indication thread running. */
if (pTS->RxIndicateState == RXTS_INDICATE_PROCESSING)
return;
#endif
/* Handling some condition for forced indicate case. */
if (bforced == _TRUE) {
pdbgpriv->dbg_rx_ampdu_forced_indicate_count++;
@ -3054,16 +2964,6 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
pattrib = &prframe->u.hdr.attrib;
if (!SN_LESS(preorder_ctrl->indicate_seq, pattrib->seq_num)) {
#if 0
/* This protect buffer from overflow. */
if (index >= REORDER_WIN_SIZE) {
RT_ASSERT(FALSE, ("IndicateRxReorderList(): Buffer overflow!!\n"));
bPktInBuf = TRUE;
break;
}
#endif
plist = get_next(plist);
rtw_list_delete(&(prframe->u.hdr.list));
@ -3075,30 +2975,8 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
#endif
}
#if 0
index++;
if (index == 1) {
/* Cancel previous pending timer. */
/* PlatformCancelTimer(Adapter, &pTS->RxPktPendingTimer); */
if (bforced != _TRUE) {
/* RTW_INFO("_cancel_timer(&preorder_ctrl->reordering_ctrl_timer, &bcancelled);\n"); */
_cancel_timer(&preorder_ctrl->reordering_ctrl_timer, &bcancelled);
}
}
#endif
/* Set this as a lock to make sure that only one thread is indicating packet. */
/* pTS->RxIndicateState = RXTS_INDICATE_PROCESSING; */
/* Indicate packets */
/* RT_ASSERT((index<=REORDER_WIN_SIZE), ("RxReorderIndicatePacket(): Rx Reorder buffer full!!\n")); */
/* indicate this recv_frame */
/* DbgPrint("recv_indicatepkts_in_order, indicate_seq=%d, seq_num=%d\n", precvpriv->indicate_seq, pattrib->seq_num); */
if (!pattrib->amsdu) {
/* RTW_INFO("recv_indicatepkts_in_order, amsdu!=1, indicate_seq=%d, seq_num=%d\n", preorder_ctrl->indicate_seq, pattrib->seq_num); */
if (!RTW_CANNOT_RUN(padapter))
rtw_recv_indicatepkt(padapter, prframe);/*indicate this recv_frame*/
@ -3122,29 +3000,9 @@ int recv_indicatepkts_in_order(_adapter *padapter, struct recv_reorder_ctrl *pre
}
/* _rtw_spinunlock_ex(&ppending_recvframe_queue->lock); */
/* _exit_critical_ex(&ppending_recvframe_queue->lock, &irql); */
#if 0
/* Release the indication lock and set to new indication step. */
if (bPktInBuf) {
/* Set new pending timer. */
/* pTS->RxIndicateState = RXTS_INDICATE_REORDER; */
/* PlatformSetTimer(Adapter, &pTS->RxPktPendingTimer, pHTInfo->RxReorderPendingTime); */
_set_timer(&preorder_ctrl->reordering_ctrl_timer, REORDER_WAIT_TIME);
} else {
/* pTS->RxIndicateState = RXTS_INDICATE_IDLE; */
}
#endif
/* _exit_critical_ex(&ppending_recvframe_queue->lock, &irql); */
/* return _TRUE; */
return bPktInBuf;
}
int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe);
int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
{
_irqL irql;
@ -3244,31 +3102,16 @@ int recv_indicatepkt_reorder(_adapter *padapter, union recv_frame *prframe)
/* s2. check if winstart_b(indicate_seq) needs to been updated */
if (!check_indicate_seq(preorder_ctrl, pattrib->seq_num)) {
pdbgpriv->dbg_rx_ampdu_drop_count++;
/* pHTInfo->RxReorderDropCounter++; */
/* ReturnRFDList(Adapter, pRfd); */
/* _exit_critical_ex(&ppending_recvframe_queue->lock, &irql); */
/* return _FAIL; */
#ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s check_indicate_seq fail\n", __FUNCTION__);
#endif
#if 0
rtw_recv_indicatepkt(padapter, prframe);
_exit_critical_bh(&ppending_recvframe_queue->lock, &irql);
goto _success_exit;
#else
goto _err_exit;
#endif
}
/* s3. Insert all packet into Reorder Queue to maintain its ordering. */
if (!enqueue_reorder_recvframe(preorder_ctrl, prframe)) {
/* DbgPrint("recv_indicatepkt_reorder, enqueue_reorder_recvframe fail!\n"); */
/* _exit_critical_ex(&ppending_recvframe_queue->lock, &irql); */
/* return _FAIL; */
#ifdef DBG_RX_DROP_FRAME
RTW_INFO("DBG_RX_DROP_FRAME %s enqueue_reorder_recvframe fail\n", __FUNCTION__);
#endif
@ -3413,24 +3256,6 @@ int validate_mp_recv_frame(_adapter *adapter, union recv_frame *precv_frame)
pmptx = &pmppriv->tx;
#if 0
if (1) {
u8 bDumpRxPkt;
type = GetFrameType(ptr);
subtype = get_frame_sub_type(ptr); /* bit(7)~bit(2) */
rtw_hal_get_def_var(adapter, HAL_DEF_DBG_DUMP_RXPKT, &(bDumpRxPkt));
if (bDumpRxPkt == 1) { /* dump all rx packets */
int i;
RTW_INFO("############ type:0x%02x subtype:0x%02x #################\n", type, subtype);
for (i = 0; i < 64; i = i + 8)
RTW_INFO("%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));
RTW_INFO("#############################\n");
}
}
#endif
if (pmppriv->bloopback) {
if (_rtw_memcmp(ptr + 24, pmptx->buf + 24, precv_frame->u.hdr.len - 24) == _FALSE) {
RTW_INFO("Compare payload content Fail !!!\n");
@ -3672,36 +3497,6 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe,
{
#define CHAN2FREQ(a) ((a < 14) ? (2407+5*a) : (5000+5*a))
#if 0
#define RTW_RX_RADIOTAP_PRESENT (\
(1 << IEEE80211_RADIOTAP_TSFT) | \
(1 << IEEE80211_RADIOTAP_FLAGS) | \
(1 << IEEE80211_RADIOTAP_RATE) | \
(1 << IEEE80211_RADIOTAP_CHANNEL) | \
(0 << IEEE80211_RADIOTAP_FHSS) | \
(1 << IEEE80211_RADIOTAP_DBM_ANTSIGNAL) | \
(1 << IEEE80211_RADIOTAP_DBM_ANTNOISE) | \
(0 << IEEE80211_RADIOTAP_LOCK_QUALITY) | \
(0 << IEEE80211_RADIOTAP_TX_ATTENUATION) | \
(0 << IEEE80211_RADIOTAP_DB_TX_ATTENUATION) | \
(0 << IEEE80211_RADIOTAP_DBM_TX_POWER) | \
(1 << IEEE80211_RADIOTAP_ANTENNA) | \
(1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL) | \
(0 << IEEE80211_RADIOTAP_DB_ANTNOISE) | \
(0 << IEEE80211_RADIOTAP_RX_FLAGS) | \
(0 << IEEE80211_RADIOTAP_TX_FLAGS) | \
(0 << IEEE80211_RADIOTAP_RTS_RETRIES) | \
(0 << IEEE80211_RADIOTAP_DATA_RETRIES) | \
(0 << IEEE80211_RADIOTAP_MCS) | \
(0 << IEEE80211_RADIOTAP_RADIOTAP_NAMESPACE)| \
(0 << IEEE80211_RADIOTAP_VENDOR_NAMESPACE) | \
(0 << IEEE80211_RADIOTAP_EXT) | \
0)
/* (0 << IEEE80211_RADIOTAP_AMPDU_STATUS) | \ */
/* (0 << IEEE80211_RADIOTAP_VHT) | \ */
#endif
#ifndef IEEE80211_RADIOTAP_RX_FLAGS
#define IEEE80211_RADIOTAP_RX_FLAGS 14
#endif
@ -3835,18 +3630,6 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe,
hdr_buf[rt_len] = pattrib->phy_info.RecvSignalPower;
rt_len += 1;
#if 0
/* dBm Antenna Noise */
rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_DBM_ANTNOISE);
hdr_buf[rt_len] = 0;
rt_len += 1;
/* Signal Quality */
rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_LOCK_QUALITY);
hdr_buf[rt_len] = pattrib->phy_info.SignalQuality;
rt_len += 1;
#endif
/* Antenna */
rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_ANTENNA);
hdr_buf[rt_len] = 0; /* pHalData->rf_type; */
@ -3854,10 +3637,6 @@ static sint fill_radiotap_hdr(_adapter *padapter, union recv_frame *precvframe,
/* RX flags */
rtap_hdr->it_present |= (1 << IEEE80211_RADIOTAP_RX_FLAGS);
#if 0
tmp_16bit = cpu_to_le16(0);
memcpy(ptr, &tmp_16bit, 1);
#endif
rt_len += 2;
/* MCS information */
@ -4094,21 +3873,6 @@ int recv_func_posthandle(_adapter *padapter, union recv_frame *prframe)
}
#endif
#if 0
if (padapter->adapter_type == PRIMARY_ADAPTER) {
RTW_INFO("+++\n");
{
int i;
u8 *ptr = get_recvframe_data(prframe);
for (i = 0; i < 140; i = i + 8)
RTW_INFO("%02X:%02X:%02X:%02X:%02X:%02X:%02X:%02X:", *(ptr + i),
*(ptr + i + 1), *(ptr + i + 2) , *(ptr + i + 3) , *(ptr + i + 4), *(ptr + i + 5), *(ptr + i + 6), *(ptr + i + 7));
}
RTW_INFO("---\n");
}
#endif
#ifdef CONFIG_TDLS
/* check TDLS frame */
psnap_type = get_recvframe_data(orig_prframe) + pattrib->hdrlen + pattrib->iv_len + SNAP_SIZE;
@ -4587,22 +4351,6 @@ void rx_query_phy_status(
if (_rtw_memcmp(adapter_mac_addr(padapter), sa, ETH_ALEN) == _TRUE) {
static u32 start_time = 0;
#if 0 /*For debug */
if (IsFrameTypeCtrl(wlanhdr)) {
RTW_INFO("-->Control frame: Y\n");
RTW_INFO("-->pkt_len: %d\n", pattrib->pkt_len);
RTW_INFO("-->Sub Type = 0x%X\n", get_frame_sub_type(wlanhdr));
}
/* Dump first 40 bytes of header */
int i = 0;
for (i = 0; i < 40; i++)
RTW_INFO("%d: %X\n", i, *((u8 *)wlanhdr + i));
RTW_INFO("\n");
#endif
if ((start_time == 0) || (rtw_get_passing_time_ms(start_time) > 5000)) {
RTW_PRINT("Warning!!! %s: Confilc mac addr!!\n", __func__);
start_time = rtw_get_current_time();