diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2010-08-17 17:46:58 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2010-08-17 17:46:58 -0700 |
| commit | 742445b1aa76dcf2013a5f19fd7b35f8c2187c0e (patch) | |
| tree | 149e0b704921673b6d6021fd63dbfb28a347b82c /wl1271/CUDK/configurationutility | |
| parent | 3d73bc524e6ae606ae03d13caf71f39ccba02962 (diff) | |
| download | wlan-742445b1aa76dcf2013a5f19fd7b35f8c2187c0e.tar.gz | |
wl1271: Fix WPS support for wpa_supplicant 0.6.10
Change-Id: Ic0d6af77d2a9ea88000c26f2ee29956b48ba285c
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'wl1271/CUDK/configurationutility')
| -rw-r--r-- | wl1271/CUDK/configurationutility/Android.mk | 4 | ||||
| -rw-r--r-- | wl1271/CUDK/configurationutility/src/wpa_core.c | 22 |
2 files changed, 23 insertions, 3 deletions
diff --git a/wl1271/CUDK/configurationutility/Android.mk b/wl1271/CUDK/configurationutility/Android.mk index 0809fff3..6393ba51 100644 --- a/wl1271/CUDK/configurationutility/Android.mk +++ b/wl1271/CUDK/configurationutility/Android.mk @@ -49,6 +49,10 @@ ifeq ($(WPA_ENTERPRISE), y) DK_DEFINES += -D WPA_ENTERPRISE endif +ifeq ($(WPA_SUPPLICANT_VERSION),VER_0_6_X) + DK_DEFINES += -DSUPPL_WPS_SUPPORT +endif + #DK_DEFINES += -D NO_WPA_SUPPL #Supplicant image building diff --git a/wl1271/CUDK/configurationutility/src/wpa_core.c b/wl1271/CUDK/configurationutility/src/wpa_core.c index d008ca2e..f771625c 100644 --- a/wl1271/CUDK/configurationutility/src/wpa_core.c +++ b/wl1271/CUDK/configurationutility/src/wpa_core.c @@ -416,18 +416,34 @@ S32 WpaCore_GetDefaultKey(THandle hWpaCore, U32* pDefaultKeyIndex) S32 WpaCore_StartWpsPIN(THandle hWpaCore) { TWpaCore* pWpaCore = (TWpaCore*)hWpaCore; +#ifdef SUPPL_WPS_SUPPORT + S8 cmd[100]; +#endif pWpaCore->WpaSupplParams.WscMode = WSC_MODE_PIN; - + +#ifdef SUPPL_WPS_SUPPORT + os_sprintf(cmd, "WPS_PIN any"); + IpcWpa_Command(pWpaCore->hIpcWpa, cmd, TRUE); +#endif + return OK; } S32 WpaCore_StartWpsPBC(THandle hWpaCore) { TWpaCore* pWpaCore = (TWpaCore*)hWpaCore; - +#ifdef SUPPL_WPS_SUPPORT + S8 cmd[100]; +#endif + pWpaCore->WpaSupplParams.WscMode = WSC_MODE_PBC; - + +#ifdef SUPPL_WPS_SUPPORT + os_sprintf(cmd, "WPS_PBC"); + IpcWpa_Command(pWpaCore->hIpcWpa, cmd, TRUE); +#endif + return OK; } |