diff --git a/Kconfig b/Kconfig index 013175c..d0bbdb6 100644 --- a/Kconfig +++ b/Kconfig @@ -1,6 +1,6 @@ -config RTL8188EU +config RTL8188EUS tristate "Realtek 8188E USB WiFi" depends on USB ---help--- - Help message of RTL8188EU + Help message of RTL8188EUS diff --git a/Makefile b/Makefile index 6d24501..40abaa2 100755 --- a/Makefile +++ b/Makefile @@ -2129,4 +2129,3 @@ clean: rm -fr *.mod.c *.mod *.o .*.cmd *.ko *~ rm -fr .tmp_versions endif - diff --git a/dkms-install.sh b/dkms-install.sh index 19b60b9..51be274 100755 --- a/dkms-install.sh +++ b/dkms-install.sh @@ -8,7 +8,7 @@ else fi DRV_DIR=rtl8188eus -DRV_NAME=rtl8188eus +DRV_NAME=8188eus DRV_VERSION=5.3.9 cp -r ../${DRV_DIR} /usr/src/${DRV_NAME}-${DRV_VERSION} diff --git a/dkms-remove.sh b/dkms-remove.sh index bc6163b..0e09f45 100755 --- a/dkms-remove.sh +++ b/dkms-remove.sh @@ -8,7 +8,7 @@ else fi DRV_DIR=rtl8188eus -DRV_NAME=rtl8188eus +DRV_NAME=8188eus DRV_VERSION=5.3.9 dkms remove ${DRV_NAME}/${DRV_VERSION} --all diff --git a/dkms.conf b/dkms.conf index 8738b39..5024dc3 100644 --- a/dkms.conf +++ b/dkms.conf @@ -1,7 +1,7 @@ PACKAGE_NAME="realtek-rtl8188eus" PACKAGE_VERSION="5.3.9~20191129" CLEAN="'make' clean" -BUILT_MODULE_NAME[0]=8188eu +BUILT_MODULE_NAME[0]=8188eus PROCS_NUM=`nproc` [ $PROCS_NUM -gt 16 ] && PROCS_NUM=16 DEST_MODULE_LOCATION[0]="/updates" diff --git a/include/autoconf.h b/include/autoconf.h index bbdb202..cc02a45 100644 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -25,7 +25,7 @@ */ #define AUTOCONF_INCLUDED #define RTL871X_MODULE_NAME "88EU" -#define DRV_NAME "rtl8188eu" +#define DRV_NAME "8188eu" #define CONFIG_USB_HCI @@ -55,7 +55,6 @@ #define CONFIG_EMBEDDED_FWIMG - #ifdef CONFIG_EMBEDDED_FWIMG #define LOAD_FW_HEADER_FROM_DRIVER #endif @@ -84,7 +83,6 @@ #define CONFIG_LPS #if defined(CONFIG_LPS) && defined(CONFIG_SUPPORT_USB_INT) - /* #define CONFIG_LPS_LCLK */ #endif @@ -95,8 +93,6 @@ /*#define CONFIG_ANTENNA_DIVERSITY*/ - - /* #define CONFIG_CONCURRENT_MODE */ #ifdef CONFIG_CONCURRENT_MODE #define CONFIG_RUNTIME_PORT_SWITCH @@ -154,7 +150,6 @@ /* #define CONFIG_TDLS_CH_SW */ /* Enable this flag only when we confirm that TDLS CH SW is supported in FW */ #endif - #define CONFIG_SKB_COPY /* for amsdu */ /* #define CONFIG_RTW_LED */ @@ -175,7 +170,6 @@ /* #define CONFIG_IOL_IOREG_CFG_DBG */ #endif - #define CONFIG_GLOBAL_UI_PID #define CONFIG_LAYER2_ROAMING @@ -232,7 +226,6 @@ /* #define CONFIG_USB_SUPPORT_ASYNC_VDN_REQ */ - /* * HAL Related Config */ @@ -241,14 +234,12 @@ #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 - #define DISABLE_BB_RF 0 /* #define RTL8191C_FPGA_NETWORKTYPE_ADHOC 0 */ @@ -262,7 +253,6 @@ #define MP_DRIVER 0 #endif - /* * Platform Related Config */ @@ -278,7 +268,6 @@ #endif #endif - #ifdef CONFIG_USB_TX_AGGREGATION /* #define CONFIG_TX_EARLY_MODE */ #endif @@ -323,8 +312,6 @@ /* #define DBG_RX_SIGNAL_DISPLAY_PROCESSING */ /* #define DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED "jeff-ap" */ - - /* #define DBG_SHOW_MCUFWDL_BEFORE_51_ENABLE */ /* #define DBG_ROAMING_TEST */ diff --git a/include/drv_types.h b/include/drv_types.h index dc4e38f..e902be8 100644 --- a/include/drv_types.h +++ b/include/drv_types.h @@ -18,7 +18,6 @@ --------------------------------------------------------------------------------*/ - #ifndef __DRV_TYPES_H__ #define __DRV_TYPES_H__ @@ -90,7 +89,7 @@ typedef struct _ADAPTER _adapter, ADAPTER, *PADAPTER; #include #include #include -#include +#include #include #include "../hal/hal_dm.h" #include @@ -1038,7 +1037,7 @@ struct dvobj_priv { _timer txbcn_timer; #endif _timer dynamic_chk_timer; /* dynamic/periodic check timer */ - + #ifdef CONFIG_RTW_NAPI_DYNAMIC u8 en_napi_dynamic; #endif /* CONFIG_RTW_NAPI_DYNAMIC */ @@ -1436,7 +1435,6 @@ struct _ADAPTER { u32 MCAddrCount; #endif /* end of PLATFORM_WINDOWS */ - #ifdef PLATFORM_LINUX _nic_hdl pnetdev; char old_ifname[IFNAMSIZ]; diff --git a/include/drv_types_linux.h b/include/drv_types_linux.h index 91ca68b..88e1c85 100644 --- a/include/drv_types_linux.h +++ b/include/drv_types_linux.h @@ -15,5 +15,4 @@ #ifndef __DRV_TYPES_LINUX_H__ #define __DRV_TYPES_LINUX_H__ - #endif diff --git a/os_dep/linux/os_intfs.c b/os_dep/linux/os_intfs.c index f5a124c..58a9e03 100644 --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c @@ -23,7 +23,6 @@ #endif - MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Realtek Wireless Lan Driver"); MODULE_AUTHOR("Realtek Semiconductor Corp."); @@ -34,7 +33,6 @@ int rtw_chip_version = 0x00; int rtw_rfintfs = HWPI; int rtw_lbkmode = 0;/* RTL8712_AIR_TRX; */ - int rtw_network_mode = Ndis802_11IBSS;/* Ndis802_11Infrastructure; */ /* infra, ad-hoc, auto */ /* NDIS_802_11_SSID ssid; */ int rtw_channel = 1;/* ad-hoc support requirement */ @@ -72,14 +70,13 @@ int rtw_scan_mode = 1;/* active, passive */ int rtw_lps_level = LPS_NORMAL; #endif /* CONFIG_POWER_SAVING */ - module_param(rtw_ips_mode, int, 0644); MODULE_PARM_DESC(rtw_ips_mode, "The default IPS mode"); module_param(rtw_lps_level, int, 0644); MODULE_PARM_DESC(rtw_lps_level, "The default LPS level"); -/* LPS: +/* LPS: * rtw_smart_ps = 0 => TX: pwr bit = 1, RX: PS_Poll * rtw_smart_ps = 1 => TX: pwr bit = 0, RX: PS_Poll * rtw_smart_ps = 2 => TX: pwr bit = 0, RX: NullData with pwr bit = 0 @@ -88,8 +85,8 @@ int rtw_smart_ps = 2; int rtw_max_bss_cnt = 0; module_param(rtw_max_bss_cnt, int, 0644); -#ifdef CONFIG_WMMPS_STA -/* WMMPS: +#ifdef CONFIG_WMMPS_STA +/* WMMPS: * rtw_smart_ps = 0 => Only for fw test * rtw_smart_ps = 1 => Refer to Beacon's TIM Bitmap * rtw_smart_ps = 2 => Don't refer to Beacon's TIM Bitmap @@ -700,7 +697,6 @@ module_param(rtw_dynamic_soml_delay, int, 0644); MODULE_PARM_DESC(rtw_dynamic_soml_delay, "SOML training delay"); #endif - int _netdev_open(struct net_device *pnetdev); int netdev_open(struct net_device *pnetdev); static int netdev_close(struct net_device *pnetdev); @@ -1288,7 +1284,6 @@ unsigned int rtw_classify8021d(struct sk_buff *skb) return dscp >> 5; } - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 2, 0)) static u16 rtw_select_queue(struct net_device *dev, struct sk_buff *skb, struct net_device *sb_dev)