diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2014-03-11 17:26:21 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2014-03-11 17:26:21 -0700 |
| commit | 9866086a955d00e237cc8df3722e7dff75c02532 (patch) | |
| tree | b5264b608cb63305c437f07e0dec1e45ab0c0365 /hostapd/hostapd.conf | |
| parent | 818ea489ef32dcdc7c098d8a336d6e1dd8996112 (diff) | |
| download | android_external_wpa_supplicant_8-9866086a955d00e237cc8df3722e7dff75c02532.tar.gz android_external_wpa_supplicant_8-9866086a955d00e237cc8df3722e7dff75c02532.tar.bz2 android_external_wpa_supplicant_8-9866086a955d00e237cc8df3722e7dff75c02532.zip | |
Cumulative patch from commit 99cd77a8c50413d44f1ebead917310468a8406de
99cd77a tests: Verify reassociate-to-same-BSS commands
e8d70a7 nl80211: Hide deauth event due to forced deauth-during-auth
0f44ec8 Add a reattach command for fast reassociate-back-to-same-BSS
cfc393a hostapd: Document interworking realm EAP Method types
7450c12 DFS: Add extra debugging messages
5d0d72a wpa_supplicant: Put upper bound on initial scan time delay
8c06db7 nl80211: Fix P2P Device handling when starting with RF-kill blocked
5e3ddf4 PNO: Change sched_scan_stopped event to handle pending PNO properly
737e7a0 PNO: Move and rename pno_start()/pno_stop()
1d91f50 hostapd: Process management frames only once per BSS
e070051 hostapd: Allow to switch to usable DFS channels
01b9999 hostapd: Allow to switch to DFS channels if available
70ee1be hostapd: Add config option chanlist for DFS channels
09eef14 Use internal FIPS 186-2 PRF if needed
3b9c517 Fix PTK derivation for CCMP-256 and GCMP-256
e6ef73f nl80211: Add debug print of KEY_DATA and KEY_SEQ
b465f5d Remove unused hostapd_wep_key_cmp()
4fb363c Fix error path handling on radius_accept_attr
Change-Id: I28ecac6cbcc6f71f19a051c12b54668ca6a66e2a
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'hostapd/hostapd.conf')
| -rw-r--r-- | hostapd/hostapd.conf | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf index c745fe83..81ddabc2 100644 --- a/hostapd/hostapd.conf +++ b/hostapd/hostapd.conf @@ -154,6 +154,14 @@ channel=1 # Defaults: #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. +# Default: not set (allow any enabled channel to be selected) +#chanlist=100 104 108 112 116 + # Beacon interval in kus (1.024 ms) (default: 100; range 15..65535) beacon_int=100 @@ -1540,6 +1548,8 @@ own_ip_addr=127.0.0.1 # accordance with IETF RFC 4282 # NAI Realm(s): Semi-colon delimited NAI Realm(s) # EAP Method: <EAP Method>[:<[AuthParam1:Val1]>][<[AuthParam2:Val2]>][...] +# EAP Method types, see: +# http://www.iana.org/assignments/eap-numbers/eap-numbers.xhtml#eap-numbers-4 # AuthParam (Table 8-188 in IEEE Std 802.11-2012): # ID 2 = Non-EAP Inner Authentication Type # 1 = PAP, 2 = CHAP, 3 = MSCHAP, 4 = MSCHAPV2 |