From f485679601e8e48f61d8bfbfe0959d28c05c2ad4 Mon Sep 17 00:00:00 2001 From: foredward Date: Tue, 22 Jul 2025 17:04:45 +0800 Subject: [PATCH 1/2] p2p shared failed by wlan1 confict Signed-off-by: foredward --- .../wifi_manage/wifi_sta/sta_state_machine.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index c1f4da0be..072625ee5 100755 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -4395,6 +4395,15 @@ ErrCode StaStateMachine::StartConnectToNetwork(int networkId, const std::string #endif WifiSettings::GetInstance().SetUserConnectChoice(networkId); } + + if (m_instId == INSTID_WLAN1) { + WifiState state = WifiConfigCenter::GetInstance().GetWifiMidState(m_instId); + if (state == WifiState::DISABLED || state == WifiState::DISABLING) { + WIFI_LOGE("StartConnectToNetwork %{public}d! sta is not active.", m_instId); + return WIFI_OPT_FAILED; + } + } + WifiDeviceConfig deviceConfig; if (WifiSettings::GetInstance().GetDeviceConfig(networkId, deviceConfig, m_instId) != 0) { WIFI_LOGE("StartConnectToNetwork get GetDeviceConfig failed!"); -- Gitee From 2f3eeb0e9d59f9891870577359fe3483d39081ec Mon Sep 17 00:00:00 2001 From: foredward Date: Tue, 22 Jul 2025 17:04:45 +0800 Subject: [PATCH 2/2] p2p shared failed by wlan1 confict Signed-off-by: foredward --- .../wifi_manage/wifi_sta/sta_state_machine.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp index c1f4da0be..425fe9ae2 100755 --- a/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp +++ b/wifi/services/wifi_standard/wifi_framework/wifi_manage/wifi_sta/sta_state_machine.cpp @@ -4395,6 +4395,15 @@ ErrCode StaStateMachine::StartConnectToNetwork(int networkId, const std::string #endif WifiSettings::GetInstance().SetUserConnectChoice(networkId); } + + if (m_instId == INSTID_WLAN1) { + WifiState state = static_cast(WifiConfigCenter::GetInstance().GetWifiMidState(m_instId)); + if (state == WifiState::DISABLED || state == WifiState::DISABLING) { + WIFI_LOGE("StartConnectToNetwork %{public}d! sta is not active.", m_instId); + return WIFI_OPT_FAILED; + } + } + WifiDeviceConfig deviceConfig; if (WifiSettings::GetInstance().GetDeviceConfig(networkId, deviceConfig, m_instId) != 0) { WIFI_LOGE("StartConnectToNetwork get GetDeviceConfig failed!"); -- Gitee