1 |
|
2 |
Adjust driver bits so it keeps the name of the replaced driver |
3 |
|
4 |
Signed-off-by: Thomas Backlund <tmb@mageia.org> |
5 |
|
6 |
--- |
7 |
3rdparty/rtl8812au/Kconfig | 7 +++---- |
8 |
3rdparty/rtl8812au/Makefile | 8 ++++---- |
9 |
3rdparty/rtl8812au/hal/hal_com.c | 2 +- |
10 |
3rdparty/rtl8812au/os_dep/linux/ioctl_cfg80211.c | 2 +- |
11 |
4 files changed, 9 insertions(+), 10 deletions(-) |
12 |
|
13 |
diff -Nurp linux-5.11/3rdparty/rtl8812au.orig/hal/hal_com.c linux-5.11/3rdparty/rtl8812au/hal/hal_com.c |
14 |
--- linux-5.11/3rdparty/rtl8812au.orig/hal/hal_com.c 2021-03-07 18:43:20.313672664 +0200 |
15 |
+++ linux-5.11/3rdparty/rtl8812au/hal/hal_com.c 2021-03-07 18:43:51.392141299 +0200 |
16 |
@@ -12879,7 +12879,7 @@ bypass_hw_pg: |
17 |
_rtw_memset(hal_data->EEPROMMACAddr, 0, ETH_ALEN); |
18 |
ret = _FAIL; |
19 |
exit: |
20 |
- dev_info(&udev->dev, "88XXau %pM hw_info[%02x]", hw_addr, addr_offset); |
21 |
+ dev_info(&udev->dev, "8812au %pM hw_info[%02x]", hw_addr, addr_offset); |
22 |
return ret; |
23 |
} |
24 |
|
25 |
diff -Nurp linux-5.11/3rdparty/rtl8812au.orig/Kconfig linux-5.11/3rdparty/rtl8812au/Kconfig |
26 |
--- linux-5.11/3rdparty/rtl8812au.orig/Kconfig 2021-03-07 18:43:20.369675309 +0200 |
27 |
+++ linux-5.11/3rdparty/rtl8812au/Kconfig 2021-03-07 18:45:22.910465892 +0200 |
28 |
@@ -1,6 +1,5 @@ |
29 |
-config 88XXAU |
30 |
- tristate "Realtek 88XXau USB WiFi" |
31 |
+config RTL8812AU |
32 |
+ tristate "Realtek 8812au USB WiFi" |
33 |
depends on USB |
34 |
help |
35 |
- Help message of 88XXau |
36 |
- |
37 |
+ Help message of 8812au |
38 |
diff -Nurp linux-5.11/3rdparty/rtl8812au.orig/Makefile linux-5.11/3rdparty/rtl8812au/Makefile |
39 |
--- linux-5.11/3rdparty/rtl8812au.orig/Makefile 2021-03-07 18:43:20.370675357 +0200 |
40 |
+++ linux-5.11/3rdparty/rtl8812au/Makefile 2021-03-07 18:43:51.401141725 +0200 |
41 |
@@ -180,9 +180,9 @@ endif |
42 |
|
43 |
ifeq ($(CONFIG_RTL8812A)_$(CONFIG_RTL8821A)_$(CONFIG_RTL8814A), y_y_y) |
44 |
|
45 |
-EXTRA_CFLAGS += -DDRV_NAME=\"rtl88XXau\" |
46 |
+EXTRA_CFLAGS += -DDRV_NAME=\"rtl8812au\" |
47 |
ifeq ($(CONFIG_USB_HCI), y) |
48 |
-USER_MODULE_NAME = 88XXau |
49 |
+USER_MODULE_NAME = 8812au |
50 |
endif |
51 |
else |
52 |
EXTRA_CFLAGS += -DDRV_NAME=\"rtl8812au\" |
53 |
@@ -2232,11 +2232,11 @@ $(MODULE_NAME)-y += $(_PLATFORM_FILES) |
54 |
|
55 |
$(MODULE_NAME)-$(CONFIG_MP_INCLUDED) += core/rtw_mp.o |
56 |
|
57 |
-obj-$(CONFIG_88XXAU) := $(MODULE_NAME).o |
58 |
+obj-$(CONFIG_RTL8812AU) := $(MODULE_NAME).o |
59 |
|
60 |
else |
61 |
|
62 |
-export CONFIG_88XXAU = m |
63 |
+export CONFIG_RTL8812AU = m |
64 |
|
65 |
all: modules |
66 |
|
67 |
diff -Nurp linux-5.11/3rdparty/rtl8812au.orig/os_dep/linux/ioctl_cfg80211.c linux-5.11/3rdparty/rtl8812au/os_dep/linux/ioctl_cfg80211.c |
68 |
--- linux-5.11/3rdparty/rtl8812au.orig/os_dep/linux/ioctl_cfg80211.c 2021-03-07 18:43:20.371675404 +0200 |
69 |
+++ linux-5.11/3rdparty/rtl8812au/os_dep/linux/ioctl_cfg80211.c 2021-03-07 18:43:51.402141772 +0200 |
70 |
@@ -2646,7 +2646,7 @@ void rtw_cfg80211_unlink_bss(_adapter *p |
71 |
#endif |
72 |
|
73 |
if (!wiphy) { |
74 |
- pr_info("88XXAU: rtw_cfg80211_unlink_bss: wiphy is NULL\n"); |
75 |
+ pr_info("8812AU: rtw_cfg80211_unlink_bss: wiphy is NULL\n"); |
76 |
return; |
77 |
} |
78 |
|