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

rtl8188eu: Remove CONFIG_DRVEXT_MODULE - not defined

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-07-21 13:12:53 -05:00
parent 838257750b
commit f9be1cea77
6 changed files with 1 additions and 148 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -27,8 +27,6 @@ CONFIG_BT_COEXIST = n
CONFIG_EXT_CLK = n CONFIG_EXT_CLK = n
CONFIG_WOWLAN = n CONFIG_WOWLAN = n
CONFIG_DRVEXT_MODULE = n
export TopDIR ?= $(shell pwd) export TopDIR ?= $(shell pwd)

23
core/rtw_mlme.c
View file

@ -1080,10 +1080,6 @@ _func_enter_;
rtw_os_xmit_schedule(adapter); rtw_os_xmit_schedule(adapter);
#ifdef CONFIG_DRVEXT_MODULE_WSC
drvext_surveydone_callback(&adapter->drvextpriv);
#endif
{ {
struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &adapter->mlmeextpriv;
if (pmlmeext->sitesurvey_res.bss_cnt == 0){ if (pmlmeext->sitesurvey_res.bss_cnt == 0){
@ -1213,17 +1209,9 @@ _func_enter_;
rtw_led_control(padapter, LED_CTL_LINK); rtw_led_control(padapter, LED_CTL_LINK);
#ifdef CONFIG_DRVEXT_MODULE
if (padapter->drvextpriv.enable_wpa) {
indicate_l2_connect(padapter);
} else
#endif
{
rtw_os_indicate_connect(padapter); rtw_os_indicate_connect(padapter);
} }
}
pmlmepriv->to_roaming=0; pmlmepriv->to_roaming=0;
rtw_set_scan_deny(padapter, 3000); rtw_set_scan_deny(padapter, 3000);
@ -1234,7 +1222,6 @@ _func_exit_;
} }
/* /*
*rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock *rtw_indicate_disconnect: the caller has to lock pmlmepriv->lock
*/ */
@ -1962,13 +1949,7 @@ _func_enter_;
_exit_critical_bh(&pmlmepriv->lock, &irqL); _exit_critical_bh(&pmlmepriv->lock, &irqL);
#ifdef CONFIG_DRVEXT_MODULE_WSC
drvext_assoc_fail_indicate(&adapter->drvextpriv);
#endif
_func_exit_; _func_exit_;
} }
/* /*
@ -2515,10 +2496,6 @@ _func_enter_;
_rtw_memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0], psecuritypriv->supplicant_ie[1]+2); _rtw_memcpy(&out_ie[ielength], &psecuritypriv->supplicant_ie[0], psecuritypriv->supplicant_ie[1]+2);
ielength+=psecuritypriv->supplicant_ie[1]+2; ielength+=psecuritypriv->supplicant_ie[1]+2;
rtw_report_sec_ie(adapter, authmode, psecuritypriv->supplicant_ie); rtw_report_sec_ie(adapter, authmode, psecuritypriv->supplicant_ie);
#ifdef CONFIG_DRVEXT_MODULE
drvext_report_sec_ie(&adapter->drvextpriv, authmode, sec_ie);
#endif
} }
iEntry = SecIsInPMKIDList(adapter, pmlmepriv->assoc_bssid); iEntry = SecIsInPMKIDList(adapter, pmlmepriv->assoc_bssid);

9
include/drv_types.h
View file

@ -68,11 +68,6 @@ typedef struct _ADAPTER _adapter, ADAPTER,*PADAPTER;
#include <rtw_mlme_ext.h> #include <rtw_mlme_ext.h>
#include <rtw_p2p.h> #include <rtw_p2p.h>
#include <rtw_ap.h> #include <rtw_ap.h>
#ifdef CONFIG_DRVEXT_MODULE
#include <drvext_api.h>
#endif
#include <rtw_mp.h> #include <rtw_mp.h>
#include <rtw_br_ext.h> #include <rtw_br_ext.h>
@ -308,10 +303,6 @@ struct _ADAPTER{
#endif #endif
struct mp_priv mppriv; struct mp_priv mppriv;
#ifdef CONFIG_DRVEXT_MODULE
struct drvext_priv drvextpriv;
#endif
#ifdef CONFIG_AP_MODE #ifdef CONFIG_AP_MODE
struct hostapd_priv *phostapdpriv; struct hostapd_priv *phostapdpriv;
#endif #endif

97
os_dep/ioctl_linux.c
View file

@ -2949,104 +2949,7 @@ static int rtw_wx_set_mtk_wps_ie(struct net_device *dev,
static int rtw_drvext_hdl(struct net_device *dev, struct iw_request_info *info, static int rtw_drvext_hdl(struct net_device *dev, struct iw_request_info *info,
union iwreq_data *wrqu, char *extra) union iwreq_data *wrqu, char *extra)
{ {
#ifdef CONFIG_DRVEXT_MODULE
u8 res;
struct drvext_handler *phandler;
struct drvext_oidparam *poidparam;
int ret;
u16 len;
u8 *pparmbuf, bset;
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
struct iw_point *p = &wrqu->data;
if ((!p->length) || (!p->pointer)){
ret = -EINVAL;
goto _rtw_drvext_hdl_exit;
}
bset = (u8)(p->flags&0xFFFF);
len = p->length;
pparmbuf = (u8*)rtw_malloc(len);
if (pparmbuf == NULL){
ret = -ENOMEM;
goto _rtw_drvext_hdl_exit;
}
if (bset)//set info
{
if (copy_from_user(pparmbuf, p->pointer,len)) {
rtw_mfree(pparmbuf, len);
ret = -EFAULT;
goto _rtw_drvext_hdl_exit;
}
}
else//query info
{
}
//
poidparam = (struct drvext_oidparam *)pparmbuf;
RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_info_,("drvext set oid subcode [%d], len[%d], InformationBufferLength[%d]\r\n",
poidparam->subcode, poidparam->len, len));
//check subcode
if (poidparam->subcode >= MAX_DRVEXT_HANDLERS)
{
RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_err_,("no matching drvext handlers\r\n"));
ret = -EINVAL;
goto _rtw_drvext_hdl_exit;
}
if (poidparam->subcode >= MAX_DRVEXT_OID_SUBCODES)
{
RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_err_,("no matching drvext subcodes\r\n"));
ret = -EINVAL;
goto _rtw_drvext_hdl_exit;
}
phandler = drvextoidhandlers + poidparam->subcode;
if (poidparam->len != phandler->parmsize)
{
RT_TRACE(_module_rtl871x_ioctl_os_c,_drv_err_,("no matching drvext param size %d vs %d\r\n",
poidparam->len , phandler->parmsize));
ret = -EINVAL;
goto _rtw_drvext_hdl_exit;
}
res = phandler->handler(&padapter->drvextpriv, bset, poidparam->data);
if (res==0)
{
ret = 0;
if (bset == 0x00) {//query info
//_rtw_memcpy(p->pointer, pparmbuf, len);
if (copy_to_user(p->pointer, pparmbuf, len))
ret = -EFAULT;
}
}
else
ret = -EFAULT;
_rtw_drvext_hdl_exit:
return ret;
#endif
return 0; return 0;
} }
static void rtw_dbg_mode_hdl(_adapter *padapter, u32 id, u8 *pdata, u32 len) static void rtw_dbg_mode_hdl(_adapter *padapter, u32 id, u8 *pdata, u32 len)

9
os_dep/os_intfs.c
View file

@ -1188,10 +1188,6 @@ u8 rtw_free_drv_sw(_adapter *padapter)
rtw_free_pwrctrl_priv(padapter); rtw_free_pwrctrl_priv(padapter);
#ifdef CONFIG_DRVEXT_MODULE
free_drvext(&padapter->drvextpriv);
#endif
rtw_hal_free_data(padapter); rtw_hal_free_data(padapter);
RT_TRACE(_module_os_intfs_c_,_drv_info_,("<==rtw_free_drv_sw\n")); RT_TRACE(_module_os_intfs_c_,_drv_info_,("<==rtw_free_drv_sw\n"));
@ -1294,11 +1290,6 @@ int _netdev_open(struct net_device *pnetdev)
pr_info("can't init mlme_ext_priv\n"); pr_info("can't init mlme_ext_priv\n");
goto netdev_open_error; goto netdev_open_error;
} }
#ifdef CONFIG_DRVEXT_MODULE
init_drvext(padapter);
#endif
if (padapter->intf_start) if (padapter->intf_start)
padapter->intf_start(padapter); padapter->intf_start(padapter);
rtw_proc_init_one(pnetdev); rtw_proc_init_one(pnetdev);

7
os_dep/recv_linux.c
View file

@ -155,13 +155,6 @@ _func_enter_;
precvpriv = &(padapter->recvpriv); precvpriv = &(padapter->recvpriv);
pfree_recv_queue = &(precvpriv->free_recv_queue); pfree_recv_queue = &(precvpriv->free_recv_queue);
#ifdef CONFIG_DRVEXT_MODULE
if (drvext_rx_handler(padapter, precv_frame->u.hdr.rx_data, precv_frame->u.hdr.len) == _SUCCESS)
{
goto _recv_indicatepkt_drop;
}
#endif
skb = precv_frame->u.hdr.pkt; skb = precv_frame->u.hdr.pkt;
if (skb == NULL) { if (skb == NULL) {
RT_TRACE(_module_recv_osdep_c_,_drv_err_,("rtw_recv_indicatepkt():skb==NULL something wrong!!!!\n")); RT_TRACE(_module_recv_osdep_c_,_drv_err_,("rtw_recv_indicatepkt():skb==NULL something wrong!!!!\n"));