rtl_wifi: bump to latest git HEAD

Refresh all patches. Signed-off-by: AmadeusGhost <amadeus@project-openwrt.eu.org>
2021-02-13 11:20:08 +08:00 · 2021-02-13 11:20:08 +08:00 · 827094a0c1
commit 827094a0c1
parent 818121551d
14 changed files with 64 additions and 132 deletions
--- a/package/ctcgfw/rtl8188eu/Makefile
+++ b/package/ctcgfw/rtl8188eu/Makefile
@ -8,15 +8,14 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=rtl8188eu
-PKG_RELEASE=1
+PKG_RELEASE:=1

 PKG_SOURCE_URL:=https://github.com/aircrack-ng/rtl8188eus.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2020-08-01
-PKG_SOURCE_VERSION:=ae1d233fe6a34a321ca1da2202bec34b1a4b41cd
-PKG_MIRROR_HASH:=995d021dec4bef7ce5227239b64aee88ea6d1002464bc7a62cc2ed766607ea89
+PKG_SOURCE_DATE:=2021-02-06
+PKG_SOURCE_VERSION:=1e7145f3237b3eeb3baf775f4a883e6d79c1cfe6
+PKG_MIRROR_HASH:=3f68779aed2b9fabca042ea4effbdf35e25e632a00febe6c3f09646a8c75ee5d

-PKG_MAINTAINTER:=ImmortalWrt
 PKG_BUILD_PARALLEL:=1

 STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
@ -27,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 define KernelPackage/rtl8188eu
  SUBMENU:=Wireless Drivers
  TITLE:=Realtek 8188EU(S)/8188ETV support
-  DEPENDS:=+kmod-cfg80211 +kmod-usb-core +@DRIVER_11N_SUPPORT +@DRIVER_11AC_SUPPORT
+  DEPENDS:=+kmod-cfg80211 +kmod-usb-core +@DRIVER_11N_SUPPORT
  FILES:=$(PKG_BUILD_DIR)/rtl8188eu.ko
  AUTOLOAD:=$(call AutoProbe,rtl8188eu)
 endef
--- a/package/ctcgfw/rtl8812au-ac/Makefile
+++ b/package/ctcgfw/rtl8812au-ac/Makefile
@ -1,5 +1,6 @@
 #
 # Copyright (C) 2020 stepheny
+# <https://github.com/aircrack-ng/rtl8812au/pull/619>
 #
 # Copyright (C) 2021 ImmortalWrt
 # <https://project-openwrt.eu.org>
@ -15,9 +16,9 @@ PKG_RELEASE:=1

 PKG_SOURCE_URL:=https://github.com/aircrack-ng/rtl8812au.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2020-06-26
-PKG_SOURCE_VERSION:=58f6be25f7c86d7ba67b0ccc638cf667755e6e1b
-PKG_MIRROR_HASH:=60359df8b49fa433d38b968b0df7eaddaca10f13cdd57471394bac1f6e5a162e
+PKG_SOURCE_DATE:=2021-02-03
+PKG_SOURCE_VERSION:=b65dcf4105641716d16f3a6c96507fdd9c1862b4
+PKG_MIRROR_HASH:=5416d4a6e671c6b07f44f35fae54662baef71f448c4be4ade58bf7fc5ca4f192

 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
@ -32,10 +33,11 @@ include $(INCLUDE_DIR)/package.mk

 define KernelPackage/rtl8812au-ac
  SUBMENU:=Wireless Drivers
-  TITLE:=Realtek rtl8812au/21au wireless drivers
+  TITLE:=Realtek RTL8812AU/21AU wireless drivers
  DEPENDS:=+kmod-cfg80211 +kmod-usb-core +@DRIVER_11N_SUPPORT +@DRIVER_11AC_SUPPORT
  FILES:=$(PKG_BUILD_DIR)/rtl8812au.ko
  AUTOLOAD:=$(call AutoProbe,rtl8812au)
+  CONFLICTS:=kmod-rtl8812au-ct
 endef

 NOSTDINC_FLAGS = \
@ -48,18 +50,32 @@ NOSTDINC_FLAGS = \
 	-include backport/autoconf.h \
 	-include backport/backport.h

-NOSTDINC_FLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT \
-	-DRTW_SINGLE_WIPHY -DCONFIG_CONCURRENT_MODE -D_LINUX_BYTEORDER_SWAB_H
+EXTRA_KCONFIG:= \
+	CONFIG_88XXAU=m \
+	USER_MODULE_NAME=rtl8812au

-PKG_MAKE_FLAGS += USER_MODULE_NAME=rtl8812au
-KERNEL_MAKE_FLAGS += CONFIG_88XXAU=m
+EXTRA_CFLAGS:= \
+	-DRTW_SINGLE_WIPHY \
+	-DRTW_USE_CFG80211_STA_EVENT \
+	-DCONFIG_IOCTL_CFG80211 \
+	-DCONFIG_CONCURRENT_MODE
+
+ifeq ($(CONFIG_BIG_ENDIAN),y)
+EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN
+else
+EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
+endif
+
+MAKE_OPTS:= \
+	$(KERNEL_MAKE_FLAGS) \
+	M="$(PKG_BUILD_DIR)" \
+	NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
+	USER_EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+	$(EXTRA_KCONFIG)

 define Build/Compile
 	+$(MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
-		$(KERNEL_MAKE_FLAGS) \
-		$(PKG_MAKE_FLAGS) \
-		M="$(PKG_BUILD_DIR)" \
-		NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
+		$(MAKE_OPTS) \
 		modules
 endef

--- a/package/ctcgfw/rtl8812au-ac/patches/0004-Makefile-disable-build-8814au.patch
+++ b/package/ctcgfw/rtl8812au-ac/patches/0004-Makefile-disable-build-8814au.patch
@ -1,40 +0,0 @@
-From 0f4e46f0fd39f4a18fa01d125284cccaee82ed7b Mon Sep 17 00:00:00 2001
-From: kimocoder <christian@aircrack-ng.org>
-Date: Mon, 19 Oct 2020 05:43:38 +0200
-Subject: [PATCH] Turned 8814au chipset OFF
-
---
- Makefile  | 6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 787b0318..a23673bc 100755
--- a/Makefile
-+++ b/Makefile
-@@ -22,7 +22,7 @@ EXTRA_LDFLAGS += --strip-all -O3
- ########################## WIFI IC ############################
- CONFIG_RTL8812A = y
- CONFIG_RTL8821A = y
-CONFIG_RTL8814A = y
-+CONFIG_RTL8814A = n
- ######################### Interface ###########################
- CONFIG_USB_HCI = y
- ########################### Android ###########################
-@@ -177,7 +177,7 @@ ifeq ($(CONFIG_USB_HCI), y)
- HCI_NAME = usb
- endif
- 
-ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y)
-+ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_n)
- 
- EXTRA_CFLAGS += -DDRV_NAME=\"rtl88XXau\"
- ifeq ($(CONFIG_USB_HCI), y)
-@@ -456,7 +456,7 @@ ifeq ($(CONFIG_RTL8814A), y)
- #EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE
- CONFIG_MP_VHT_HW_TX_MODE = n
- ##########################################
-RTL871X = rtl8814a
-+#RTL871X = rtl8814a
- ifeq ($(CONFIG_USB_HCI), y)
- MODULE_NAME = 8814au
- endif
--- a/package/ctcgfw/rtl8812au-ac/patches/001-use-kernel-byteorder.patch
+++ b/package/ctcgfw/rtl8812au-ac/patches/001-use-kernel-byteorder.patch
@ -0,0 +1,15 @@
+Fix compile problem when rtw_byteorder.h and asm/byteorder.h gets 
+included in addition for example indirectly, do not use realtek own copy 
+of the byteorder headers.
+
+--- a/include/drv_types.h
+++ b/include/drv_types.h
+@@ -24,7 +24,7 @@
+ #include <drv_conf.h>
+ #include <basic_types.h>
+ #include <osdep_service.h>
+-#include <rtw_byteorder.h>
+#include <asm/byteorder.h>
+ #include <wlan_bssdef.h>
+ #include <wifi.h>
+ #include <ieee80211.h>
--- a/package/ctcgfw/rtl8812au-ac/patches/0001-Modify-Makefile-for-openwrt-toolchain.patch
+++ b/package/ctcgfw/rtl8812au-ac/patches/0001-Modify-Makefile-for-openwrt-toolchain.patch
@ -1,6 +1,6 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -91,7 +91,7 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y
+@@ -92,7 +92,7 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y
 ###################### MP HW TX MODE FOR VHT #######################
 CONFIG_MP_VHT_HW_TX_MODE = n
 ###################### Platform Related #######################
@ -9,4 +9,3 @@
 CONFIG_PLATFORM_ANDROID_ARM64 = n
 CONFIG_PLATFORM_ARM_RPI = n
 CONFIG_PLATFORM_ARM64_RPI = n
--
--- a/package/ctcgfw/rtl8812au-ac/patches/0002-Change-default-value-of-vht_enable-switch_usb_mode.patch
+++ b/package/ctcgfw/rtl8812au-ac/patches/0002-Change-default-value-of-vht_enable-switch_usb_mode.patch
@ -18,4 +18,3 @@
 
 #ifdef CONFIG_USB_AUTOSUSPEND
 int rtw_enusbss = 1;/* 0:disable,1:enable */
--
--- a/package/ctcgfw/rtl8812au-ac/patches/0003-Add-missing-code-for-concurrent-mode.patch
+++ b/package/ctcgfw/rtl8812au-ac/patches/0003-Add-missing-code-for-concurrent-mode.patch
--- a/package/ctcgfw/rtl8821cu/Makefile
+++ b/package/ctcgfw/rtl8821cu/Makefile
@ -13,9 +13,9 @@ PKG_RELEASE:=1

 PKG_SOURCE_URL:=https://github.com/brektrou/rtl8821CU.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2020-07-27
-PKG_SOURCE_VERSION:=93b04bfcd293fdd7d98d5a7c964ae9416a40159c
-PKG_MIRROR_HASH:=e3d798355625bd71596ce08741e1f7f3523951e91be775edf2a936ab260bd5de
+PKG_SOURCE_DATE:=2020-12-19
+PKG_SOURCE_VERSION:=428a0820487418ec69c0edb91726d1cf19763b1e
+PKG_MIRROR_HASH:=77958d3bff8b0145504a10959765be0e3743b9c4880a5173d156238c2c569a56

 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
@ -37,10 +37,6 @@ define KernelPackage/rtl8821cu
  PROVIDES:=kmod-rtl8821cu
 endef

-define KernelPackage/rtl8821cu/description
-  Realtek RTL8811CU/RTL8821CU USB Wi-Fi adapter driver.
-endef
-
 NOSTDINC_FLAGS = \
 	-I$(PKG_BUILD_DIR) \
 	-I$(PKG_BUILD_DIR)/include \
@ -51,7 +47,7 @@ NOSTDINC_FLAGS = \
 	-include backport/autoconf.h \
 	-include backport/backport.h

-EXTRA_KCONFIG:=\
+EXTRA_KCONFIG:= \
 	CONFIG_RTL8821CU=m \
 	USER_MODULE_NAME=rtl8821cu

@ -62,18 +58,13 @@ endif
 EXTRA_CFLAGS:= \
 	-DRTW_SINGLE_WIPHY \
 	-DRTW_USE_CFG80211_STA_EVENT \
-	-DCONFIG_RADIO_WORK \
 	-DCONFIG_IOCTL_CFG80211 \
-	-DCONFIG_CONCURRENT_MODE \
+	-DCONFIG_CONCURRENT_MODE

 ifeq ($(ARCH),arm)
 	EXTRA_CFLAGS += -mfloat-abi=softfp
 endif

-ifeq ($(ARCH),x86_64)
-	EXTRA_CFLAGS += -mhard-float
-endif
-
 MAKE_OPTS:= \
 	$(KERNEL_MAKE_FLAGS) \
 	M="$(PKG_BUILD_DIR)" \
--- a/package/ctcgfw/rtl8821cu/patches/010-remove-extra-cflags.patch
+++ b/package/ctcgfw/rtl8821cu/patches/010-remove-extra-cflags.patch
@ -1,18 +1,11 @@
-diff --git a/Makefile b/Makefile
-index 6a065bf..6e1c6d0 100755
 --- a/Makefile
 +++ b/Makefile
-@@ -1171,13 +1171,6 @@ endif
- 
- ifeq ($(CONFIG_MP_VHT_HW_TX_MODE), y)
- EXTRA_CFLAGS += -DCONFIG_MP_VHT_HW_TX_MODE
-ifeq ($(CONFIG_PLATFORM_I386_PC), y)
-## For I386 X86 ToolChain use Hardware FLOATING
-EXTRA_CFLAGS += -mhard-float
-else
-## For ARM ToolChain use Hardware FLOATING
+@@ -2103,8 +2103,6 @@ ifeq ($(ARCH), i386)
+ EXTRA_CFLAGS += -mhard-float
+ else ifeq ($(ARCH), x86_64)
+ EXTRA_CFLAGS += -mhard-float
+-else ifeq ($(ARCH), arm)
 -EXTRA_CFLAGS += -mfloat-abi=hard
-endif
 endif
 
- ####START RASPBERRY PI SUPPORT
+ ifeq ($(CONFIG_MULTIDRV), y)
--- a/package/ctcgfw/rtl8821cu/patches/030-change-value-of-vht-enable.patch
+++ b/package/ctcgfw/rtl8821cu/patches/030-change-value-of-vht-enable.patch
--- a/package/ctcgfw/rtl8821cu/patches/030-fix-build-on-powerpc.patch
+++ b/package/ctcgfw/rtl8821cu/patches/030-fix-build-on-powerpc.patch
@ -1,20 +0,0 @@
-diff --git a/include/byteorder/swab.h b/include/byteorder/swab.h
-index a8dd46b..c4b4298 100644
--- a/include/byteorder/swab.h
-+++ b/include/byteorder/swab.h
-@@ -104,6 +104,7 @@ __inline static __u64 __arch__swab64(__u64 x)
- 	#define __swab64(x) __fswab64(x)
- #endif /* __swab16 */
- 
-+#ifndef _UAPI_LINUX_SWAB_H
- #ifdef PLATFORM_FREEBSD
- 	__inline static __u16 __fswab16(__u16 x)
- #else
-@@ -120,6 +121,7 @@ __inline static __u64 __arch__swab64(__u64 x)
- {
- 	return __arch__swab32(x);
- }
-+#endif
- 
- #if defined(PLATFORM_LINUX) || defined(PLATFORM_WINDOWS)
- 	#define swab16 __swab16
--- a/package/ctcgfw/rtl88x2bu/Makefile
+++ b/package/ctcgfw/rtl88x2bu/Makefile
@ -9,13 +9,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=rtl88x2bu
-PKG_RELEASE=1
+PKG_RELEASE:=1

 PKG_SOURCE_URL:=https://github.com/cilynx/rtl88x2bu.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2020-07-21
-PKG_SOURCE_VERSION:=a2abcaf523dfab2afeda8cc2cdb5e3c9510fc5f3
-PKG_MIRROR_HASH:=26d5504c9323c9c133265f2c2e4213acca0ddf390b1b4399d1003e9fd45f9368
+PKG_SOURCE_DATE:=2021-01-21
+PKG_SOURCE_VERSION:=48e7c19c92a77554403e1347447f8e2cfd780228
+PKG_MIRROR_HASH:=2991028fb7bd7e31d041b1e99d0e0d86781fff95fc70e4560ca9fcbe038f063f

 PKG_LICENSE:=GPL-2.0
 PKG_LICENSE_FILES:=LICENSE
--- a/package/ctcgfw/rtl88x2bu/patches/010-fix-build-on-powerpc.patch
+++ b/package/ctcgfw/rtl88x2bu/patches/010-fix-build-on-powerpc.patch
@ -1,20 +0,0 @@
-diff --git a/include/byteorder/swab.h b/include/byteorder/swab.h
-index a8dd46b..c4b4298 100644
--- a/include/byteorder/swab.h
-+++ b/include/byteorder/swab.h
-@@ -104,6 +104,7 @@ __inline static __u64 __arch__swab64(__u64 x)
- 	#define __swab64(x) __fswab64(x)
- #endif /* __swab16 */
- 
-+#ifndef _UAPI_LINUX_SWAB_H
- #ifdef PLATFORM_FREEBSD
- 	__inline static __u16 __fswab16(__u16 x)
- #else
-@@ -120,6 +121,7 @@ __inline static __u64 __arch__swab64(__u64 x)
- {
- 	return __arch__swab32(x);
- }
-+#endif
- 
- #if defined(PLATFORM_LINUX) || defined(PLATFORM_WINDOWS)
- 	#define swab16 __swab16
--- a/package/ctcgfw/rtl88x2bu/patches/010-remove-repeat-flies.patch
+++ b/package/ctcgfw/rtl88x2bu/patches/010-remove-repeat-flies.patch