skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-29 23:43:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: Remove rest of dead code depending on CONFIG_MP_INCLUDED

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2014-12-15 13:49:38 -06:00
parent 4ee8d3010d
commit 2caee63170
10 changed files with 0 additions and 2901 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/rtw_cmd.c
View file

@ -1080,10 +1080,6 @@ void rtw_getbbrfreg_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
rtw_mfree((unsigned char*) pcmd->parmbuf, pcmd->cmdsz); rtw_mfree((unsigned char*) pcmd->parmbuf, pcmd->cmdsz);
rtw_mfree((unsigned char*) pcmd, sizeof(struct cmd_obj)); rtw_mfree((unsigned char*) pcmd, sizeof(struct cmd_obj));
#ifdef CONFIG_MP_INCLUDED
if (padapter->registrypriv.mp_mode == 1)
padapter->mppriv.workparam.bcompleted= _TRUE;
#endif
_func_exit_; _func_exit_;
} }
@ -1094,11 +1090,6 @@ void rtw_readtssi_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
rtw_mfree((unsigned char*) pcmd->parmbuf, pcmd->cmdsz); rtw_mfree((unsigned char*) pcmd->parmbuf, pcmd->cmdsz);
rtw_mfree((unsigned char*) pcmd, sizeof(struct cmd_obj)); rtw_mfree((unsigned char*) pcmd, sizeof(struct cmd_obj));
#ifdef CONFIG_MP_INCLUDED
if (padapter->registrypriv.mp_mode == 1)
padapter->mppriv.workparam.bcompleted= _TRUE;
#endif
_func_exit_; _func_exit_;
} }
@ -3268,11 +3259,6 @@ void rtw_getrttbl_cmd_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
_func_enter_; _func_enter_;
rtw_free_cmd_obj(pcmd); rtw_free_cmd_obj(pcmd);
#ifdef CONFIG_MP_INCLUDED
if (padapter->registrypriv.mp_mode == 1)
padapter->mppriv.workparam.bcompleted=_TRUE;
#endif
_func_exit_; _func_exit_;
} }

4
core/rtw_ioctl_rtl.c
View file

@ -29,10 +29,6 @@
#include <rtw_ioctl_query.h> #include <rtw_ioctl_query.h>
#include <rtw_ioctl_rtl.h> #include <rtw_ioctl_rtl.h>
#include <mp_custom_oid.h> #include <mp_custom_oid.h>
#ifdef CONFIG_MP_INCLUDED
#include <rtw_mp.h>
#include <rtw_mp_ioctl.h>
#endif
struct oid_obj_priv oid_rtl_seg_01_01[] = struct oid_obj_priv oid_rtl_seg_01_01[] =
{ {

8
core/rtw_ioctl_set.c
View file

@ -1364,14 +1364,6 @@ u16 rtw_get_cur_max_rate(_adapter *adapter)
u32 ht_ielen = 0; u32 ht_ielen = 0;
#endif #endif
#ifdef CONFIG_MP_INCLUDED
if (adapter->registrypriv.mp_mode == 1)
{
if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE)
return 0;
}
#endif
if((check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE) if((check_fwstate(pmlmepriv, _FW_LINKED) != _TRUE)
&& (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) != _TRUE)) && (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) != _TRUE))
return 0; return 0;

1620
core/rtw_mp.c
View file

File diff suppressed because it is too large Load diff

38
core/rtw_recv.c
View file

@ -1331,13 +1331,6 @@ _func_enter_;
if (*psta == NULL) { if (*psta == NULL) {
RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("can't get psta under sta2sta_data_frame ; drop pkt\n")); RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("can't get psta under sta2sta_data_frame ; drop pkt\n"));
#ifdef CONFIG_MP_INCLUDED
if (adapter->registrypriv.mp_mode == 1)
{
if(check_fwstate(pmlmepriv, WIFI_MP_STATE) == _TRUE)
adapter->mppriv.rx_pktloss++;
}
#endif
ret= _FAIL; ret= _FAIL;
goto exit; goto exit;
} }
@ -3997,30 +3990,6 @@ int recv_func_prehandle(_adapter *padapter, union recv_frame *rframe)
_queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue; _queue *pfree_recv_queue = &padapter->recvpriv.free_recv_queue;
#ifdef CONFIG_MP_INCLUDED
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
#endif //CONFIG_MP_INCLUDED
#ifdef CONFIG_MP_INCLUDED
if (padapter->registrypriv.mp_mode == 1)
{
if (pattrib->crc_err == 1)
{
padapter->mppriv.rx_crcerrpktcount++;
}
else
{
padapter->mppriv.rx_pktcount++;
}
if (check_fwstate(pmlmepriv, WIFI_MP_LPBK_STATE) == _FALSE) {
RT_TRACE(_module_rtl871x_recv_c_, _drv_alert_, ("MP - Not in loopback mode , drop pkt \n"));
ret = _FAIL;
rtw_free_recvframe(rframe, pfree_recv_queue);//free this recv_frame
goto exit;
}
}
#endif
//check the frame crtl field and decache //check the frame crtl field and decache
ret = validate_recv_frame(padapter, rframe); ret = validate_recv_frame(padapter, rframe);
if (ret != _SUCCESS) if (ret != _SUCCESS)
@ -4291,13 +4260,6 @@ _func_exit_;
_recv_entry_drop: _recv_entry_drop:
#ifdef CONFIG_MP_INCLUDED
if (padapter->registrypriv.mp_mode == 1)
padapter->mppriv.rx_pktloss = precvpriv->rx_drop;
#endif
//RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("_recv_entry_drop\n"));
_func_exit_; _func_exit_;
return ret; return ret;

14
core/rtw_xmit.c
View file

@ -86,13 +86,6 @@ s32 _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, _adapter *padapter)
u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ; u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ;
u32 num_xmit_extbuf = NR_XMIT_EXTBUFF; u32 num_xmit_extbuf = NR_XMIT_EXTBUFF;
#if defined(CONFIG_MP_INCLUDED) && defined(CONFIG_RTL8723A)
if (padapter->registrypriv.mp_mode) {
max_xmit_extbuf_size = 6000;
num_xmit_extbuf = 8;
}
#endif
_func_enter_; _func_enter_;
// We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc(). // We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc().
@ -387,13 +380,6 @@ void _rtw_free_xmit_priv (struct xmit_priv *pxmitpriv)
u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ; u32 max_xmit_extbuf_size = MAX_XMIT_EXTBUF_SZ;
u32 num_xmit_extbuf = NR_XMIT_EXTBUFF; u32 num_xmit_extbuf = NR_XMIT_EXTBUFF;
#if defined(CONFIG_MP_INCLUDED) && defined(CONFIG_RTL8723A)
if (padapter->registrypriv.mp_mode) {
max_xmit_extbuf_size = 6000;
num_xmit_extbuf = 8;
}
#endif
_func_enter_; _func_enter_;
rtw_hal_free_xmit_priv(padapter); rtw_hal_free_xmit_priv(padapter);

1157
hal/rtl8188e/rtl8188e_mp.c
View file

File diff suppressed because it is too large Load diff

20
hal/rtl8188e/sdio/rtl8189es_recv.c
View file

@ -385,16 +385,6 @@ static void rtl8188es_recv_tasklet(void *priv)
if ((pattrib->crc_err) || (pattrib->icv_err)) if ((pattrib->crc_err) || (pattrib->icv_err))
{ {
#ifdef CONFIG_MP_INCLUDED
if (padapter->registrypriv.mp_mode == 1)
{
if ((check_fwstate(&padapter->mlmepriv, WIFI_MP_STATE) == _TRUE))//&&(padapter->mppriv.check_mp_pkt == 0))
{
if (pattrib->crc_err == 1)
padapter->mppriv.rx_crcerrpktcount++;
}
}
#endif
DBG_8192C("%s: crc_err=%d icv_err=%d, skip!\n", __FUNCTION__, pattrib->crc_err, pattrib->icv_err); DBG_8192C("%s: crc_err=%d icv_err=%d, skip!\n", __FUNCTION__, pattrib->crc_err, pattrib->icv_err);
rtw_free_recvframe(precvframe, &precvpriv->free_recv_queue); rtw_free_recvframe(precvframe, &precvpriv->free_recv_queue);
} }
@ -736,16 +726,6 @@ static void rtl8188es_recv_tasklet(void *priv)
if ((pattrib->crc_err) || (pattrib->icv_err)) if ((pattrib->crc_err) || (pattrib->icv_err))
{ {
#ifdef CONFIG_MP_INCLUDED
if (padapter->registrypriv.mp_mode == 1)
{
if ((check_fwstate(&padapter->mlmepriv, WIFI_MP_STATE) == _TRUE))//&&(padapter->mppriv.check_mp_pkt == 0))
{
if (pattrib->crc_err == 1)
padapter->mppriv.rx_crcerrpktcount++;
}
}
#endif
DBG_8192C("%s: crc_err=%d icv_err=%d, skip!\n", __FUNCTION__, pattrib->crc_err, pattrib->icv_err); DBG_8192C("%s: crc_err=%d icv_err=%d, skip!\n", __FUNCTION__, pattrib->crc_err, pattrib->icv_err);
rtw_free_recvframe(precvframe, &precvpriv->free_recv_queue); rtw_free_recvframe(precvframe, &precvpriv->free_recv_queue);

19
hal/rtl8188e/sdio/rtl8189es_xmit.c
View file

@ -449,25 +449,6 @@ void rtl8188es_fill_default_txdesc(
{ {
RT_TRACE(_module_hal_xmit_c_, _drv_warning_, ("%s: TXAGG_FRAMETAG\n", __FUNCTION__)); RT_TRACE(_module_hal_xmit_c_, _drv_warning_, ("%s: TXAGG_FRAMETAG\n", __FUNCTION__));
} }
#ifdef CONFIG_MP_INCLUDED
else if (pxmitframe->frame_tag == MP_FRAMETAG)
{
struct tx_desc *pdesc;
pdesc = (struct tx_desc*)ptxdesc;
RT_TRACE(_module_hal_xmit_c_, _drv_notice_, ("%s: MP_FRAMETAG\n", __FUNCTION__));
fill_txdesc_for_mp(padapter, pdesc);
pdesc->txdw0 = le32_to_cpu(pdesc->txdw0);
pdesc->txdw1 = le32_to_cpu(pdesc->txdw1);
pdesc->txdw2 = le32_to_cpu(pdesc->txdw2);
pdesc->txdw3 = le32_to_cpu(pdesc->txdw3);
pdesc->txdw4 = le32_to_cpu(pdesc->txdw4);
pdesc->txdw5 = le32_to_cpu(pdesc->txdw5);
pdesc->txdw6 = le32_to_cpu(pdesc->txdw6);
pdesc->txdw7 = le32_to_cpu(pdesc->txdw7);
}
#endif // CONFIG_MP_INCLUDED
else else
{ {
RT_TRACE(_module_hal_xmit_c_, _drv_warning_, ("%s: frame_tag=0x%x\n", __FUNCTION__, pxmitframe->frame_tag)); RT_TRACE(_module_hal_xmit_c_, _drv_warning_, ("%s: frame_tag=0x%x\n", __FUNCTION__, pxmitframe->frame_tag));

7
hal/rtl8188e/usb/rtl8188eu_xmit.c
View file

@ -496,13 +496,6 @@ if (padapter->registrypriv.mp_mode == 0)
{ {
DBG_8192C("pxmitframe->frame_tag == TXAGG_FRAMETAG\n"); DBG_8192C("pxmitframe->frame_tag == TXAGG_FRAMETAG\n");
} }
#ifdef CONFIG_MP_INCLUDED
else if(((pxmitframe->frame_tag&0x0f) == MP_FRAMETAG) &&
(padapter->registrypriv.mp_mode == 1))
{
fill_txdesc_for_mp(padapter, ptxdesc);
}
#endif
else else
{ {
DBG_8192C("pxmitframe->frame_tag = %d\n", pxmitframe->frame_tag); DBG_8192C("pxmitframe->frame_tag = %d\n", pxmitframe->frame_tag);