diff options
author | Dmitry Shmidt <dimitrysh@google.com> | 2012-05-02 12:29:53 -0700 |
---|---|---|
committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-05-02 12:31:35 -0700 |
commit | 2fb777c379ad560c309c54b96c2c13291da23f54 (patch) | |
tree | 000fb15aa1092ccd323a5046b19a33ffa95d246b /wpa_supplicant/ctrl_iface.c | |
parent | 3eb807eec9a305f9a2bc87964925ec81bfc4eb1e (diff) | |
download | external_wpa_supplicant_8-2fb777c379ad560c309c54b96c2c13291da23f54.zip external_wpa_supplicant_8-2fb777c379ad560c309c54b96c2c13291da23f54.tar.gz external_wpa_supplicant_8-2fb777c379ad560c309c54b96c2c13291da23f54.tar.bz2 |
wpa_supplicant: Update to Version 0.8.26 from BRCM
- Add interface command
- Improve scan handling during P2P
BUG: b/6324527, b/6427094
Change-Id: I4425f44d2a15de0725ba4a1b42cc56e10954b314
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'wpa_supplicant/ctrl_iface.c')
-rw-r--r-- | wpa_supplicant/ctrl_iface.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/wpa_supplicant/ctrl_iface.c b/wpa_supplicant/ctrl_iface.c index caecf75..06b725b 100644 --- a/wpa_supplicant/ctrl_iface.c +++ b/wpa_supplicant/ctrl_iface.c @@ -3307,17 +3307,17 @@ static int p2p_ctrl_set(struct wpa_supplicant *wpa_s, char *cmd) return 0; } #ifdef ANDROID_P2P - if (os_strcmp(cmd, "conc_priority") == 0) { - if(os_strncmp(cmd+strlen("conc_priority")+1, "sta", 3) == 0) - os_strncpy(wpa_s->global->conc_priority, "sta", 3); - else if(os_strncmp(cmd+strlen("conc_priority")+1, "p2p", 3) == 0) - os_strncpy(wpa_s->global->conc_priority, "p2p", 3); + if (os_strcmp(cmd, "conc_pref") == 0) { + if (os_strcmp(param, "sta") == 0) + wpa_s->global->conc_pref = WPA_CONC_PREF_STA; + else if (os_strcmp(param, "p2p") == 0) + wpa_s->global->conc_pref = WPA_CONC_PREF_P2P; else { - wpa_printf(MSG_ERROR, " conc_priority arg should be either sta or p2p"); + wpa_printf(MSG_INFO, "Invalid conc_pref value"); return -1; } - wpa_printf(MSG_DEBUG, "Single Channel Concurrency: Prioritize %s", - wpa_s->global->conc_priority); + wpa_printf(MSG_DEBUG, "Single channel concurrency preference: " + "%s", param); return 0; } #endif |