sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wireless/wapi: Fix issue of getting the operating frequency

Browse Source
This commit is contained in:
chenwen 2021-04-09 19:02:18 +08:00 committed by Xiang Xiao
parent 852aa8a511
commit 39c5fa812d
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/wireless/wapi.h
View File

@ -125,8 +125,8 @@ enum wapi_route_target_e
enum wapi_essid_flag_e enum wapi_essid_flag_e
{ {
WAPI_ESSID_OFF, WAPI_ESSID_OFF = IW_ESSID_OFF,
WAPI_ESSID_ON, WAPI_ESSID_ON = IW_ESSID_ON,
/* Extended flag "WAPI_ESSID_DELAY_ON" instructs the driver /* Extended flag "WAPI_ESSID_DELAY_ON" instructs the driver
* to delay the connection behavior of essid, so that which can accept * to delay the connection behavior of essid, so that which can accept
@ -155,7 +155,7 @@ enum wapi_essid_flag_e
* $ renew wlan0 * $ renew wlan0
*/ */
WAPI_ESSID_DELAY_ON WAPI_ESSID_DELAY_ON = IW_ESSID_DELAY_ON
}; };
/* Supported operation modes. */ /* Supported operation modes. */

6
wireless/wapi/src/wapi.c
View File

@ -137,6 +137,10 @@ static const struct wapi_command_s g_wapi_commands[] =
#define NCOMMANDS (sizeof(g_wapi_commands) / sizeof(struct wapi_command_s)) #define NCOMMANDS (sizeof(g_wapi_commands) / sizeof(struct wapi_command_s))
/* Maximum length of the PASSPHRASE, refer to IEEE802.11i specification */
#define PASSPHRASE_MAX_LEN (64)
/**************************************************************************** /****************************************************************************
* Private Functions * Private Functions
****************************************************************************/ ****************************************************************************/
@ -842,7 +846,7 @@ static int wapi_save_config_cmd(int sock, int argc, FAR char **argv)
uint8_t if_flags; uint8_t if_flags;
uint32_t value; uint32_t value;
size_t psk_len; size_t psk_len;
char psk[32]; char psk[PASSPHRASE_MAX_LEN];
int ret; int ret;
ret = netlib_getifstatus(argv[0], &if_flags); ret = netlib_getifstatus(argv[0], &if_flags);

4
wireless/wapi/src/wireless.c
View File

@ -475,11 +475,11 @@ int wapi_get_freq(int sock, FAR const char *ifname, FAR double *freq,
{ {
/* Set flag. */ /* Set flag. */
if (IW_FREQ_AUTO == (wrq.u.freq.flags & IW_FREQ_AUTO)) if (IW_FREQ_AUTO == wrq.u.freq.flags)
{ {
*flag = WAPI_FREQ_AUTO; *flag = WAPI_FREQ_AUTO;
} }
else if (IW_FREQ_FIXED == (wrq.u.freq.flags & IW_FREQ_FIXED)) else if (IW_FREQ_FIXED == wrq.u.freq.flags)
{ {
*flag = WAPI_FREQ_FIXED; *flag = WAPI_FREQ_FIXED;
} }