From 50cae2e93836777a955f008013b8b9f13da08db2 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 27 Dec 2022 15:43:35 +0800 Subject: [PATCH] rtl8812au-ac: bump to latest git HEAD Signed-off-by: Tianling Shen (cherry picked from commit 3ad16a8b6996a0c64cf92a39b7e6563c15e63b8b) --- package/kernel/rtl8812au-ac/Makefile | 39 +++++++------------ .../010-disable-default-build-x86.patch | 2 +- ...add-missing-code-for-concurrent-mode.patch | 2 +- .../patches/040-wireless-5.8.patch | 18 ++++----- 4 files changed, 26 insertions(+), 35 deletions(-) diff --git a/package/kernel/rtl8812au-ac/Makefile b/package/kernel/rtl8812au-ac/Makefile index fead5fb380..07a15ec006 100644 --- a/package/kernel/rtl8812au-ac/Makefile +++ b/package/kernel/rtl8812au-ac/Makefile @@ -3,20 +3,20 @@ # Copyright (C) 2020 stepheny # # -# Copyright (C) 2021 ImmortalWrt.org +# Copyright (C) 2021-2022 ImmortalWrt.org include $(TOPDIR)/rules.mk PKG_NAME:=rtl8812au-ac -PKG_RELEASE:=$(AUTORELEASE) +PKG_RELEASE:=1 PKG_SOURCE_URL:=https://github.com/aircrack-ng/rtl8812au.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2021-06-27 -PKG_SOURCE_VERSION:=b8167e66b4ac046b3b76c2c40008d84528e91594 -PKG_MIRROR_HASH:=f3608afb663ccfc796e776bd26b99d9f9cb8dd053bd302eab5c077e498010ce9 +PKG_SOURCE_DATE:=2022-12-23 +PKG_SOURCE_VERSION:=ee299797bcd54d5b8c58d2da8576c54cea1a03a2 +PKG_MIRROR_HASH:=fb72b28e123f9dead470a0b94ef9d56e59c10e4f0baf09ba820e5c34a743decc -PKG_LICENSE:=GPL-2.0 +PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=Marty Jones @@ -36,7 +36,7 @@ define KernelPackage/rtl8812au-ac CONFLICTS:=kmod-rtl8812au-ct endef -NOSTDINC_FLAGS = \ +NOSTDINC_FLAGS:= \ -I$(PKG_BUILD_DIR) \ -I$(PKG_BUILD_DIR)/include \ -I$(STAGING_DIR)/usr/include/mac80211-backport \ @@ -46,33 +46,24 @@ NOSTDINC_FLAGS = \ -include backport/autoconf.h \ -include backport/backport.h -EXTRA_KCONFIG:= \ - CONFIG_88XXAU=m \ - USER_MODULE_NAME=rtl8812au - -EXTRA_CFLAGS:= \ +NOSTDINC_FLAGS+= \ -DRTW_SINGLE_WIPHY \ -DRTW_USE_CFG80211_STA_EVENT \ -DCONFIG_IOCTL_CFG80211 \ - -DCONFIG_CONCURRENT_MODE \ -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 -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_88XXAU=m \ + USER_MODULE_NAME=rtl8812au \ modules endef diff --git a/package/kernel/rtl8812au-ac/patches/010-disable-default-build-x86.patch b/package/kernel/rtl8812au-ac/patches/010-disable-default-build-x86.patch index d2621542ee..1cfa22bd9a 100644 --- a/package/kernel/rtl8812au-ac/patches/010-disable-default-build-x86.patch +++ b/package/kernel/rtl8812au-ac/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 +@@ -98,7 +98,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/rtl8812au-ac/patches/030-add-missing-code-for-concurrent-mode.patch b/package/kernel/rtl8812au-ac/patches/030-add-missing-code-for-concurrent-mode.patch index 5e3abce660..32fe0e0644 100644 --- a/package/kernel/rtl8812au-ac/patches/030-add-missing-code-for-concurrent-mode.patch +++ b/package/kernel/rtl8812au-ac/patches/030-add-missing-code-for-concurrent-mode.patch @@ -1,6 +1,6 @@ --- a/os_dep/linux/os_intfs.c +++ b/os_dep/linux/os_intfs.c -@@ -2803,6 +2803,7 @@ static int netdev_vir_if_close(struct ne +@@ -2807,6 +2807,7 @@ static int netdev_vir_if_close(struct ne { _adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev); struct mlme_priv *pmlmepriv = &padapter->mlmepriv; diff --git a/package/kernel/rtl8812au-ac/patches/040-wireless-5.8.patch b/package/kernel/rtl8812au-ac/patches/040-wireless-5.8.patch index acb0b73918..ccc6e5723f 100644 --- a/package/kernel/rtl8812au-ac/patches/040-wireless-5.8.patch +++ b/package/kernel/rtl8812au-ac/patches/040-wireless-5.8.patch @@ -1,29 +1,29 @@ --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c -@@ -460,7 +460,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 19, 0)) +@@ -462,7 +462,7 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte if (started) { --#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0) || defined(BUILD_OPENWRT)) + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)) + cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, 0, false); +-#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0)) ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 11, 0) || defined(BUILD_OPENWRT)) cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, false); #else cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0); -@@ -7733,7 +7733,7 @@ exit: +@@ -7772,7 +7772,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) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0) || defined(BUILD_OPENWRT)) static void cfg80211_rtw_update_mgmt_frame_register(struct wiphy *wiphy, struct wireless_dev *wdev, struct mgmt_frame_regs *upd) -@@ -10185,7 +10185,7 @@ static struct cfg80211_ops rtw_cfg80211_ +@@ -10226,7 +10226,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) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0) || defined(BUILD_OPENWRT)) .update_mgmt_frame_registrations = cfg80211_rtw_update_mgmt_frame_register, #else .mgmt_frame_register = cfg80211_rtw_mgmt_frame_register,