diff --git a/general/package/rtl8812au-openipc/0001-disable_8814_8821.patch b/general/package/rtl8812au-openipc/0001-disable_8814_8821.patch deleted file mode 100644 index 3be87a66..00000000 --- a/general/package/rtl8812au-openipc/0001-disable_8814_8821.patch +++ /dev/null @@ -1,41 +0,0 @@ ---- a/Makefile 2024-08-27 14:13:17.943312156 +0300 -+++ b/Makefile 2024-08-27 14:16:02.378077178 +0300 -@@ -49,7 +49,7 @@ - - ########################## WIFI IC ############################ - CONFIG_RTL8812A = y --CONFIG_RTL8821A = y -+CONFIG_RTL8821A = n - CONFIG_RTL8814A = n - ######################### Interface ########################### - CONFIG_USB_HCI = y -@@ -216,9 +216,9 @@ - EXTRA_CFLAGS += -DDBG=0 - endif - --ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A), y_y) -+ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A), y_n) - --EXTRA_CFLAGS += -DDRV_NAME=\"rtl88xxau_wfb\" -+EXTRA_CFLAGS += -DDRV_NAME=\"rtl88xxau\" - ifeq ($(CONFIG_USB_HCI), y) - USER_MODULE_NAME = 88XXau - endif -@@ -301,7 +301,7 @@ - hal/btc/halbtc8821c2ant.o - endif - --include $(TopDIR)/hal/phydm/phydm.mk -+include $(src)/hal/phydm/phydm.mk - - ########### HAL_RTL8812A_RTL8821A ################################# - ifneq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A), n_n) -@@ -1533,7 +1533,7 @@ - - USER_MODULE_NAME ?= - ifneq ($(USER_MODULE_NAME),) --MODULE_NAME := $(USER_MODULE_NAME)_wfb -+MODULE_NAME := $(USER_MODULE_NAME) - endif - - ifneq ($(KERNELRELEASE),) diff --git a/general/package/rtl8812au-openipc/0002-old_kernel_fix.patch b/general/package/rtl8812au-openipc/0002-old_kernel_fix.patch deleted file mode 100644 index 011eb096..00000000 --- a/general/package/rtl8812au-openipc/0002-old_kernel_fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -Naur a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c ---- a/os_dep/linux/ioctl_cfg80211.c 2024-08-27 14:35:02.331289685 +0300 -+++ b/os_dep/linux/ioctl_cfg80211.c 2024-08-27 14:37:53.039690680 +0300 -@@ -4937,6 +4937,7 @@ - //RTW_INFO("%s dvobj null\n", __func__); - } - switch(pHalData->current_channel_bw){ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0)) - case CHANNEL_WIDTH_5: - //RTW_INFO("%s width 5\n", __func__); - width = NL80211_CHAN_WIDTH_5; -@@ -4947,6 +4948,7 @@ - width = NL80211_CHAN_WIDTH_10; - center_freq = control_freq; - break; -+#endif - case CHANNEL_WIDTH_20: - //RTW_INFO("%s width 20\n", __func__); - width = NL80211_CHAN_WIDTH_20; -diff -Naur a/os_dep/linux/wifi_regd.c b/os_dep/linux/wifi_regd.c ---- a/os_dep/linux/wifi_regd.c 2024-08-27 14:35:13.051313467 +0300 -+++ b/os_dep/linux/wifi_regd.c 2024-08-27 14:38:18.297753594 +0300 -@@ -334,11 +334,11 @@ - if (ch) - ch->flags &= ~(IEEE80211_CHAN_DISABLED|IEEE80211_CHAN_NO_HT40PLUS| - IEEE80211_CHAN_NO_HT40MINUS|IEEE80211_CHAN_NO_80MHZ| -- IEEE80211_CHAN_NO_160MHZ); -+ IEEE80211_CHAN_NO_160MHZ | - #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)) - IEEE80211_CHAN_NO_IBSS|IEEE80211_CHAN_PASSIVE_SCAN); - #else -- IEEE80211_CHAN_NO_IR; -+ IEEE80211_CHAN_NO_IR); - #endif - //ch->flags = IEEE80211_CHAN_DISABLED; - } diff --git a/general/package/rtl8812au-openipc/rtl8812au-openipc.mk b/general/package/rtl8812au-openipc/rtl8812au-openipc.mk index 540a0747..764345cd 100644 --- a/general/package/rtl8812au-openipc/rtl8812au-openipc.mk +++ b/general/package/rtl8812au-openipc/rtl8812au-openipc.mk @@ -4,13 +4,14 @@ # ################################################################################ -RTL8812AU_OPENIPC_SITE = $(call github,svpcom,rtl8812au,$(RTL8812AU_OPENIPC_VERSION)) -RTL8812AU_OPENIPC_VERSION = f1f447e2e184167b70bed4884534a2c27f4aa16e +RTL8812AU_OPENIPC_SITE = $(call github,openipc,realtek-wlan,$(RTL8812AU_OPENIPC_VERSION)) +RTL8812AU_OPENIPC_VERSION = rtl8812au_fpv RTL8812AU_OPENIPC_LICENSE = GPL-2.0 RTL8812AU_OPENIPC_LICENSE_FILES = COPYING -RTL8812AU_OPENIPC_MODULE_MAKE_OPTS = CONFIG_RTL8812AU=m \ +RTL8812AU_OPENIPC_MODULE_MAKE_OPTS = \ + CONFIG_RTL8812AU=m \ KVER=$(LINUX_VERSION_PROBED) \ KSRC=$(LINUX_DIR)