From 2f74e36e84064ffa32f82f3decf36b653c7e4fad Mon Sep 17 00:00:00 2001 From: Dmitry Shmidt Date: Wed, 21 Jan 2015 13:19:05 -0800 Subject: Cumulative patch from commit fb09ed338919db09f3990196171fa73b37e7a17f (DO NOT MERGE) fb09ed3 Interworking: Notify the ANQP parsing status d10b01d HS20: Provide appropriate permission to the OSU related files 73f1ee0 HS20: Fix TrustRoot path for PolicyUpdate node in PPS MO 54a0ac0 HS20: Return result of cmd_sub_rem in hs20-osu-client b62b0cb WNM: Fix possible memory leak by free buf 9bd0273 EAP: Fix possible memory leak in eap_ttls_process_decrypted() b760e64 eap_server: Avoid NULL pointer dereference in eap_fast_encrypt_phase2() 948d3a8 hostapd: Remove unused variable from hostapd_get_hw_features dd09e42 Fix memory leak in wpa_supplicant global bgscan configuration 30f459c wpa_cli: Fix NULL dereference on printf string argument 414f23d Avoid NULL string in printf on EAP method names in authenticator b72b2ad P2P: Stop p2p_listen/find on wpas_p2p_invite 7b7b444 nl80211: Fix reading of the extended capabilities mask 7e608d1 P2P: Use the correct wpa_s interface to handle P2P state flush fd83335 AP: Enable HT Tx STBC for AP/GO if supported by driver d90bfa9 Move external_scan_running to wpa_radio 0c5f01f Clear reattach flag in fast associate flow 8ad8bc5 NFC: Redirect NFC commands on global control interface 57ae1f5 P2P: Fix P2P invitation with NFC 07565ab WNM: Fix the length of WNM_BSS_QUERY control interface command 2d9c99e Retry scan-for-connect if driver trigger fails 911942e Add a test framework for various wpa_supplicant failure cases 6b46bfa WPS: Re-fix an interoperability issue with mixed mode and AP Settings 1648cc6 ACS: Allow subset of channels to be configured 95ff306 nl80211: Allow HT/VHT to be disabled for IBSS 7451a21 mesh: Return negative value on join failed 5a2a6de mesh: Make inactivity timer configurable b9749ba AP: Expire STA without entry in kernel a114c72 AP: Remove redundant condition for STA expiration 0d787f0 Fix RADIUS client with out-of-memory and missing shared secret 0efcad2 Print in debug log whether attached monitor is for global interface 8266e6c HS 2.0: Try to use same BSS entry for storing GAS results 6c69991 Make wpa_supplicant FLUSH command more likely to clear all BSS entries 2dbe63a Write reason for scan only_new_results into debug log 242b83a eapol_test: Fix cert_cb() function arguments a8826b1 Interworking: Avoid busy loop in scan result mismatch corner cases edd5939 Interworking: Start ANQP fetch from eloop callback cbc210d RADIUS DAS: Allow PMKSA cache entry to be removed without association 4e871ed RADIUS DAS: Support Acct-Multi-Session-Id as a session identifier b52c0d4 Add authMultiSessionId into hostapd STA info 861beb7 RADIUS DAS: Check for single session match for Disconnect-Request 783b2a9 Interworking: Fix INTERWORKING_CONNECT with zero-length SSID BSS entry 1fef85c nl80211: Fix AP-scan-in-STA-mode error path behavior cebee30 Add domain_match network profile parameter d07d3fb Add peer certificate alt subject name information to EAP events 98a4cd4 D-Bus: Clear cached EAP data on network profile changes 483dd6a Include peer certificate always in EAP events dd5f902 Get rid of a compiler warning d29fa3a Extend VENDOR_ELEM parameters to cover non-P2P Association Request e7d0e97 hostapd: Add vendor specific VHT extension for the 2.4 GHz band Change-Id: I45436c49986cd6bddbd869db3f474871a29ce1dc Signed-off-by: Dmitry Shmidt --- hostapd/config_file.c | 2 ++ hostapd/hostapd.conf | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'hostapd') diff --git a/hostapd/config_file.c b/hostapd/config_file.c index e30efbe3..99cd0528 100644 --- a/hostapd/config_file.c +++ b/hostapd/config_file.c @@ -2690,6 +2690,8 @@ static int hostapd_config_fill(struct hostapd_config *conf, conf->vht_oper_centr_freq_seg0_idx = atoi(pos); } else if (os_strcmp(buf, "vht_oper_centr_freq_seg1_idx") == 0) { conf->vht_oper_centr_freq_seg1_idx = atoi(pos); + } else if (os_strcmp(buf, "vendor_vht") == 0) { + bss->vendor_vht = atoi(pos); #endif /* CONFIG_IEEE80211AC */ } else if (os_strcmp(buf, "max_listen_interval") == 0) { bss->max_listen_interval = atoi(pos); diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf index 2f6126c3..b370f21f 100644 --- a/hostapd/hostapd.conf +++ b/hostapd/hostapd.conf @@ -158,10 +158,7 @@ channel=1 #acs_num_scans=5 # Channel list restriction. This option allows hostapd to select one of the -# provided channels when a channel should be automatically selected. This -# is currently only used for DFS when the current channels becomes unavailable -# due to radar interference, and is currently only useful when ieee80211h=1 is -# set. +# provided channels when a channel should be automatically selected. # Default: not set (allow any enabled channel to be selected) #chanlist=100 104 108 112 116 -- cgit v1.2.3