diff options
| author | bernard <[email protected]> | 2017-11-03 11:45:19 +0800 |
|---|---|---|
| committer | bernard <[email protected]> | 2017-11-03 11:45:19 +0800 |
| commit | e453f36841787c419525bfff2181a719ee69f0a5 (patch) | |
| tree | 5ebf87a7b833cac26d904d289535f9c4f3593e2e /components | |
| parent | 6d9fcd04d2fe0ed5f8d2df220f209cbbc8d1907b (diff) | |
| parent | 0941957eb703769dcf62143adfae2c2dc806ff77 (diff) | |
Merge branch 'master' of https://github.com/RT-Thread/rt-thread
Diffstat (limited to 'components')
| -rw-r--r-- | components/drivers/wlan/wlan_cmd.c | 4 | ||||
| -rw-r--r-- | components/net/KConfig | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/components/drivers/wlan/wlan_cmd.c b/components/drivers/wlan/wlan_cmd.c index 21afd7020a..2ff0db903d 100644 --- a/components/drivers/wlan/wlan_cmd.c +++ b/components/drivers/wlan/wlan_cmd.c @@ -404,7 +404,7 @@ int wifi(int argc, char** argv) wlan = (struct rt_wlan_device*)rt_device_find(argv[1]); if (!wlan) { - rt_kprintf("no wlan:%s device\n"); + rt_kprintf("no wlan:%s device\n", argv[1]); return 0; } @@ -480,6 +480,7 @@ int wifi(int argc, char** argv) rt_wlan_info_init(info, WIFI_AP, SECURITY_OPEN, argv[3]); info->channel = 11; + result =rt_wlan_init(wlan, WIFI_AP); /* start soft ap */ result = rt_wlan_softap(wlan, info, NULL); } @@ -489,6 +490,7 @@ int wifi(int argc, char** argv) rt_wlan_info_init(info, WIFI_AP, SECURITY_WPA2_AES_PSK, argv[3]); info->channel = 11; + result =rt_wlan_init(wlan, WIFI_AP); /* start soft ap */ result = rt_wlan_softap(wlan, info, argv[4]); } diff --git a/components/net/KConfig b/components/net/KConfig index cd758cd33a..b5f50de180 100644 --- a/components/net/KConfig +++ b/components/net/KConfig @@ -55,7 +55,7 @@ config RT_USING_LWIP default n endif - if !RT_LWIP_DHCP + menu "Static IPv4 Address" config RT_LWIP_IPADDR string "IPv4: IP address" default 192.168.1.30 @@ -67,7 +67,7 @@ config RT_USING_LWIP config RT_LWIP_MSKADDR string "IPv4: Mask address" default 255.255.255.0 - endif + endmenu config RT_LWIP_UDP bool "UDP protocol" |