JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

[AR-1527] Remove unnecessary patches for rtl8822cs (#4768)

Browse Source
This commit is contained in:
Vyacheslav
2023-01-30 19:28:23 +03:00
committed by GitHub
parent 726023c4e2
commit 3e6188f5ed
3 changed files with 0 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
patch/misc/wireless-rtl88x2cs-Fix-p2p-go-advertising.patch
View File

@@ -1,48 +0,0 @@
From dc53976d72d740fd83fc7de434381b8981740da7 Mon Sep 17 00:00:00 2001
From: Kirill Zhumarin <kirill.zhumarin@gmail.com>
Date: Fri, 20 Jan 2023 00:00:17 +0000
Subject: [PATCH] Fix p2p-go advertising
Signed-off-by: Kirill Zhumarin <kirill.zhumarin@gmail.com>
---
.../rtl88x2cs/os_dep/linux/ioctl_cfg80211.c | 18 +++++++++++++++++
1 file changed, 18 insertions(+), 0 deletion(-)
diff --git a/drivers/net/wireless/rtl88x2cs/os_dep/linux/ioctl_cfg80211.c b/drivers/net/wireless/rtl88x2cs/os_dep/linux/ioctl_cfg80211.c
index 452d93ab6..cc888bf5f 100755
--- a/drivers/net/wireless/rtl88x2cs/os_dep/linux/ioctl_cfg80211.c
+++ b/drivers/net/wireless/rtl88x2cs/os_dep/linux/ioctl_cfg80211.c
@@ -5494,6 +5494,15 @@ static int cfg80211_rtw_start_ap(struct wiphy *wiphy, struct net_device *ndev,
ret = rtw_add_beacon(adapter, settings->beacon.head, settings->beacon.head_len,
settings->beacon.tail, settings->beacon.tail_len);
+ // In cases like WPS, the proberesp and assocresp IEs vary from the beacon, and need to be explicitly set
+ if (ret == 0) {
+ if (settings->beacon.proberesp_ies && settings->beacon.proberesp_ies_len > 0)
+ rtw_cfg80211_set_mgnt_wpsp2pie(ndev, (char *) settings->beacon.proberesp_ies, settings->beacon.proberesp_ies_len, 0x2 /*PROBE_RESP*/);
+
+ if (settings->beacon.assocresp_ies && settings->beacon.assocresp_ies_len > 0)
+ rtw_cfg80211_set_mgnt_wpsp2pie(ndev, (char *) settings->beacon.assocresp_ies, settings->beacon.assocresp_ies_len, 0x4 /*ASSOC_RESP*/);
+ }
+
if (settings->ssid && settings->ssid_len) {
WLAN_BSSID_EX *pbss_network = &adapter->mlmepriv.cur_network.network;
WLAN_BSSID_EX *pbss_network_ext = &adapter->mlmeextpriv.mlmext_info.network;
@@ -5528,6 +5537,15 @@ static int cfg80211_rtw_change_beacon(struct wiphy *wiphy, struct net_device *nd
ret = rtw_add_beacon(adapter, info->head, info->head_len, info->tail, info->tail_len);
+ // In cases like WPS, the proberesp and assocresp IEs vary from the beacon, and need to be explicitly set
+ if (ret == 0) {
+ if (info->proberesp_ies && info->proberesp_ies_len > 0)
+ rtw_cfg80211_set_mgnt_wpsp2pie(ndev, (char *) info->proberesp_ies, info->proberesp_ies_len, 0x2 /*PROBE_RESP*/);
+
+ if (info->assocresp_ies && info->assocresp_ies_len > 0)
+ rtw_cfg80211_set_mgnt_wpsp2pie(ndev, (char *) info->assocresp_ies, info->assocresp_ies_len, 0x4 /*ASSOC_RESP*/);
+ }
+
return ret;
}
--
Created with Armbian build tools https://github.com/armbian/build

26
patch/misc/wireless-rtl88x2cs-Make-different-MAC-for-if1.patch
View File

@@ -1,26 +0,0 @@
From a6acdedc2b194f36f089630fb966b56408623c99 Mon Sep 17 00:00:00 2001
From: Kirill Zhumarin <kirill.zhumarin@gmail.com>
Date: Thu, 19 Jan 2023 22:41:55 +0000
Subject: [PATCH] Make different MAC for if1
Signed-off-by: Kirill Zhumarin <kirill.zhumarin@gmail.com>
---
drivers/net/wireless/rtl88x2cs/os_dep/linux/os_intfs.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/rtl88x2cs/os_dep/linux/os_intfs.c b/drivers/net/wireless/rtl88x2cs/os_dep/linux/os_intfs.c
index 6494e2d4e..555fe631c 100644
--- a/drivers/net/wireless/rtl88x2cs/os_dep/linux/os_intfs.c
+++ b/drivers/net/wireless/rtl88x2cs/os_dep/linux/os_intfs.c
@@ -3218,7 +3218,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[0] ^= ((padapter->iface_id)<<2);
_rtw_memcpy(adapter_mac_addr(padapter), mac, ETH_ALEN);
--
Created with Armbian build tools https://github.com/armbian/build