8812au version update (#1535)

pull/1536/head
cronyx 2024-08-27 16:04:33 +03:00 committed by GitHub
parent 4b17c594ff
commit 55269cfdd1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 18 deletions

View File

@ -1,29 +1,27 @@
--- a/Makefile 2023-12-28 12:04:57.820353449 +0300 --- a/Makefile 2024-08-27 14:13:17.943312156 +0300
+++ b/Makefile 2023-12-28 12:31:56.636201729 +0300 +++ b/Makefile 2024-08-27 14:16:02.378077178 +0300
@@ -39,8 +39,8 @@ @@ -49,7 +49,7 @@
########################## WIFI IC ############################ ########################## WIFI IC ############################
CONFIG_RTL8812A = y CONFIG_RTL8812A = y
-CONFIG_RTL8821A = y -CONFIG_RTL8821A = y
-CONFIG_RTL8814A = y
+CONFIG_RTL8821A = n +CONFIG_RTL8821A = n
+CONFIG_RTL8814A = n CONFIG_RTL8814A = n
######################### Interface ########################### ######################### Interface ###########################
CONFIG_USB_HCI = y CONFIG_USB_HCI = y
########################## Features ########################### @@ -216,9 +216,9 @@
@@ -206,9 +206,9 @@
EXTRA_CFLAGS += -DDBG=0 EXTRA_CFLAGS += -DDBG=0
endif endif
-ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y) -ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A), y_y)
+ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_n_n) +ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A), y_n)
-EXTRA_CFLAGS += -DDRV_NAME=\"rtl88xxau_wfb\" -EXTRA_CFLAGS += -DDRV_NAME=\"rtl88xxau_wfb\"
+EXTRA_CFLAGS += -DDRV_NAME=\"rtl88xxau\" +EXTRA_CFLAGS += -DDRV_NAME=\"rtl88xxau\"
ifeq ($(CONFIG_USB_HCI), y) ifeq ($(CONFIG_USB_HCI), y)
USER_MODULE_NAME = 88XXau USER_MODULE_NAME = 88XXau
endif endif
@@ -291,7 +291,7 @@ @@ -301,7 +301,7 @@
hal/btc/halbtc8821c2ant.o hal/btc/halbtc8821c2ant.o
endif endif
@ -32,7 +30,7 @@
########### HAL_RTL8812A_RTL8821A ################################# ########### HAL_RTL8812A_RTL8821A #################################
ifneq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A), n_n) ifneq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A), n_n)
@@ -1523,7 +1523,7 @@ @@ -1533,7 +1533,7 @@
USER_MODULE_NAME ?= USER_MODULE_NAME ?=
ifneq ($(USER_MODULE_NAME),) ifneq ($(USER_MODULE_NAME),)

View File

@ -1,7 +1,7 @@
diff -Naur a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c diff -Naur a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
--- a/os_dep/linux/ioctl_cfg80211.c 2023-12-28 04:55:44.047232205 +0300 --- a/os_dep/linux/ioctl_cfg80211.c 2024-08-27 14:35:02.331289685 +0300
+++ b/os_dep/linux/ioctl_cfg80211.c 2023-12-28 04:58:01.223544721 +0300 +++ b/os_dep/linux/ioctl_cfg80211.c 2024-08-27 14:37:53.039690680 +0300
@@ -4921,6 +4921,7 @@ @@ -4937,6 +4937,7 @@
//RTW_INFO("%s dvobj null\n", __func__); //RTW_INFO("%s dvobj null\n", __func__);
} }
switch(pHalData->current_channel_bw){ switch(pHalData->current_channel_bw){
@ -9,7 +9,7 @@ diff -Naur a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
case CHANNEL_WIDTH_5: case CHANNEL_WIDTH_5:
//RTW_INFO("%s width 5\n", __func__); //RTW_INFO("%s width 5\n", __func__);
width = NL80211_CHAN_WIDTH_5; width = NL80211_CHAN_WIDTH_5;
@@ -4931,6 +4932,7 @@ @@ -4947,6 +4948,7 @@
width = NL80211_CHAN_WIDTH_10; width = NL80211_CHAN_WIDTH_10;
center_freq = control_freq; center_freq = control_freq;
break; break;
@ -18,8 +18,8 @@ diff -Naur a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c
//RTW_INFO("%s width 20\n", __func__); //RTW_INFO("%s width 20\n", __func__);
width = NL80211_CHAN_WIDTH_20; width = NL80211_CHAN_WIDTH_20;
diff -Naur a/os_dep/linux/wifi_regd.c b/os_dep/linux/wifi_regd.c diff -Naur a/os_dep/linux/wifi_regd.c b/os_dep/linux/wifi_regd.c
--- a/os_dep/linux/wifi_regd.c 2023-11-08 03:19:52.064089100 +0300 --- a/os_dep/linux/wifi_regd.c 2024-08-27 14:35:13.051313467 +0300
+++ b/os_dep/linux/wifi_regd.c 2023-12-28 04:57:52.047523712 +0300 +++ b/os_dep/linux/wifi_regd.c 2024-08-27 14:38:18.297753594 +0300
@@ -334,11 +334,11 @@ @@ -334,11 +334,11 @@
if (ch) if (ch)
ch->flags &= ~(IEEE80211_CHAN_DISABLED|IEEE80211_CHAN_NO_HT40PLUS| ch->flags &= ~(IEEE80211_CHAN_DISABLED|IEEE80211_CHAN_NO_HT40PLUS|

View File

@ -5,7 +5,7 @@
################################################################################ ################################################################################
RTL8812AU_OPENIPC_SITE = $(call github,svpcom,rtl8812au,$(RTL8812AU_OPENIPC_VERSION)) RTL8812AU_OPENIPC_SITE = $(call github,svpcom,rtl8812au,$(RTL8812AU_OPENIPC_VERSION))
RTL8812AU_OPENIPC_VERSION = dc9993dd6e7de738de8437add043747a6bfc475c RTL8812AU_OPENIPC_VERSION = f1f447e2e184167b70bed4884534a2c27f4aa16e
RTL8812AU_OPENIPC_LICENSE = GPL-2.0 RTL8812AU_OPENIPC_LICENSE = GPL-2.0
RTL8812AU_OPENIPC_LICENSE_FILES = COPYING RTL8812AU_OPENIPC_LICENSE_FILES = COPYING