aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/wps_supplicant.c
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2014-03-25 15:40:50 (GMT)
committerJouni Malinen <j@w1.fi>2014-03-25 16:33:21 (GMT)
commitc201f93a9eb7e9a9781879d9ecddbc48f9ea80e6 (patch)
tree1c74a5724085a83fc38b2fd63d7ff853c8305b83 /wpa_supplicant/wps_supplicant.c
parent91364b7f10c0c91fc44dc050eb09b2fb859481b4 (diff)
downloadhostap-c201f93a9eb7e9a9781879d9ecddbc48f9ea80e6.zip
hostap-c201f93a9eb7e9a9781879d9ecddbc48f9ea80e6.tar.gz
hostap-c201f93a9eb7e9a9781879d9ecddbc48f9ea80e6.tar.bz2
WPS: Enable WSC 2.0 support unconditionally
There is not much point in building devices with WPS 1.0 only supported nowadays. As such, there is not sufficient justification for maintaining extra complexity for the CONFIG_WPS2 build option either. Remove this by enabling WSC 2.0 support unconditionally. Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'wpa_supplicant/wps_supplicant.c')
-rw-r--r--wpa_supplicant/wps_supplicant.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index c87fa3d..b086c47 100644
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -1301,7 +1301,6 @@ static void wpas_wps_set_sel_reg_cb(void *ctx, int sel_reg, u16 dev_passwd_id,
static u16 wps_fix_config_methods(u16 config_methods)
{
-#ifdef CONFIG_WPS2
if ((config_methods &
(WPS_CONFIG_DISPLAY | WPS_CONFIG_VIRT_DISPLAY |
WPS_CONFIG_PHY_DISPLAY)) == WPS_CONFIG_DISPLAY) {
@@ -1316,7 +1315,6 @@ static u16 wps_fix_config_methods(u16 config_methods)
"virtual_push_button for WPS 2.0 compliance");
config_methods |= WPS_CONFIG_VIRT_PUSHBUTTON;
}
-#endif /* CONFIG_WPS2 */
return config_methods;
}