From 1feee257e0a4427489119b10a85eb8dba9f59bf5 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Sat, 9 Apr 2022 21:23:29 +0800 Subject: [PATCH] rtl8188eu: bump to latest git HEAD Fixes build under kernel 5.15. Signed-off-by: Tianling Shen --- package/kernel/rtl8188eu/Makefile | 8 ++-- .../010-disable-default-build-x86.patch | 2 +- .../rtl8188eu/patches/030-wireless-5.8.patch | 42 ++++--------------- 3 files changed, 13 insertions(+), 39 deletions(-) diff --git a/package/kernel/rtl8188eu/Makefile b/package/kernel/rtl8188eu/Makefile index 9ae74a2121..740ed89763 100644 --- a/package/kernel/rtl8188eu/Makefile +++ b/package/kernel/rtl8188eu/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rtl8188eu -PKG_RELEASE:=1 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_URL:=https://github.com/aircrack-ng/rtl8188eus.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2021-02-06 -PKG_SOURCE_VERSION:=1e7145f3237b3eeb3baf775f4a883e6d79c1cfe6 -PKG_MIRROR_HASH:=3f68779aed2b9fabca042ea4effbdf35e25e632a00febe6c3f09646a8c75ee5d +PKG_SOURCE_DATE:=2022-03-20 +PKG_SOURCE_VERSION:=0958f294f90b49d6bad4972b14f90676e5d858d3 +PKG_MIRROR_HASH:=dead457e82a8b19a7fa66d7981c5f675e0d8d2d9d297aba5443c793822c22a8f PKG_BUILD_PARALLEL:=1 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 fc8b53f3c2..e96e92e567 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 -@@ -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 ####################### diff --git a/package/kernel/rtl8188eu/patches/030-wireless-5.8.patch b/package/kernel/rtl8188eu/patches/030-wireless-5.8.patch index 25bc7d0800..432b62cf09 100644 --- a/package/kernel/rtl8188eu/patches/030-wireless-5.8.patch +++ b/package/kernel/rtl8188eu/patches/030-wireless-5.8.patch @@ -1,46 +1,20 @@ --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c -@@ -7094,14 +7094,14 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, - #else - struct net_device *ndev, - #endif --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) || defined(BUILD_OPENWRT) - struct mgmt_frame_regs *upd) - #else - u16 frame_type, bool reg) - #endif - - { --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) || defined(BUILD_OPENWRT) - u32 rtw_mask = BIT(IEEE80211_STYPE_PROBE_REQ >> 4); - #endif - -@@ -7110,7 +7110,7 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, - #endif - - /* hardcoded always true, to make it pass compilation */ --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) || defined(BUILD_OPENWRT) - bool reg = true; - #endif - -@@ -7137,7 +7137,7 @@ static void cfg80211_rtw_mgmt_frame_register(struct wiphy *wiphy, - /* Wait QC Verify */ - return; +@@ -7094,7 +7094,7 @@ exit: + return ret; + } -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) || defined(BUILD_OPENWRT) - switch (upd->interface_stypes) { - #else - switch (frame_type) { -@@ -9463,7 +9463,7 @@ static struct cfg80211_ops rtw_cfg80211_ops = { + 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_ #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) .mgmt_tx = cfg80211_rtw_mgmt_tx, -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 8, 0)) || defined(BUILD_OPENWRT) - .update_mgmt_frame_registrations = cfg80211_rtw_mgmt_frame_register, + .update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_register, #else .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,