summaryrefslogtreecommitdiff
path: root/components
diff options
context:
space:
mode:
authorBernard Xiong <[email protected]>2018-10-18 15:59:31 +0800
committerGitHub <[email protected]>2018-10-18 15:59:31 +0800
commitce2313d2d33ea28ba6d4213f97726a77e0d1bc75 (patch)
tree54674e7c98b3c0c9cf13b43ab30a219b3c4d30a8 /components
parent29b49f46ddd495aaeb7c75880d8515623d656982 (diff)
parent1e0e221dd7354a64ad00369dc15b8135baf7511a (diff)
Merge pull request #1906 from enkiller/wlan-dev
[components][wlan] 修复某些情况下模式初始化两遍的bug
Diffstat (limited to 'components')
-rw-r--r--components/drivers/wlan/wlan_mgnt.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/components/drivers/wlan/wlan_mgnt.c b/components/drivers/wlan/wlan_mgnt.c
index c8f190239c..1d0b0c4aa7 100644
--- a/components/drivers/wlan/wlan_mgnt.c
+++ b/components/drivers/wlan/wlan_mgnt.c
@@ -495,7 +495,7 @@ static void rt_wlan_event_dispatch(struct rt_wlan_device *device, rt_wlan_dev_ev
{
user_buff = *buff;
}
- /* 事件处理 */
+ /* Event Handle */
switch (event)
{
case RT_WLAN_DEV_EVT_CONNECT:
@@ -737,9 +737,12 @@ rt_err_t rt_wlan_set_mode(const char *dev_name, rt_wlan_mode_t mode)
RT_WLAN_LOG_E("not find device, set mode failed! name:%s", dev_name);
return -RT_EIO;
}
+
+ MGNT_LOCK();
if (RT_WLAN_DEVICE(device)->mode == mode)
{
RT_WLAN_LOG_D("L:%d this device mode is set");
+ MGNT_UNLOCK();
return RT_EOK;
}
@@ -747,19 +750,21 @@ rt_err_t rt_wlan_set_mode(const char *dev_name, rt_wlan_mode_t mode)
(RT_WLAN_DEVICE(device)->flags & RT_WLAN_FLAG_AP_ONLY))
{
RT_WLAN_LOG_I("this device ap mode only");
+ MGNT_UNLOCK();
return -RT_ERROR;
}
else if ((mode == RT_WLAN_AP) &&
(RT_WLAN_DEVICE(device)->flags & RT_WLAN_FLAG_STA_ONLY))
{
RT_WLAN_LOG_I("this device sta mode only");
+ MGNT_UNLOCK();
return -RT_ERROR;
}
+
/*
* device == sta and change to ap, should deinit
* device == ap and change to sta, should deinit
*/
- MGNT_LOCK();
if (((mode == RT_WLAN_STATION) && (RT_WLAN_DEVICE(device) == AP_DEVICE())) ||
((mode == RT_WLAN_AP) && (RT_WLAN_DEVICE(device) == STA_DEVICE())))
{
@@ -1627,12 +1632,12 @@ struct rt_wlan_scan_result *rt_wlan_scan_with_info(struct rt_wlan_info *info)
return &scan_result;
}
- /* run scna */
+ /* run scan */
err = rt_wlan_dev_scan(STA_DEVICE(), info);
if (err != RT_EOK)
{
rt_wlan_complete_delete(complete);
- RT_WLAN_LOG_E("scna sync fail");
+ RT_WLAN_LOG_E("scan sync fail");
MGNT_UNLOCK();
return RT_NULL;
}
@@ -1646,7 +1651,7 @@ struct rt_wlan_scan_result *rt_wlan_scan_with_info(struct rt_wlan_info *info)
set = 0x1 << RT_WLAN_DEV_EVT_SCAN_DONE;
if (!(recved & set))
{
- RT_WLAN_LOG_E("scna wait timeout!");
+ RT_WLAN_LOG_E("scan wait timeout!");
MGNT_UNLOCK();
return &scan_result;
}