mirror of
https://github.com/lwfinger/rtl8188eu.git
synced 2024-11-09 23:19:39 +00:00
rtl8188eu: Remove CONFIG_MP_INCLUDED
This one is defined. Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
parent
e8b7f536c4
commit
085a651d9c
13 changed files with 45 additions and 128 deletions
9
Makefile
9
Makefile
|
@ -20,7 +20,6 @@ CONFIG_RTL8188E = y
|
|||
|
||||
CONFIG_USB_HCI = y
|
||||
|
||||
CONFIG_MP_INCLUDED = y
|
||||
CONFIG_POWER_SAVING = y
|
||||
CONFIG_USB_AUTOSUSPEND = n
|
||||
CONFIG_HW_PWRP_DETECTION = n
|
||||
|
@ -56,6 +55,7 @@ OUTSRC_FILES := \
|
|||
hal/rtl8188e_cmd.o \
|
||||
hal/rtl8188e_dm.o \
|
||||
hal/rtl8188e_hal_init.o \
|
||||
hal/rtl8188e_mp.o \
|
||||
hal/rtl8188e_phycfg.o \
|
||||
hal/rtl8188e_rf6052.o \
|
||||
hal/rtl8188e_rxdesc.o \
|
||||
|
@ -89,9 +89,6 @@ _OS_INTFS_FILES := \
|
|||
|
||||
|
||||
|
||||
ifeq ($(CONFIG_MP_INCLUDED), y)
|
||||
_HAL_INTFS_FILES += hal/rtl8188e_mp.o
|
||||
endif
|
||||
|
||||
_HAL_INTFS_FILES += $(OUTSRC_FILES)
|
||||
|
||||
|
@ -106,10 +103,6 @@ ifeq ($(CONFIG_USB_AUTOSUSPEND), y)
|
|||
EXTRA_CFLAGS += -DCONFIG_USB_AUTOSUSPEND
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_MP_INCLUDED), y)
|
||||
EXTRA_CFLAGS += -DCONFIG_MP_INCLUDED
|
||||
endif
|
||||
|
||||
ifeq ($(CONFIG_POWER_SAVING), y)
|
||||
EXTRA_CFLAGS += -DCONFIG_POWER_SAVING
|
||||
endif
|
||||
|
|
|
@ -1001,10 +1001,8 @@ void rtw_getbbrfreg_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
|
|||
rtw_mfree((unsigned char*) pcmd->parmbuf, pcmd->cmdsz);
|
||||
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_;
|
||||
}
|
||||
|
||||
|
@ -1015,11 +1013,8 @@ void rtw_readtssi_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
|
|||
rtw_mfree((unsigned char*) pcmd->parmbuf, pcmd->cmdsz);
|
||||
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_;
|
||||
}
|
||||
|
||||
|
@ -2777,11 +2772,8 @@ void rtw_getrttbl_cmd_cmdrsp_callback(_adapter* padapter, struct cmd_obj *pcmd)
|
|||
_func_enter_;
|
||||
|
||||
rtw_free_cmd_obj(pcmd);
|
||||
#ifdef CONFIG_MP_INCLUDED
|
||||
if (padapter->registrypriv.mp_mode == 1)
|
||||
padapter->mppriv.workparam.bcompleted=true;
|
||||
#endif
|
||||
|
||||
_func_exit_;
|
||||
|
||||
}
|
||||
|
|
|
@ -1125,13 +1125,11 @@ u16 rtw_get_cur_max_rate(_adapter *adapter)
|
|||
u32 ht_ielen = 0;
|
||||
#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)
|
||||
&& (check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) != true))
|
||||
|
|
|
@ -24,47 +24,42 @@
|
|||
#include "odm_precomp.h"
|
||||
#include "rtl8188e_hal.h"
|
||||
|
||||
#ifdef CONFIG_MP_INCLUDED
|
||||
|
||||
u32 read_macreg(_adapter *padapter, u32 addr, u32 sz)
|
||||
{
|
||||
u32 val = 0;
|
||||
|
||||
switch (sz)
|
||||
{
|
||||
case 1:
|
||||
val = rtw_read8(padapter, addr);
|
||||
break;
|
||||
case 2:
|
||||
val = rtw_read16(padapter, addr);
|
||||
break;
|
||||
case 4:
|
||||
val = rtw_read32(padapter, addr);
|
||||
break;
|
||||
default:
|
||||
val = 0xffffffff;
|
||||
break;
|
||||
switch (sz) {
|
||||
case 1:
|
||||
val = rtw_read8(padapter, addr);
|
||||
break;
|
||||
case 2:
|
||||
val = rtw_read16(padapter, addr);
|
||||
break;
|
||||
case 4:
|
||||
val = rtw_read32(padapter, addr);
|
||||
break;
|
||||
default:
|
||||
val = 0xffffffff;
|
||||
break;
|
||||
}
|
||||
|
||||
return val;
|
||||
|
||||
}
|
||||
|
||||
void write_macreg(_adapter *padapter, u32 addr, u32 val, u32 sz)
|
||||
{
|
||||
switch (sz)
|
||||
{
|
||||
case 1:
|
||||
rtw_write8(padapter, addr, (u8)val);
|
||||
break;
|
||||
case 2:
|
||||
rtw_write16(padapter, addr, (u16)val);
|
||||
break;
|
||||
case 4:
|
||||
rtw_write32(padapter, addr, val);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
switch (sz) {
|
||||
case 1:
|
||||
rtw_write8(padapter, addr, (u8)val);
|
||||
break;
|
||||
case 2:
|
||||
rtw_write16(padapter, addr, (u16)val);
|
||||
break;
|
||||
case 4:
|
||||
rtw_write32(padapter, addr, val);
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -190,19 +185,12 @@ static void mp_init_xmit_attrib(struct mp_tx *pmptx, PADAPTER padapter)
|
|||
_rtw_memset(desc, 0, TXDESC_SIZE);
|
||||
|
||||
pattrib->ether_type = 0x8712;
|
||||
/* _rtw_memcpy(pattrib->src, padapter->eeprompriv.mac_addr, ETH_ALEN); */
|
||||
/* _rtw_memcpy(pattrib->ta, pattrib->src, ETH_ALEN); */
|
||||
_rtw_memset(pattrib->dst, 0xFF, ETH_ALEN);
|
||||
/* pattrib->pctrl = 0; */
|
||||
/* pattrib->dhcp_pkt = 0; */
|
||||
/* pattrib->pktlen = 0; */
|
||||
pattrib->ack_policy = 0;
|
||||
/* pattrib->pkt_hdrlen = ETH_HLEN; */
|
||||
pattrib->hdrlen = WLAN_HDR_A3_LEN;
|
||||
pattrib->subtype = WIFI_DATA;
|
||||
pattrib->priority = 0;
|
||||
pattrib->qsel = pattrib->priority;
|
||||
/* do_queue_select(padapter, pattrib); */
|
||||
pattrib->nr_frags = 1;
|
||||
pattrib->encrypt = 0;
|
||||
pattrib->bswenc = false;
|
||||
|
@ -1170,6 +1158,3 @@ void _rtw_mp_xmit_priv (struct xmit_priv *pxmitpriv)
|
|||
exit:
|
||||
;
|
||||
}
|
||||
|
||||
|
||||
#endif
|
||||
|
|
|
@ -1003,13 +1003,11 @@ _func_enter_;
|
|||
|
||||
if (*psta == NULL) {
|
||||
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;
|
||||
goto exit;
|
||||
}
|
||||
|
@ -2704,12 +2702,8 @@ static int recv_func_prehandle(_adapter *padapter, union recv_frame *rframe)
|
|||
struct rx_pkt_attrib *pattrib = &rframe->u.hdr.attrib;
|
||||
struct recv_priv *precvpriv = &padapter->recvpriv;
|
||||
_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 ((check_fwstate(pmlmepriv, WIFI_MP_STATE) == true))/* padapter->mppriv.check_mp_pkt == 0)) */
|
||||
|
@ -2727,7 +2721,6 @@ static int recv_func_prehandle(_adapter *padapter, union recv_frame *rframe)
|
|||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
/* check the frame crtl field and decache */
|
||||
ret = validate_recv_frame(padapter, rframe);
|
||||
|
@ -2940,12 +2933,8 @@ _func_exit_;
|
|||
|
||||
_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_;
|
||||
|
||||
|
|
|
@ -18,7 +18,6 @@
|
|||
*
|
||||
******************************************************************************/
|
||||
#define _RTL8188E_MP_C_
|
||||
#ifdef CONFIG_MP_INCLUDED
|
||||
|
||||
#include <drv_types.h>
|
||||
#include <rtw_mp.h>
|
||||
|
@ -993,5 +992,3 @@ void Hal_SetContinuousTx(PADAPTER pAdapter, u8 bStart)
|
|||
Hal_SetOFDMContinuousTx(pAdapter, bStart);
|
||||
}
|
||||
}
|
||||
|
||||
#endif /* CONFIG_MP_INCLUDE */
|
||||
|
|
|
@ -382,13 +382,11 @@ static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz ,u8 bag
|
|||
{
|
||||
DBG_88E("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
|
||||
{
|
||||
DBG_88E("pxmitframe->frame_tag = %d\n", pxmitframe->frame_tag);
|
||||
|
|
|
@ -95,26 +95,14 @@
|
|||
|
||||
#define SUPPORTED_BLOCK_IO
|
||||
|
||||
|
||||
//#define CONFIG_ONLY_ONE_OUT_EP_TO_LOW 0
|
||||
|
||||
#define CONFIG_OUT_EP_WIFI_MODE 0
|
||||
|
||||
#define ENABLE_USB_DROP_INCORRECT_OUT 0
|
||||
|
||||
|
||||
//#define RTL8192CU_ADHOC_WORKAROUND_SETTING
|
||||
|
||||
#define DISABLE_BB_RF 0
|
||||
|
||||
//#define RTL8191C_FPGA_NETWORKTYPE_ADHOC 0
|
||||
|
||||
#ifdef CONFIG_MP_INCLUDED
|
||||
#define MP_DRIVER 1
|
||||
#define CONFIG_MP_IWPRIV_SUPPORT
|
||||
#else
|
||||
#define MP_DRIVER 0
|
||||
#endif
|
||||
#define MP_DRIVER 1
|
||||
#define CONFIG_MP_IWPRIV_SUPPORT
|
||||
|
||||
|
||||
/*
|
||||
|
|
|
@ -73,9 +73,7 @@ typedef struct _ADAPTER _adapter, ADAPTER,*PADAPTER;
|
|||
#include <drvext_api.h>
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MP_INCLUDED
|
||||
#include <rtw_mp.h>
|
||||
#endif
|
||||
|
||||
#include <rtw_br_ext.h>
|
||||
#ifdef CONFIG_IOCTL_CFG80211
|
||||
|
@ -328,9 +326,7 @@ struct _ADAPTER{
|
|||
struct workqueue_struct *priv_checkbt_wq;
|
||||
struct delayed_work checkbt_work;
|
||||
#endif
|
||||
#ifdef CONFIG_MP_INCLUDED
|
||||
struct mp_priv mppriv;
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_DRVEXT_MODULE
|
||||
struct drvext_priv drvextpriv;
|
||||
|
|
|
@ -103,7 +103,7 @@ struct oid_obj_priv {
|
|||
NDIS_STATUS (*oidfuns)(struct oid_par_priv *poid_par_priv);
|
||||
};
|
||||
|
||||
#if (defined(CONFIG_MP_INCLUDED) && defined(_RTW_MP_IOCTL_C_))
|
||||
#if defined(_RTW_MP_IOCTL_C_)
|
||||
static NDIS_STATUS oid_null_function(struct oid_par_priv* poid_par_priv)
|
||||
{
|
||||
_func_enter_;
|
||||
|
|
|
@ -1743,16 +1743,14 @@ static int cfg80211_rtw_scan(struct wiphy *wiphy, struct net_device *ndev,
|
|||
DBG_88E(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MP_INCLUDED
|
||||
if (padapter->registrypriv.mp_mode == 1)
|
||||
{
|
||||
if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == true)
|
||||
if (padapter->registrypriv.mp_mode == 1)
|
||||
{
|
||||
ret = -EPERM;
|
||||
goto exit;
|
||||
if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == true)
|
||||
{
|
||||
ret = -EPERM;
|
||||
goto exit;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
_enter_critical_bh(&pwdev_priv->scan_req_lock, &irqL);
|
||||
pwdev_priv->scan_request = request;
|
||||
|
|
|
@ -36,9 +36,7 @@
|
|||
#include <rtw_version.h>
|
||||
#include <rtl8188e_hal.h>
|
||||
|
||||
#ifdef CONFIG_MP_INCLUDED
|
||||
#include <rtw_mp.h>
|
||||
#endif //#ifdef CONFIG_MP_INCLUDED
|
||||
#include <rtl8188e_hal.h>
|
||||
#include <rtw_iol.h>
|
||||
|
||||
|
@ -1667,16 +1665,14 @@ _func_enter_;
|
|||
DBG_88E("DBG_IOCTL %s:%d\n",__func__, __LINE__);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MP_INCLUDED
|
||||
if (padapter->registrypriv.mp_mode == 1)
|
||||
{
|
||||
if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == true)
|
||||
if (padapter->registrypriv.mp_mode == 1)
|
||||
{
|
||||
ret = -1;
|
||||
goto exit;
|
||||
if (check_fwstate(pmlmepriv, WIFI_MP_STATE) == true)
|
||||
{
|
||||
ret = -1;
|
||||
goto exit;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
if (_FAIL == rtw_pwr_wakeup(padapter))
|
||||
{
|
||||
ret= -1;
|
||||
|
@ -3276,8 +3272,6 @@ static int rtw_mp_ioctl_hdl(struct net_device *dev, struct iw_request_info *info
|
|||
goto _rtw_mp_ioctl_hdl_exit;
|
||||
}
|
||||
|
||||
//DBG_88E("%s: %d\n", __func__, poidparam->subcode);
|
||||
#ifdef CONFIG_MP_INCLUDED
|
||||
if (padapter->registrypriv.mp_mode == 1)
|
||||
{
|
||||
phandler = mp_ioctl_hdl + poidparam->subcode;
|
||||
|
@ -3324,9 +3318,8 @@ if (padapter->registrypriv.mp_mode == 1)
|
|||
}
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
rtw_dbg_mode_hdl(padapter, poidparam->subcode, poidparam->data, poidparam->len);
|
||||
{
|
||||
rtw_dbg_mode_hdl(padapter, poidparam->subcode, poidparam->data, poidparam->len);
|
||||
}
|
||||
|
||||
if (bset == 0x00) {//query info
|
||||
|
@ -8691,7 +8684,7 @@ exit:
|
|||
return err;
|
||||
}
|
||||
|
||||
#if defined(CONFIG_MP_INCLUDED) && defined(CONFIG_MP_IWPRIV_SUPPORT)
|
||||
#if defined(CONFIG_MP_IWPRIV_SUPPORT)
|
||||
/*
|
||||
* Input Format: %s,%d,%d
|
||||
* %s is width, could be
|
||||
|
@ -9933,7 +9926,7 @@ static int rtw_mp_get(struct net_device *dev,
|
|||
return 0;
|
||||
}
|
||||
|
||||
#endif //#if defined(CONFIG_MP_INCLUDED) && defined(CONFIG_MP_IWPRIV_SUPPORT)
|
||||
#endif //#if defined(CONFIG_MP_IWPRIV_SUPPORT)
|
||||
|
||||
static int rtw_wfd_tdls_enable(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
|
@ -10809,7 +10802,6 @@ static const struct iw_priv_args rtw_private_args[] = {
|
|||
IW_PRIV_TYPE_CHAR | 40, IW_PRIV_TYPE_CHAR | 0x7FF, "test"
|
||||
},
|
||||
|
||||
#ifdef CONFIG_MP_INCLUDED
|
||||
|
||||
{ SIOCIWFIRSTPRIV + 0x0E, IW_PRIV_TYPE_CHAR | 1024, 0 , ""}, //set
|
||||
{ SIOCIWFIRSTPRIV + 0x0F, IW_PRIV_TYPE_CHAR | 1024, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_MASK , ""},//get
|
||||
|
@ -10869,13 +10861,8 @@ static iw_handler rtw_private_handler[] =
|
|||
rtw_wx_write_rf, //0x0C
|
||||
rtw_wx_read_rf, //0x0D
|
||||
|
||||
#ifndef CONFIG_MP_INCLUDED
|
||||
rtw_wx_priv_null, //0x0E
|
||||
rtw_wx_priv_null, //0x0F
|
||||
#else
|
||||
rtw_mp_set, //0x0E
|
||||
rtw_mp_get, //0x0F
|
||||
#endif
|
||||
rtw_p2p_set, //0x10
|
||||
rtw_p2p_get, //0x11
|
||||
rtw_p2p_get2, //0x12
|
||||
|
@ -10895,8 +10882,6 @@ static iw_handler rtw_private_handler[] =
|
|||
rtw_test, // 0x1D
|
||||
};
|
||||
|
||||
#endif // #if defined(CONFIG_MP_INCLUDED) && defined(CONFIG_MP_IWPRIV_SUPPORT)
|
||||
|
||||
#if WIRELESS_EXT >= 17
|
||||
static struct iw_statistics *rtw_get_wireless_stats(struct net_device *dev)
|
||||
{
|
||||
|
|
|
@ -1159,10 +1159,8 @@ _func_enter_;
|
|||
|
||||
rtw_init_pwrctrl_priv(padapter);
|
||||
|
||||
#ifdef CONFIG_MP_INCLUDED
|
||||
if (init_mp_priv(padapter) == _FAIL)
|
||||
DBG_88E("%s: initialize MP private data Fail!\n", __func__);
|
||||
#endif
|
||||
|
||||
ret8 = rtw_init_default_value(padapter);
|
||||
|
||||
|
|
Loading…
Reference in a new issue