From dfe35fb489ea71e82cc230f24d3df457b04733ec Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Sun, 21 Jul 2013 13:00:05 -0500 Subject: [PATCH] rtl8188eu: Remove CONFIG_USB_VENDOR_REQ_MUTEX - not selected This change made include/drv_conf.h and core/rtw_ioctl_query.c redundant. Signed-off-by: Larry Finger --- Makefile | 1 - core/rtw_ap.c | 1 - core/rtw_br_ext.c | 1 - core/rtw_cmd.c | 1 - core/rtw_efuse.c | 1 - core/rtw_io.c | 1 - core/rtw_ioctl_query.c | 26 -------------------------- core/rtw_ioctl_set.c | 1 - core/rtw_mlme.c | 1 - core/rtw_mlme_ext.c | 1 - core/rtw_mp_ioctl.c | 1 - core/rtw_pwrctrl.c | 1 - core/rtw_recv.c | 2 +- core/rtw_rf.c | 1 - core/rtw_security.c | 1 - core/rtw_sta_mgt.c | 1 - core/rtw_wlan_util.c | 1 - core/rtw_xmit.c | 1 - hal/hal_com.c | 1 - hal/hal_intf.c | 1 - hal/rtl8188e_cmd.c | 1 - hal/rtl8188e_dm.c | 1 - hal/rtl8188e_phycfg.c | 1 - hal/rtl8188e_rf6052.c | 1 - hal/rtl8188e_rxdesc.c | 1 - hal/rtl8188e_xmit.c | 1 - hal/rtl8188eu_led.c | 1 - hal/rtl8188eu_recv.c | 1 - hal/rtl8188eu_xmit.c | 1 - hal/usb_halinit.c | 1 - hal/usb_ops_linux.c | 7 ------- include/basic_types.h | 3 --- include/cmd_osdep.h | 2 -- include/drv_conf.h | 34 ---------------------------------- include/drv_types.h | 2 +- include/hal_intf.h | 1 - include/ieee80211.h | 1 - include/ieee80211_ext.h | 1 - include/mlme_osdep.h | 1 - include/nic_spec.h | 2 -- include/odm_precomp.h | 1 - include/osdep_intf.h | 1 - include/osdep_service.h | 1 - include/recv_osdep.h | 1 - include/rtl8188e_led.h | 1 - include/rtl8188e_spec.h | 2 -- include/rtl8188e_sreset.h | 1 - include/rtw_ap.h | 2 -- include/rtw_cmd.h | 1 - include/rtw_debug.h | 1 - include/rtw_eeprom.h | 1 - include/rtw_efuse.h | 1 - include/rtw_event.h | 2 +- include/rtw_ht.h | 1 - include/rtw_io.h | 1 - include/rtw_ioctl.h | 1 - include/rtw_ioctl_query.h | 1 - include/rtw_ioctl_rtl.h | 1 - include/rtw_ioctl_set.h | 1 - include/rtw_iol.h | 1 - include/rtw_led.h | 1 - include/rtw_mlme.h | 1 - include/rtw_mlme_ext.h | 1 - include/rtw_mp_ioctl.h | 2 -- include/rtw_pwrctrl.h | 1 - include/rtw_qos.h | 12 +----------- include/rtw_recv.h | 1 - include/rtw_rf.h | 1 - include/rtw_security.h | 3 --- include/rtw_sreset.h | 1 - include/rtw_xmit.h | 1 - include/sta_info.h | 1 - include/usb_ops.h | 1 - include/usb_osintf.h | 1 - include/xmit_osdep.h | 1 - os_dep/ioctl_linux.c | 1 - os_dep/mlme_linux.c | 1 - os_dep/os_intfs.c | 2 -- os_dep/osdep_service.c | 1 - os_dep/recv_linux.c | 1 - os_dep/usb_intf.c | 6 ------ os_dep/xmit_linux.c | 1 - 82 files changed, 4 insertions(+), 171 deletions(-) delete mode 100644 core/rtw_ioctl_query.c delete mode 100644 include/drv_conf.h diff --git a/Makefile b/Makefile index b4b04ca..6085cdc 100644 --- a/Makefile +++ b/Makefile @@ -139,7 +139,6 @@ rtk_core := \ core/rtw_efuse.o \ core/rtw_ieee80211.o \ core/rtw_io.o \ - core/rtw_ioctl_query.o \ core/rtw_ioctl_set.o \ core/rtw_iol.o \ core/rtw_led.o \ diff --git a/core/rtw_ap.c b/core/rtw_ap.c index b7681f0..5857e75 100644 --- a/core/rtw_ap.c +++ b/core/rtw_ap.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _RTW_AP_C_ -#include #include #include #include diff --git a/core/rtw_br_ext.c b/core/rtw_br_ext.c index c019fcb..39ee384 100644 --- a/core/rtw_br_ext.c +++ b/core/rtw_br_ext.c @@ -28,7 +28,6 @@ #include #endif -#include #include #include "rtw_br_ext.h" #include diff --git a/core/rtw_cmd.c b/core/rtw_cmd.c index 9e46906..228eaa9 100644 --- a/core/rtw_cmd.c +++ b/core/rtw_cmd.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _RTW_CMD_C_ -#include #include #include #include diff --git a/core/rtw_efuse.c b/core/rtw_efuse.c index 952676f..6f1ac34 100644 --- a/core/rtw_efuse.c +++ b/core/rtw_efuse.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _RTW_EFUSE_C_ -#include #include #include #include diff --git a/core/rtw_io.c b/core/rtw_io.c index 858bc01..cb0db8a 100644 --- a/core/rtw_io.c +++ b/core/rtw_io.c @@ -40,7 +40,6 @@ jackson@realtek.com.tw */ #define _RTW_IO_C_ -#include #include #include #include diff --git a/core/rtw_ioctl_query.c b/core/rtw_ioctl_query.c deleted file mode 100644 index 53e6c67..0000000 --- a/core/rtw_ioctl_query.c +++ /dev/null @@ -1,26 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - * - ******************************************************************************/ -#define _RTW_IOCTL_QUERY_C_ - -#include -#include -#include -#include -#include diff --git a/core/rtw_ioctl_set.c b/core/rtw_ioctl_set.c index 023a272..d655c65 100644 --- a/core/rtw_ioctl_set.c +++ b/core/rtw_ioctl_set.c @@ -20,7 +20,6 @@ #define _RTW_IOCTL_SET_C_ -#include #include #include #include diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index 561e6f6..f42f959 100644 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -20,7 +20,6 @@ #define _RTW_MLME_C_ -#include #include #include #include diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index edd5040..7165979 100644 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _RTW_MLME_EXT_C_ -#include #include #include #include diff --git a/core/rtw_mp_ioctl.c b/core/rtw_mp_ioctl.c index dcff240..8a9e2dd 100644 --- a/core/rtw_mp_ioctl.c +++ b/core/rtw_mp_ioctl.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _RTW_MP_IOCTL_C_ -#include #include #include #include diff --git a/core/rtw_pwrctrl.c b/core/rtw_pwrctrl.c index 3467fa4..aa4841c 100644 --- a/core/rtw_pwrctrl.c +++ b/core/rtw_pwrctrl.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _RTW_PWRCTRL_C_ -#include #include #include #include diff --git a/core/rtw_recv.c b/core/rtw_recv.c index 3f71b55..e65a43f 100644 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -18,7 +18,7 @@ * ******************************************************************************/ #define _RTW_RECV_C_ -#include + #include #include #include diff --git a/core/rtw_rf.c b/core/rtw_rf.c index 9ed9a43..0ad993a 100644 --- a/core/rtw_rf.c +++ b/core/rtw_rf.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _RTW_RF_C_ -#include #include #include #include diff --git a/core/rtw_security.c b/core/rtw_security.c index 127bcaa..2638c52 100644 --- a/core/rtw_security.c +++ b/core/rtw_security.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _RTW_SECURITY_C_ -#include #include #include #include diff --git a/core/rtw_sta_mgt.c b/core/rtw_sta_mgt.c index 4f5f6c5..fd7b945 100644 --- a/core/rtw_sta_mgt.c +++ b/core/rtw_sta_mgt.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _RTW_STA_MGT_C_ -#include #include #include #include diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c index 9a9e76c..b3cabd1 100644 --- a/core/rtw_wlan_util.c +++ b/core/rtw_wlan_util.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _RTW_WLAN_UTIL_C_ -#include #include #include #include diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index 19e6beb..4a323e2 100644 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _RTW_XMIT_C_ -#include #include #include #include diff --git a/hal/hal_com.c b/hal/hal_com.c index edef44e..e2efcba 100644 --- a/hal/hal_com.c +++ b/hal/hal_com.c @@ -17,7 +17,6 @@ * * ******************************************************************************/ -#include #include #include diff --git a/hal/hal_intf.c b/hal/hal_intf.c index f379c78..3d61c4d 100644 --- a/hal/hal_intf.c +++ b/hal/hal_intf.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _HAL_INTF_C_ -#include #include #include #include diff --git a/hal/rtl8188e_cmd.c b/hal/rtl8188e_cmd.c index cd1dabd..7054aac 100644 --- a/hal/rtl8188e_cmd.c +++ b/hal/rtl8188e_cmd.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _RTL8188E_CMD_C_ -#include #include #include #include diff --git a/hal/rtl8188e_dm.c b/hal/rtl8188e_dm.c index 945ac00..8229fdb 100644 --- a/hal/rtl8188e_dm.c +++ b/hal/rtl8188e_dm.c @@ -29,7 +29,6 @@ /* */ /* include files */ /* */ -#include #include #include diff --git a/hal/rtl8188e_phycfg.c b/hal/rtl8188e_phycfg.c index 72383d7..47b7250 100644 --- a/hal/rtl8188e_phycfg.c +++ b/hal/rtl8188e_phycfg.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _RTL8188E_PHYCFG_C_ -#include #include #include #include diff --git a/hal/rtl8188e_rf6052.c b/hal/rtl8188e_rf6052.c index 7a0a14a..1c7bf4f 100644 --- a/hal/rtl8188e_rf6052.c +++ b/hal/rtl8188e_rf6052.c @@ -41,7 +41,6 @@ #define _RTL8188E_RF6052_C_ -#include #include #include diff --git a/hal/rtl8188e_rxdesc.c b/hal/rtl8188e_rxdesc.c index 51377af..494ae1d 100644 --- a/hal/rtl8188e_rxdesc.c +++ b/hal/rtl8188e_rxdesc.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _RTL8188E_REDESC_C_ -#include #include #include #include diff --git a/hal/rtl8188e_xmit.c b/hal/rtl8188e_xmit.c index 6175657..4c0b12d 100644 --- a/hal/rtl8188e_xmit.c +++ b/hal/rtl8188e_xmit.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _RTL8188E_XMIT_C_ -#include #include #include #include diff --git a/hal/rtl8188eu_led.c b/hal/rtl8188eu_led.c index 15f8ea3..1600332 100644 --- a/hal/rtl8188eu_led.c +++ b/hal/rtl8188eu_led.c @@ -18,7 +18,6 @@ * ******************************************************************************/ -#include #include #include #include diff --git a/hal/rtl8188eu_recv.c b/hal/rtl8188eu_recv.c index d4810ab..0851ffe 100644 --- a/hal/rtl8188eu_recv.c +++ b/hal/rtl8188eu_recv.c @@ -18,7 +18,6 @@ * ******************************************************************************/ #define _RTL8188EU_RECV_C_ -#include #include #include #include diff --git a/hal/rtl8188eu_xmit.c b/hal/rtl8188eu_xmit.c index cf10a8c..fb2ee45 100644 --- a/hal/rtl8188eu_xmit.c +++ b/hal/rtl8188eu_xmit.c @@ -18,7 +18,6 @@ * ******************************************************************************/ #define _RTL8188E_XMIT_C_ -#include #include #include #include diff --git a/hal/usb_halinit.c b/hal/usb_halinit.c index ba4feb5..b2674e1 100644 --- a/hal/usb_halinit.c +++ b/hal/usb_halinit.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _HCI_HAL_INIT_C_ -#include #include #include #include diff --git a/hal/usb_ops_linux.c b/hal/usb_ops_linux.c index 24f656f..21728b8 100644 --- a/hal/usb_ops_linux.c +++ b/hal/usb_ops_linux.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _HCI_OPS_OS_C_ -#include #include #include #include @@ -59,10 +58,7 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u goto exit; } - #ifdef CONFIG_USB_VENDOR_REQ_MUTEX _enter_critical_mutex(&pdvobjpriv->usb_vendor_req_mutex, NULL); - #endif - /* Acquire IO memory for vendorreq */ #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC @@ -157,12 +153,9 @@ static int usbctrl_vendorreq(struct intf_hdl *pintfhdl, u8 request, u16 value, u #endif release_mutex: - #ifdef CONFIG_USB_VENDOR_REQ_MUTEX _exit_critical_mutex(&pdvobjpriv->usb_vendor_req_mutex, NULL); - #endif exit: return status; - } static u8 usb_read8(struct intf_hdl *pintfhdl, u32 addr) diff --git a/include/basic_types.h b/include/basic_types.h index 83ecd34..80abd32 100644 --- a/include/basic_types.h +++ b/include/basic_types.h @@ -20,9 +20,6 @@ #ifndef __BASIC_TYPES_H__ #define __BASIC_TYPES_H__ -#include - - #define SUCCESS 0 #define FAIL (-1) diff --git a/include/cmd_osdep.h b/include/cmd_osdep.h index c4903f4..75a5852 100644 --- a/include/cmd_osdep.h +++ b/include/cmd_osdep.h @@ -20,8 +20,6 @@ #ifndef __CMD_OSDEP_H_ #define __CMD_OSDEP_H_ - -#include #include #include diff --git a/include/drv_conf.h b/include/drv_conf.h deleted file mode 100644 index f3dfee2..0000000 --- a/include/drv_conf.h +++ /dev/null @@ -1,34 +0,0 @@ -/****************************************************************************** - * - * Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of version 2 of the GNU General Public License as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA - * - * - ******************************************************************************/ -#ifndef __DRV_CONF_H__ -#define __DRV_CONF_H__ -#include "autoconf.h" - -//About USB VENDOR REQ -#if defined(CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC) && !defined(CONFIG_USB_VENDOR_REQ_MUTEX) - #warning "define CONFIG_USB_VENDOR_REQ_MUTEX for CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC automatically" - #define CONFIG_USB_VENDOR_REQ_MUTEX -#endif -#if defined(CONFIG_VENDOR_REQ_RETRY) && !defined(CONFIG_USB_VENDOR_REQ_MUTEX) - #warning "define CONFIG_USB_VENDOR_REQ_MUTEX for CONFIG_VENDOR_REQ_RETRY automatically" - #define CONFIG_USB_VENDOR_REQ_MUTEX -#endif - -#endif // __DRV_CONF_H__ diff --git a/include/drv_types.h b/include/drv_types.h index 41cf7ca..31af77f 100644 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -27,7 +27,7 @@ #ifndef __DRV_TYPES_H__ #define __DRV_TYPES_H__ -#include +#include #include #include #include diff --git a/include/hal_intf.h b/include/hal_intf.h index 5b5d5c8..2c6e3a3 100644 --- a/include/hal_intf.h +++ b/include/hal_intf.h @@ -20,7 +20,6 @@ #ifndef __HAL_INTF_H__ #define __HAL_INTF_H__ -#include #include #include #include diff --git a/include/ieee80211.h b/include/ieee80211.h index 6f91368..c393ef6 100644 --- a/include/ieee80211.h +++ b/include/ieee80211.h @@ -20,7 +20,6 @@ #ifndef __IEEE80211_H #define __IEEE80211_H -#include #include #include #include "wifi.h" diff --git a/include/ieee80211_ext.h b/include/ieee80211_ext.h index b133f84..8eedc63 100644 --- a/include/ieee80211_ext.h +++ b/include/ieee80211_ext.h @@ -20,7 +20,6 @@ #ifndef __IEEE80211_EXT_H #define __IEEE80211_EXT_H -#include #include #include diff --git a/include/mlme_osdep.h b/include/mlme_osdep.h index 1a0901d..bf7c86f 100644 --- a/include/mlme_osdep.h +++ b/include/mlme_osdep.h @@ -20,7 +20,6 @@ #ifndef __MLME_OSDEP_H_ #define __MLME_OSDEP_H_ -#include #include #include diff --git a/include/nic_spec.h b/include/nic_spec.h index fba5e56..f205681 100644 --- a/include/nic_spec.h +++ b/include/nic_spec.h @@ -22,8 +22,6 @@ #ifndef __NIC_SPEC_H__ #define __NIC_SPEC_H__ -#include - #define RTL8711_MCTRL_ (0x20000) #define RTL8711_UART_ (0x30000) #define RTL8711_TIMER_ (0x40000) diff --git a/include/odm_precomp.h b/include/odm_precomp.h index b831dea..e759955 100644 --- a/include/odm_precomp.h +++ b/include/odm_precomp.h @@ -27,7 +27,6 @@ //2 Config Flags and Structs - defined by each ODM Type -#include #include #include #include diff --git a/include/osdep_intf.h b/include/osdep_intf.h index bb6284f..5eb5e1c 100644 --- a/include/osdep_intf.h +++ b/include/osdep_intf.h @@ -21,7 +21,6 @@ #ifndef __OSDEP_INTF_H_ #define __OSDEP_INTF_H_ -#include #include #include diff --git a/include/osdep_service.h b/include/osdep_service.h index f96a0b5..1bdc7b6 100644 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -20,7 +20,6 @@ #ifndef __OSDEP_SERVICE_H_ #define __OSDEP_SERVICE_H_ -#include #include #define _FAIL 0 diff --git a/include/recv_osdep.h b/include/recv_osdep.h index 78baa0b..a5ac680 100644 --- a/include/recv_osdep.h +++ b/include/recv_osdep.h @@ -20,7 +20,6 @@ #ifndef __RECV_OSDEP_H_ #define __RECV_OSDEP_H_ -#include #include #include diff --git a/include/rtl8188e_led.h b/include/rtl8188e_led.h index 5ef4728..0baa3e2 100644 --- a/include/rtl8188e_led.h +++ b/include/rtl8188e_led.h @@ -20,7 +20,6 @@ #ifndef __RTL8188E_LED_H__ #define __RTL8188E_LED_H__ -#include #include #include diff --git a/include/rtl8188e_spec.h b/include/rtl8188e_spec.h index 5722948..95d7462 100644 --- a/include/rtl8188e_spec.h +++ b/include/rtl8188e_spec.h @@ -19,8 +19,6 @@ #ifndef __RTL8188E_SPEC_H__ #define __RTL8188E_SPEC_H__ -#include - #ifndef BIT #define BIT(x) (1 << (x)) #endif diff --git a/include/rtl8188e_sreset.h b/include/rtl8188e_sreset.h index bee98be..d6705a4 100644 --- a/include/rtl8188e_sreset.h +++ b/include/rtl8188e_sreset.h @@ -20,7 +20,6 @@ #ifndef _RTL8188E_SRESET_H_ #define _RTL8188E_SRESET_H_ -#include #include #include #include diff --git a/include/rtw_ap.h b/include/rtw_ap.h index 882fe98..816fe37 100644 --- a/include/rtw_ap.h +++ b/include/rtw_ap.h @@ -20,11 +20,9 @@ #ifndef __RTW_AP_H_ #define __RTW_AP_H_ -#include #include #include - #ifdef CONFIG_AP_MODE //external function diff --git a/include/rtw_cmd.h b/include/rtw_cmd.h index d46426e..4c25fc0 100644 --- a/include/rtw_cmd.h +++ b/include/rtw_cmd.h @@ -20,7 +20,6 @@ #ifndef __RTW_CMD_H_ #define __RTW_CMD_H_ -#include #include #include #include diff --git a/include/rtw_debug.h b/include/rtw_debug.h index 6387245..baa5c4c 100644 --- a/include/rtw_debug.h +++ b/include/rtw_debug.h @@ -20,7 +20,6 @@ #ifndef __RTW_DEBUG_H__ #define __RTW_DEBUG_H__ -#include #include #include diff --git a/include/rtw_eeprom.h b/include/rtw_eeprom.h index 5a70efb..e9a233d 100644 --- a/include/rtw_eeprom.h +++ b/include/rtw_eeprom.h @@ -20,7 +20,6 @@ #ifndef __RTW_EEPROM_H__ #define __RTW_EEPROM_H__ -#include #include #include diff --git a/include/rtw_efuse.h b/include/rtw_efuse.h index 90de744..de31601 100644 --- a/include/rtw_efuse.h +++ b/include/rtw_efuse.h @@ -20,7 +20,6 @@ #ifndef __RTW_EFUSE_H__ #define __RTW_EFUSE_H__ -#include #include #define EFUSE_ERROE_HANDLE 1 diff --git a/include/rtw_event.h b/include/rtw_event.h index c77220c..1491f60 100644 --- a/include/rtw_event.h +++ b/include/rtw_event.h @@ -19,7 +19,7 @@ ******************************************************************************/ #ifndef _RTW_EVENT_H_ #define _RTW_EVENT_H_ -#include + #include #include diff --git a/include/rtw_ht.h b/include/rtw_ht.h index 74e416d..1838ada 100644 --- a/include/rtw_ht.h +++ b/include/rtw_ht.h @@ -20,7 +20,6 @@ #ifndef _RTW_HT_H_ #define _RTW_HT_H_ -#include #include #include "wifi.h" diff --git a/include/rtw_io.h b/include/rtw_io.h index 84e16a6..fa08f60 100644 --- a/include/rtw_io.h +++ b/include/rtw_io.h @@ -21,7 +21,6 @@ #ifndef _RTW_IO_H_ #define _RTW_IO_H_ -#include #include #include diff --git a/include/rtw_ioctl.h b/include/rtw_ioctl.h index d34dc5c..b474dff 100644 --- a/include/rtw_ioctl.h +++ b/include/rtw_ioctl.h @@ -20,7 +20,6 @@ #ifndef _RTW_IOCTL_H_ #define _RTW_IOCTL_H_ -#include #include #include diff --git a/include/rtw_ioctl_query.h b/include/rtw_ioctl_query.h index 1f0dc13..c4156f6 100644 --- a/include/rtw_ioctl_query.h +++ b/include/rtw_ioctl_query.h @@ -20,7 +20,6 @@ #ifndef _RTW_IOCTL_QUERY_H_ #define _RTW_IOCTL_QUERY_H_ -#include #include #endif diff --git a/include/rtw_ioctl_rtl.h b/include/rtw_ioctl_rtl.h index c017006..dfb7c29 100644 --- a/include/rtw_ioctl_rtl.h +++ b/include/rtw_ioctl_rtl.h @@ -20,7 +20,6 @@ #ifndef _RTW_IOCTL_RTL_H_ #define _RTW_IOCTL_RTL_H_ -#include #include #include diff --git a/include/rtw_ioctl_set.h b/include/rtw_ioctl_set.h index eca22cb..c469824 100644 --- a/include/rtw_ioctl_set.h +++ b/include/rtw_ioctl_set.h @@ -20,7 +20,6 @@ #ifndef __RTW_IOCTL_SET_H_ #define __RTW_IOCTL_SET_H_ -#include #include diff --git a/include/rtw_iol.h b/include/rtw_iol.h index 4ed67db..49bb34e 100644 --- a/include/rtw_iol.h +++ b/include/rtw_iol.h @@ -20,7 +20,6 @@ #ifndef __RTW_IOL_H_ #define __RTW_IOL_H_ -#include #include #include struct xmit_frame *rtw_IOL_accquire_xmit_frame(ADAPTER *adapter); diff --git a/include/rtw_led.h b/include/rtw_led.h index d35e4d2..6530608 100644 --- a/include/rtw_led.h +++ b/include/rtw_led.h @@ -20,7 +20,6 @@ #ifndef __RTW_LED_H_ #define __RTW_LED_H_ -#include #include #include diff --git a/include/rtw_mlme.h b/include/rtw_mlme.h index ea9d2ed..940a311 100644 --- a/include/rtw_mlme.h +++ b/include/rtw_mlme.h @@ -20,7 +20,6 @@ #ifndef __RTW_MLME_H_ #define __RTW_MLME_H_ -#include #include #include #include diff --git a/include/rtw_mlme_ext.h b/include/rtw_mlme_ext.h index fcca44e..65b4fec 100644 --- a/include/rtw_mlme_ext.h +++ b/include/rtw_mlme_ext.h @@ -20,7 +20,6 @@ #ifndef __RTW_MLME_EXT_H_ #define __RTW_MLME_EXT_H_ -#include #include #include #include diff --git a/include/rtw_mp_ioctl.h b/include/rtw_mp_ioctl.h index ca72ec2..d9a512f 100644 --- a/include/rtw_mp_ioctl.h +++ b/include/rtw_mp_ioctl.h @@ -20,8 +20,6 @@ #ifndef _RTW_MP_IOCTL_H_ #define _RTW_MP_IOCTL_H_ -//#include -//#include #include #include #include diff --git a/include/rtw_pwrctrl.h b/include/rtw_pwrctrl.h index 1dc9b8d..e9cdb17 100644 --- a/include/rtw_pwrctrl.h +++ b/include/rtw_pwrctrl.h @@ -20,7 +20,6 @@ #ifndef __RTW_PWRCTRL_H_ #define __RTW_PWRCTRL_H_ -#include #include #include diff --git a/include/rtw_qos.h b/include/rtw_qos.h index bd15f93..e063aaa 100644 --- a/include/rtw_qos.h +++ b/include/rtw_qos.h @@ -17,23 +17,13 @@ * * ******************************************************************************/ - - #ifndef _RTW_QOS_H_ #define _RTW_QOS_H_ -#include + #include - - - - - struct qos_priv { - unsigned int qos_option; //bit mask option: u-apsd, s-apsd, ts, block ack... - }; - #endif //_RTL871X_QOS_H_ diff --git a/include/rtw_recv.h b/include/rtw_recv.h index 707cc4f..e3e111d 100644 --- a/include/rtw_recv.h +++ b/include/rtw_recv.h @@ -20,7 +20,6 @@ #ifndef _RTW_RECV_H_ #define _RTW_RECV_H_ -#include #include #include diff --git a/include/rtw_rf.h b/include/rtw_rf.h index 3df1b7b..578ac9b 100644 --- a/include/rtw_rf.h +++ b/include/rtw_rf.h @@ -20,7 +20,6 @@ #ifndef __RTW_RF_H_ #define __RTW_RF_H_ -#include #include #define OFDM_PHY 1 diff --git a/include/rtw_security.h b/include/rtw_security.h index acd37f1..d691d36 100644 --- a/include/rtw_security.h +++ b/include/rtw_security.h @@ -20,12 +20,9 @@ #ifndef __RTW_SECURITY_H_ #define __RTW_SECURITY_H_ - -#include #include #include - #define _NO_PRIVACY_ 0x0 #define _WEP40_ 0x1 #define _TKIP_ 0x2 diff --git a/include/rtw_sreset.h b/include/rtw_sreset.h index 583b719..1cbe3c5 100644 --- a/include/rtw_sreset.h +++ b/include/rtw_sreset.h @@ -20,7 +20,6 @@ #ifndef _RTW_SRESET_C_ #define _RTW_SRESET_C_ -#include #include #include diff --git a/include/rtw_xmit.h b/include/rtw_xmit.h index 7095689..8ded4cb 100644 --- a/include/rtw_xmit.h +++ b/include/rtw_xmit.h @@ -20,7 +20,6 @@ #ifndef _RTW_XMIT_H_ #define _RTW_XMIT_H_ -#include #include #include diff --git a/include/sta_info.h b/include/sta_info.h index ed424fe..99abb14 100644 --- a/include/sta_info.h +++ b/include/sta_info.h @@ -20,7 +20,6 @@ #ifndef __STA_INFO_H_ #define __STA_INFO_H_ -#include #include #include #include diff --git a/include/usb_ops.h b/include/usb_ops.h index b13d7eb..10fa672 100644 --- a/include/usb_ops.h +++ b/include/usb_ops.h @@ -20,7 +20,6 @@ #ifndef __USB_OPS_H_ #define __USB_OPS_H_ -#include #include #include #include diff --git a/include/usb_osintf.h b/include/usb_osintf.h index 1889c7c..8ea969b 100644 --- a/include/usb_osintf.h +++ b/include/usb_osintf.h @@ -20,7 +20,6 @@ #ifndef __USB_OSINTF_H #define __USB_OSINTF_H -#include #include #include #include diff --git a/include/xmit_osdep.h b/include/xmit_osdep.h index f549272..af5ac2d 100644 --- a/include/xmit_osdep.h +++ b/include/xmit_osdep.h @@ -20,7 +20,6 @@ #ifndef __XMIT_OSDEP_H_ #define __XMIT_OSDEP_H_ -#include #include #include diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index d70689a..2bb8bda 100644 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _IOCTL_LINUX_C_ -#include #include #include #include diff --git a/os_dep/mlme_linux.c b/os_dep/mlme_linux.c index 23efec2..4eda216 100644 --- a/os_dep/mlme_linux.c +++ b/os_dep/mlme_linux.c @@ -21,7 +21,6 @@ #define _MLME_OSDEP_C_ -#include #include #include #include diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c index 3e061b9..3406a89 100644 --- a/os_dep/os_intfs.c +++ b/os_dep/os_intfs.c @@ -19,8 +19,6 @@ ******************************************************************************/ #define _OS_INTFS_C_ -#include - #include #include #include diff --git a/os_dep/osdep_service.c b/os_dep/osdep_service.c index 1e201ce..d0813c2 100644 --- a/os_dep/osdep_service.c +++ b/os_dep/osdep_service.c @@ -21,7 +21,6 @@ #define _OSDEP_SERVICE_C_ -#include #include #include #include diff --git a/os_dep/recv_linux.c b/os_dep/recv_linux.c index e77d8c3..abff5c1 100644 --- a/os_dep/recv_linux.c +++ b/os_dep/recv_linux.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _RECV_OSDEP_C_ -#include #include #include diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c index edf23bc..bea54f6 100644 --- a/os_dep/usb_intf.c +++ b/os_dep/usb_intf.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _HCI_INTF_C_ -#include #include #include #include @@ -200,10 +199,7 @@ static u8 rtw_init_intf_priv(struct dvobj_priv *dvobj) { u8 rst = _SUCCESS; - #ifdef CONFIG_USB_VENDOR_REQ_MUTEX _rtw_mutex_init(&dvobj->usb_vendor_req_mutex); - #endif - #ifdef CONFIG_USB_VENDOR_REQ_BUFFER_PREALLOC dvobj->usb_alloc_vendor_req_buf = rtw_zmalloc(MAX_USB_IO_CTL_SIZE); @@ -230,9 +226,7 @@ static u8 rtw_deinit_intf_priv(struct dvobj_priv *dvobj) rtw_mfree(dvobj->usb_alloc_vendor_req_buf, MAX_USB_IO_CTL_SIZE); #endif - #ifdef CONFIG_USB_VENDOR_REQ_MUTEX _rtw_mutex_free(&dvobj->usb_vendor_req_mutex); - #endif return rst; } diff --git a/os_dep/xmit_linux.c b/os_dep/xmit_linux.c index ff56171..43b9fa9 100644 --- a/os_dep/xmit_linux.c +++ b/os_dep/xmit_linux.c @@ -19,7 +19,6 @@ ******************************************************************************/ #define _XMIT_OSDEP_C_ -#include #include #include