From 1836d8f28d7657ba20c61f8dc0339ef3053e9655 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 17 Aug 2022 23:10:27 +0800 Subject: [PATCH 1/2] bugfix for wpa 0817 Signed-off-by: yanxiaotao --- wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c | 4 ++++ .../wpa_supplicant_lib/driver_nl80211_hisi.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c b/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c index 2862208..70234ce 100755 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c @@ -2965,6 +2965,10 @@ static int wpa_supplicant_ctrl_iface_scan_result( #ifdef CONFIG_OPEN_HARMONY_PATCH for (int j = 0; j < WLAN_EID_EXTENSION; j++) { + if ((j != WLAN_EID_VHT_OPERATION) && (j != WLAN_EID_HT_OPERATION) && + j != WLAN_EID_SUPPORTED_CHANNELS) { + continue; + } infoEle = wpa_bss_get_ie(bss, j); if (infoEle && infoEle[1] > 0) { ret = os_snprintf(pos, end - pos, "[%d ", j); diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant_lib/driver_nl80211_hisi.c b/wpa_supplicant-2.9_standard/wpa_supplicant_lib/driver_nl80211_hisi.c index 9e7aaa7..f724894 100644 --- a/wpa_supplicant-2.9_standard/wpa_supplicant_lib/driver_nl80211_hisi.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant_lib/driver_nl80211_hisi.c @@ -224,7 +224,7 @@ int wpa_driver_nl80211_driver_cmd(void *priv, char *cmd, char *buf, size_t buf_l ifr.ifr_data = (void *)&priv_cmd; os_strlcpy(ifr.ifr_name, bss->ifname, IFNAMSIZ); - wpa_printf(MSG_EXCESSIVE, "%s: 1:ifr_name=%s, buf:%s len=%zu, buf_len=%zu", __func__, ifr.ifr_name, buf, strlen(buf), buf_len); + wpa_printf(MSG_EXCESSIVE, "%s: 1:ifr_name=%s, len=%zu, buf_len=%zu", __func__, ifr.ifr_name, strlen(buf), buf_len); ret = ioctl(drv->global->ioctl_sock, SIOCDEVPRIVATE + 1, &ifr); if (ret < 0) -- Gitee From ef8048d886a9ee8ae125f23704d8efac95c8fd28 Mon Sep 17 00:00:00 2001 From: yanxiaotao Date: Wed, 17 Aug 2022 23:18:28 +0800 Subject: [PATCH 2/2] bugfix for wpa 0817 Signed-off-by: yanxiaotao --- wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c b/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c index 70234ce..5c82630 100755 --- a/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant-2.9_standard/wpa_supplicant/ctrl_iface.c @@ -2966,7 +2966,7 @@ static int wpa_supplicant_ctrl_iface_scan_result( #ifdef CONFIG_OPEN_HARMONY_PATCH for (int j = 0; j < WLAN_EID_EXTENSION; j++) { if ((j != WLAN_EID_VHT_OPERATION) && (j != WLAN_EID_HT_OPERATION) && - j != WLAN_EID_SUPPORTED_CHANNELS) { + (j != WLAN_EID_SUPPORTED_CHANNELS) && (j != WLAN_EID_COUNTRY)) { continue; } infoEle = wpa_bss_get_ie(bss, j); -- Gitee