From c8c6f91e78f935b748118f6d98bc9f4effa3bb02 Mon Sep 17 00:00:00 2001 From: Kirill Date: Sat, 7 Jan 2023 21:58:43 +0200 Subject: [PATCH] RTL8189FS: Fix and enable secondary iface (wlan1) (#4662) * RTL8189FS: Fix and enable wlan1 * fix paths in the patch --- .../compilation/patch/drivers_network.sh | 1 + ...189fs-fix-and-enable-secondary-iface.patch | 43 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 patch/misc/wireless-rtl8189fs-fix-and-enable-secondary-iface.patch diff --git a/lib/functions/compilation/patch/drivers_network.sh b/lib/functions/compilation/patch/drivers_network.sh index 65dc8ff63..fc9c56786 100644 --- a/lib/functions/compilation/patch/drivers_network.sh +++ b/lib/functions/compilation/patch/drivers_network.sh @@ -85,6 +85,7 @@ driver_rtl8189FS() sed -i '/source "drivers\/net\/wireless\/ti\/Kconfig"/a source "drivers\/net\/wireless\/rtl8189fs\/Kconfig"' \ "$kerneldir/drivers/net/wireless/Kconfig" + process_patch_file "${SRC}/patch/misc/wireless-rtl8189fs-fix-and-enable-secondary-iface.patch" "applying" fi } diff --git a/patch/misc/wireless-rtl8189fs-fix-and-enable-secondary-iface.patch b/patch/misc/wireless-rtl8189fs-fix-and-enable-secondary-iface.patch new file mode 100644 index 000000000..be5f8f73d --- /dev/null +++ b/patch/misc/wireless-rtl8189fs-fix-and-enable-secondary-iface.patch @@ -0,0 +1,43 @@ +From 3d022cc1754fbb172ee0026ea0d0d988fa448cc8 Mon Sep 17 00:00:00 2001 +From: Kirill Zhumarin +Date: Fri, 6 Jan 2023 19:57:51 +0200 +Subject: [PATCH] Enable secondary interface (wlan1) + +--- + drivers/net/wireless/rtl8189fs/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/wireless/rtl8189fs/Makefile b/drivers/net/wireless/rtl8189fs/Makefile +index dfca3058..19df1972 100644 +--- a/drivers/net/wireless/rtl8189fs/Makefile ++++ b/drivers/net/wireless/rtl8189fs/Makefile +@@ -24,6 +24,7 @@ EXTRA_CFLAGS += -I$(src)/include + + EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN + EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT ++EXTRA_CFLAGS += -DCONFIG_CONCURRENT_MODE + + EXTRA_LDFLAGS += --strip-debug + +From f62142efac5b115d231fedcfa41ea5161f6d59c7 Mon Sep 17 00:00:00 2001 +From: Kirill Zhumarin +Date: Fri, 6 Jan 2023 19:18:59 +0200 +Subject: [PATCH] Make different MAC for if1 + +--- + drivers/net/wireless/rtl8189fs/os_dep/linux/os_intfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/rtl8189fs/os_dep/linux/os_intfs.c b/drivers/net/wireless/rtl8189fs/os_dep/linux/os_intfs.c +index 44bd029..509f2ab 100644 +--- a/drivers/net/wireless/rtl8189fs/os_dep/linux/os_intfs.c ++++ b/drivers/net/wireless/rtl8189fs/os_dep/linux/os_intfs.c +@@ -3036,7 +3036,7 @@ _adapter *rtw_drv_add_vir_if(_adapter *primary_padapter, + * If it is 1, the address is locally administered + */ + mac[0] |= BIT(1); +- if (padapter->iface_id > IFACE_ID1) ++ if (padapter->iface_id >= IFACE_ID1) + mac[4] ^= BIT(padapter->iface_id); + + _rtw_memcpy(adapter_mac_addr(padapter), mac, ETH_ALEN);