diff options
author | Jouni Malinen <jouni.malinen@atheros.com> | 2009-12-21 16:10:21 +0200 |
---|---|---|
committer | Jouni Malinen <j@w1.fi> | 2009-12-21 16:10:21 +0200 |
commit | 094393b1447df668015bfed0fa19e9ad29b217fa (patch) | |
tree | 5d3ff1b21fb7f40cd8933b6e6ceef981b7c6720a | |
parent | c0e4dd9eeb96fa39cc8bd6151fbf5a7a9cc46a97 (diff) | |
download | external_wpa_supplicant_8_ti-094393b1447df668015bfed0fa19e9ad29b217fa.zip external_wpa_supplicant_8_ti-094393b1447df668015bfed0fa19e9ad29b217fa.tar.gz external_wpa_supplicant_8_ti-094393b1447df668015bfed0fa19e9ad29b217fa.tar.bz2 |
Copy config_methods and device_type configuration for AP mode
-rw-r--r-- | hostapd/config.h | 6 | ||||
-rw-r--r-- | wpa_supplicant/ap.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/hostapd/config.h b/hostapd/config.h index 5202645..0201a1d 100644 --- a/hostapd/config.h +++ b/hostapd/config.h @@ -12,8 +12,8 @@ * See README and COPYING for more details. */ -#ifndef CONFIG_H -#define CONFIG_H +#ifndef HOSTAPD_CONFIG_H +#define HOSTAPD_CONFIG_H #include "common/defs.h" #include "ip_addr.h" @@ -386,4 +386,4 @@ const struct hostapd_eap_user * hostapd_get_eap_user(const struct hostapd_bss_config *conf, const u8 *identity, size_t identity_len, int phase2); -#endif /* CONFIG_H */ +#endif /* HOSTAPD_CONFIG_H */ diff --git a/wpa_supplicant/ap.c b/wpa_supplicant/ap.c index 41d86f1..2e52adf 100644 --- a/wpa_supplicant/ap.c +++ b/wpa_supplicant/ap.c @@ -28,6 +28,7 @@ #include "eap_common/eap_wsc_common.h" #include "wps/wps.h" #include "config_ssid.h" +#include "config.h" #include "wpa_supplicant_i.h" #include "driver_i.h" #include "ap.h" @@ -391,7 +392,10 @@ static int wpa_supplicant_conf_ap(struct wpa_supplicant *wpa_s, bss->eap_server = 1; bss->wps_state = 2; bss->ap_setup_locked = 1; - bss->config_methods = os_strdup("display push_button keypad"); + if (wpa_s->conf->config_methods) + bss->config_methods = os_strdup(wpa_s->conf->config_methods); + if (wpa_s->conf->device_type) + bss->device_type = os_strdup(wpa_s->conf->device_type); #endif /* CONFIG_WPS */ return 0; |