aboutsummaryrefslogtreecommitdiffstats
path: root/hostapd/config_file.c
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2011-05-16 18:35:42 +0300
committerDmitry Shmidt <dimitrysh@google.com>2011-05-24 15:58:05 -0700
commit87fd279308af3f806848c8f2ab65ef18c6ac4c30 (patch)
tree0bd20d56a780a19f210bca634500e8f5f66f52e2 /hostapd/config_file.c
parent29991f40caccd6c45cd7c56ca597f370a4f2b9eb (diff)
downloadandroid_external_wpa_supplicant_8-87fd279308af3f806848c8f2ab65ef18c6ac4c30.tar.gz
android_external_wpa_supplicant_8-87fd279308af3f806848c8f2ab65ef18c6ac4c30.tar.bz2
android_external_wpa_supplicant_8-87fd279308af3f806848c8f2ab65ef18c6ac4c30.zip
Accumulative patch from commit 6d28fb9627155929012cda944aacd5a52ce7051a
nl80211: Fetch assoc_freq from scan table for connect event nl80211: Filter out duplicated BSS table entries from scan results Update BSS table entry if roaming event indicates frequency change WPS: Remove obsolete note about lack for WPS ER support P2P: Include operating class 124 (channels 149,153,157,161) Include nl80211 driver wrapper in default configuration for hostapd Better messages when channel cannot be used in AP mode WPS: Add a workaround for Windows 7 capability discovery for PBC WPS UPnP: Fix UPnP initialization for non-bridge case with some drivers Fix regression in RSN pre-authentication candidate list generation commit 6d28fb9627155929012cda944aacd5a52ce7051a Change-Id: I3c68dad5fe323b1d86aa585c564a75e4fc1a2ea1
Diffstat (limited to 'hostapd/config_file.c')
-rw-r--r--hostapd/config_file.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/hostapd/config_file.c b/hostapd/config_file.c
index 11c8bf01..835f0500 100644
--- a/hostapd/config_file.c
+++ b/hostapd/config_file.c
@@ -2021,6 +2021,8 @@ struct hostapd_config * hostapd_config_read(const char *fname)
} else if (os_strcmp(buf, "upc") == 0) {
os_free(bss->upc);
bss->upc = os_strdup(pos);
+ } else if (os_strcmp(buf, "pbc_in_m1") == 0) {
+ bss->pbc_in_m1 = atoi(pos);
#endif /* CONFIG_WPS */
#ifdef CONFIG_P2P_MANAGER
} else if (os_strcmp(buf, "manage_p2p") == 0) {