From 579be6b930090846d95aad1ff978f4508b1aa720 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 27 Dec 2022 14:46:38 +0800 Subject: [PATCH] rtl8188eu: bump to latest git HEAD Signed-off-by: Tianling Shen (cherry picked from commit 57af11342be30ddb41b1d8f3e5f8e6ec42be9c37) --- package/kernel/rtl8188eu/Makefile | 40 +++++++------------ .../002-use-kernel-wireless-header.patch | 31 ++++++++++++++ .../010-disable-default-build-x86.patch | 2 +- .../rtl8188eu/patches/030-wireless-5.8.patch | 4 +- 4 files changed, 49 insertions(+), 28 deletions(-) create mode 100644 package/kernel/rtl8188eu/patches/002-use-kernel-wireless-header.patch diff --git a/package/kernel/rtl8188eu/Makefile b/package/kernel/rtl8188eu/Makefile index 2c99458f48..06ba809318 100644 --- a/package/kernel/rtl8188eu/Makefile +++ b/package/kernel/rtl8188eu/Makefile @@ -1,9 +1,6 @@ +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2021 ImmortalWrt -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2021-2022 ImmortalWrt.org include $(TOPDIR)/rules.mk @@ -12,9 +9,9 @@ PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_URL:=https://github.com/aircrack-ng/rtl8188eus.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2022-03-20 -PKG_SOURCE_VERSION:=0958f294f90b49d6bad4972b14f90676e5d858d3 -PKG_MIRROR_HASH:=dead457e82a8b19a7fa66d7981c5f675e0d8d2d9d297aba5443c793822c22a8f +PKG_SOURCE_DATE:=2022-12-19 +PKG_SOURCE_VERSION:=67be0af3736adc72fbf4f234c0d1d32afa8d5d06 +PKG_MIRROR_HASH:=384ed3451242746c5fd544f8f10badc52b8dcce792fdd4c661516b6abb2fc91b PKG_BUILD_PARALLEL:=1 @@ -31,9 +28,10 @@ define KernelPackage/rtl8188eu AUTOLOAD:=$(call AutoProbe,rtl8188eu) endef -NOSTDINC_FLAGS = \ +NOSTDINC_FLAGS:= \ -I$(PKG_BUILD_DIR) \ -I$(PKG_BUILD_DIR)/include \ + -I$(PKG_BUILD_DIR)/platform \ -I$(STAGING_DIR)/usr/include/mac80211-backport \ -I$(STAGING_DIR)/usr/include/mac80211-backport/uapi \ -I$(STAGING_DIR)/usr/include/mac80211 \ @@ -41,7 +39,7 @@ NOSTDINC_FLAGS = \ -include backport/autoconf.h \ -include backport/backport.h -EXTRA_CFLAGS:= \ +NOSTDINC_FLAGS+= \ -DRTW_SINGLE_WIPHY \ -DRTW_USE_CFG80211_STA_EVENT \ -DCONFIG_IOCTL_CFG80211 \ @@ -49,25 +47,17 @@ EXTRA_CFLAGS:= \ -DBUILD_OPENWRT ifeq ($(CONFIG_BIG_ENDIAN),y) -EXTRA_CFLAGS += -DCONFIG_BIG_ENDIAN +NOSTDINC_FLAGS += -DCONFIG_BIG_ENDIAN else -EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN +NOSTDINC_FLAGS += -DCONFIG_LITTLE_ENDIAN endif -EXTRA_KCONFIG:= \ - CONFIG_RTL8188EU=m \ - USER_MODULE_NAME=rtl8188eu - -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)" \ - $(MAKE_OPTS) \ + +$(KERNEL_MAKE) $(PKG_JOBS) \ + M="$(PKG_BUILD_DIR)" \ + NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \ + CONFIG_RTL8188EU=m \ + USER_MODULE_NAME=rtl8188eu \ modules endef diff --git a/package/kernel/rtl8188eu/patches/002-use-kernel-wireless-header.patch b/package/kernel/rtl8188eu/patches/002-use-kernel-wireless-header.patch new file mode 100644 index 0000000000..c2c293ac97 --- /dev/null +++ b/package/kernel/rtl8188eu/patches/002-use-kernel-wireless-header.patch @@ -0,0 +1,31 @@ +Fix wireless.h to use linux kernel header files +including uapi version of wireless.h + +--- a/include/linux/wireless.h ++++ b/include/linux/wireless.h +@@ -18,16 +18,17 @@ + + /***************************** INCLUDES *****************************/ + +-#if 0 ++#if 1 + #include /* for __u* and __s* typedefs */ + #include /* for "struct sockaddr" et al */ + #include /* for IFNAMSIZ and co... */ ++ #include ++ #include + #else + #define __user + /* typedef uint16_t __u16; */ + #include /* for "struct sockaddr" et al */ + #include /* for IFNAMSIZ and co... */ +-#endif + + /****************************** TYPES ******************************/ + #ifdef CONFIG_COMPAT +@@ -84,4 +85,5 @@ struct iwreq { + union iwreq_data u; + }; + ++#endif + #endif /* _LINUX_WIRELESS_H */ diff --git a/package/kernel/rtl8188eu/patches/010-disable-default-build-x86.patch b/package/kernel/rtl8188eu/patches/010-disable-default-build-x86.patch index e96e92e567..b28b8c22b7 100644 --- a/package/kernel/rtl8188eu/patches/010-disable-default-build-x86.patch +++ b/package/kernel/rtl8188eu/patches/010-disable-default-build-x86.patch @@ -1,6 +1,6 @@ --- a/Makefile +++ b/Makefile -@@ -92,7 +92,7 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y +@@ -95,7 +95,7 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y ###################### MP HW TX MODE FOR VHT ####################### CONFIG_MP_VHT_HW_TX_MODE = n ###################### Platform Related ####################### diff --git a/package/kernel/rtl8188eu/patches/030-wireless-5.8.patch b/package/kernel/rtl8188eu/patches/030-wireless-5.8.patch index 432b62cf09..3217c4c9ec 100644 --- a/package/kernel/rtl8188eu/patches/030-wireless-5.8.patch +++ b/package/kernel/rtl8188eu/patches/030-wireless-5.8.patch @@ -1,6 +1,6 @@ --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c -@@ -7094,7 +7094,7 @@ exit: +@@ -7106,7 +7123,7 @@ exit: return ret; } @@ -9,7 +9,7 @@ static void cfg80211_rtw_update_mgmt_frame_register(struct wiphy *wiphy, struct wireless_dev *wdev, struct mgmt_frame_regs *upd) -@@ -9430,7 +9430,7 @@ static struct cfg80211_ops rtw_cfg80211_ +@@ -9442,7 +9459,7 @@ static struct cfg80211_ops rtw_cfg80211_ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) .mgmt_tx = cfg80211_rtw_mgmt_tx,