Acked-by: Franklin Cooper Jr. <[email protected]> FYI when your sending multiple versions of a patch please include a quick summary of the changes done in each version. This summary shouldn't actually be a part of the commit message but under the "---" lines. Look below for an example.
> -----Original Message----- > From: [email protected] [mailto:meta-arago- > [email protected]] On Behalf Of Machani, Yaniv > Sent: Monday, December 02, 2013 8:08 AM > To: [email protected] > Subject: [meta-arago] [PATCH 03/14 v2] hostap-daemon-wl18xx: Update recipe > to ol_r8.a8.08 version > > From: Yaniv Machani <[email protected]> > > - Build hostap-daemon from TI_Openlink ol_r8.a8.08 > - Add missing includes for building with libnl3. > - Adjusted configuration files. > > Signed-off-by: Yaniv Machani <[email protected]> > --- [Franklin] This would be the right place. For those comments. Below would be an example of what you would put. V2 changes: Reset the PR_append back to a since it is in a brand new recipe. > ...d-change-conf-file-for-better-oob-startup.patch | 1089 > +++++++++++++++++++- > ...8.a6.01.bb => hostap-daemon-wl18xx_r8.a8.08.bb} | 6 +- > .../hostap/hostap-daemon/defconfig | 42 +- > .../recipes-connectivity/hostap/hostap.inc | 3 +- > 4 files changed, 1101 insertions(+), 39 deletions(-) copy meta-arago- > extras/recipes-connectivity/hostap/{hostap-daemon-wl18xx_r8.a6.01.bb => > hostap-daemon-wl18xx_r8.a8.08.bb} (84%) > > diff --git a/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon- > wl18xx/0001-hostapd-change-conf-file-for-better-oob-startup.patch b/meta- > arago-extras/recipes-connectivity/hostap/hostap-daemon-wl18xx/0001- > hostapd-change-conf-file-for-better-oob-startup.patch > index 824d250..aee4531 100644 > --- a/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon- > wl18xx/0001-hostapd-change-conf-file-for-better-oob-startup.patch > +++ b/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon-wl18xx > +++ /0001-hostapd-change-conf-file-for-better-oob-startup.patch > @@ -1,40 +1,1093 @@ > -From f7c1b9d4e18dc650dd0b9da97a91f27f6a4bb5b7 Mon Sep 17 00:00:00 > 2001 > -From: Eyal Reizer <[email protected]> > -Date: Sun, 17 Mar 2013 07:18:55 -0700 > -Subject: [PATCH] hostapd: change conf file for better sdk out of box startup > +From 0649cc8f954a957a32180dc714ab4226503c5a66 Mon Sep 17 00:00:00 > 2001 > +From: Yaniv Mahani <[email protected]> > +Date: Wed, 27 Nov 2013 13:43:55 +0200 > +Subject: [PATCH] hostapd change conf file for better oob startup > > -Change the default channel to 6 and change the ssid to a more -meaningful > name. > - > -Upstream-status: inappropriate [SDK specific patch] > - > -Signed-off-by: Eyal Reizer <[email protected]> > +Changed some of the default parameters > --- > - hostapd/hostapd.conf | 4 ++-- > - 1 file changed, 2 insertions(+), 2 deletions(-) > + hostapd/hostapd.conf | 726 > + +++++++------------------------------------------- > + 1 file changed, 89 insertions(+), 637 deletions(-) > > diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf -index > f71a881..00843aa 100644 > +index f26f310..162fc28 100644 > --- a/hostapd/hostapd.conf > +++ b/hostapd/hostapd.conf > -@@ -83,7 +83,7 @@ ctrl_interface_group=0 > +@@ -1,9 +1,23 @@ > + ##### hostapd configuration file > +############################################## > + # Empty lines and lines starting with # are ignored > ++# > ++# Copyright (C) {2011} Texas Instruments Incorporated - > ++http://www.ti.com/ # # Licensed under the Apache License, Version 2.0 > ++(the "License"); # you may not use this file except in compliance with > ++the License. > ++# You may obtain a copy of the License at # > ++# http://www.apache.org/licenses/LICENSE-2.0 > ++# > ++# Unless required by applicable law or agreed to in writing, software > ++# distributed under the License is distributed on an "AS IS" BASIS, # > ++WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or > implied. > ++# See the License for the specific language governing permissions and > ++# limitations under the License. > + > + # AP netdevice name (without 'ap' postfix, i.e., wlan0 uses wlan0ap > +for # management frames); ath0 for madwifi > +-interface=wlan0 > ++interface=wlan1 > + > + # In case of madwifi, atheros, and nl80211 driver interfaces, an > +additional # configuration parameter, bridge, may be used to notify > +hostapd if the @@ -22,7 +36,7 @@ interface=wlan0 # default: hostap). > +nl80211 is used with all Linux mac80211 drivers. > + # Use driver=none if building hostapd as a standalone RADIUS server > +that does # not control any wireless/wired driver. > +-# driver=hostap > ++driver=nl80211 > + > + # hostapd event logger configuration > + # > +@@ -50,10 +64,8 @@ logger_syslog=-1 > + logger_syslog_level=2 > + logger_stdout=-1 > + logger_stdout_level=2 > +- > + # Dump file for state information (on SIGUSR1) > +-dump_file=/tmp/hostapd.dump > +- > ++dump_file=/var/run/hostapd.dump > + # Interface for separate control program. If this is specified, > +hostapd # will create this directory and a UNIX domain socket for > +listening to requests # from external programs (CLI/GUI, etc.) for > +status information and @@ -63,7 +75,6 @@ dump_file=/tmp/hostapd.dump > # > +/var/run/hostapd is the recommended directory for sockets and by > +default, # hostapd_cli will use it when trying to connect with hostapd. > + ctrl_interface=/var/run/hostapd > +- > + # Access control for the control interface can be configured by > +setting the # directory to allow only members of a group to use > +sockets. This way, it is # possible to run hostapd as root (since it > +needs to change network @@ -77,13 +88,12 @@ > +ctrl_interface=/var/run/hostapd # # This variable can be a group name > +or gid. > + #ctrl_interface_group=wheel > +-ctrl_interface_group=0 > +- > + > ##### IEEE 802.11 related configuration > ####################################### > > # SSID to be used in IEEE 802.11 management frames -ssid=test > +ssid=TexasInstruments_0001 > - > ++ > + # Alternative formats for configuring SSID # (double quoted string, > +hexdump, printf-escaped string) #ssid2="test" > +@@ -93,27 +103,25 @@ ssid=test > # Country code (ISO/IEC 3166-1). Used to set regulatory domain. > # Set as needed to indicate country in which device is operating. > -@@ -107,7 +107,7 @@ hw_mode=g > + # This can limit available channels and transmit power. > +-#country_code=US > ++country_code=US > + > + # Enable IEEE 802.11d. This advertises the country_code and the set of > +allowed # channels and transmit power levels based on the regulatory > +limits. The # country_code setting must be configured with the correct > +country for # IEEE 802.11d functions. > + # (default: 0 = disabled) > +-#ieee80211d=1 > ++ieee80211d=1 > + > + # Operation mode (a = IEEE 802.11a, b = IEEE 802.11b, g = IEEE > +802.11g, # Default: IEEE 802.11b hw_mode=g > +- > + # Channel number (IEEE 802.11) > + # (default: 0, i.e., not set) > + # Please note that some drivers do not use this value from hostapd and > +the > # channel will need to be configured separately with iwconfig. > # When set to 0, automatic channel selection will be engaged. A channel > # will be selected from the desired hw_mode. > -channel=1 > -+channel=6 > - > +- > ++channel=11 > # Automatic channel selection (ACS) whitelist > # (default: not set) > + # Allow only these channels in automatic channel selection @@ -123,39 > ++131,34 @@ channel=1 # (default: not set) # Don't allow these > +channels in automatic channel selection # acs_blacklist=1 2 3 4 5 6 7 > +8 9 10 11 > +- > + # Sync channel to previous operational APs # (default: 0) # Set to 1 > +in order to sync the channel of the current AP to the # channel of an > +operational radio on the same PHY. Note that this # applies to the > +40Mhz operating channel (primary + secondary) > +-#ap_channel_sync=0 > ++ap_channel_sync=1 > + > + # Beacon interval in kus (1.024 ms) (default: 100; range 15..65535) > + beacon_int=100 > +- > + # DTIM (delivery traffic information message) period (range 1..255): > + # number of beacons between DTIMs (1 = every beacon includes DTIM > +element) # (default: 2) > + dtim_period=2 > +- > + # Maximum number of stations allowed in station table. New stations > +will be # rejected after the station table is full. IEEE 802.11 has a > +limit of 2007 # different association IDs, so this number should not be > larger > than that. > + # (default: 2007) > +-max_num_sta=255 > +- > ++max_num_sta=10 > + # RTS/CTS threshold; 2347 = disabled (default); range 0..2347 # If > +this field is not included in hostapd.conf, hostapd will not control # > +RTS threshold and 'iwconfig wlan# rts <val>' can be used to set it. > +-rts_threshold=2347 > ++#rts_threshold=2347 > + > + # Fragmentation threshold; 2346 = disabled (default); range 256..2346 > +# If this field is not included in hostapd.conf, hostapd will not > +control # fragmentation threshold and 'iwconfig wlan# frag <val>' can > +be used to set # it. > +-fragm_threshold=2346 > +- > ++#fragm_threshold=2346 > + # Rate configuration > + # Default is to enable all rates supported by the hardware. This > +configuration # item allows this list be filtered so that only the > +listed rates will be left @@ -167,14 +170,14 @@ fragm_threshold=2346 # > +default: use the most common supported rate setting for the selected # > +hw_mode (i.e., this line can be removed from configuration file in most > +# cases) > +-#supported_rates=10 20 55 110 60 90 120 180 240 360 480 540 > +- > ++supported_rates=10 20 55 110 60 90 120 180 240 360 480 540 > + # Basic rate set configuration > + # List of rates (in 100 kbps) that are included in the basic rate set. > + # If this item is not included, usually reasonable default set is used. > + #basic_rates=10 20 > + #basic_rates=10 20 55 110 > + #basic_rates=60 120 240 > ++basic_rates=10 20 55 110 60 120 240 > + > + # Short Preamble > + # This parameter can be used to enable optional use of short preamble > +for @@ -185,8 +188,7 @@ fragm_threshold=2346 # disabled (and enabled > +when such STAs disassociate) dynamically. > + # 0 = do not allow use of short preamble (default) # 1 = allow use of > +short preamble > +-#preamble=1 > +- > ++preamble=1 > + # Station MAC address -based authentication # Please note that this > +kind of access control requires a driver that uses # hostapd to take > +care of management frame processing and as such, this can be @@ -195,7 > ++197,6 @@ fragm_threshold=2346 # 1 = deny unless in accept list # 2 = > +use external RADIUS server (accept/deny lists are searched first) > + macaddr_acl=0 > +- > + # Accept/deny lists are read from separate files (containing list of > +# MAC addresses, one per line). Use absolute path name to make sure > +that the # files can be read on SIGHUP configuration reloads. > +@@ -209,7 +210,6 @@ macaddr_acl=0 > + # bit 0 = Open System Authentication > + # bit 1 = Shared Key Authentication (requires WEP) > + auth_algs=3 > +- > + # Send empty SSID in beacons and ignore probe request frames that do > +not # specify full SSID, i.e., require stations to know SSID. > + # default: disabled (0) > +@@ -219,14 +219,12 @@ auth_algs=3 > + # with some clients that do not support empty SSID) and ignore probe > + # requests for broadcast SSID > + ignore_broadcast_ssid=0 > +- > + # Additional vendor specfic elements for Beacon and Probe Response > +frames # This parameter can be used to add additional vendor specific > +element(s) into # the end of the Beacon and Probe Response frames. The > +format for these # element(s) is a hexdump of the raw information > +elements (id+len+payload for # one or more elements) > + #vendor_elements=dd0411223301 > +- > + # TX queue parameters (EDCF / bursting) # tx_queue_<queue > +name>_<param> # queues: data0, data1, data2, data3, after_beacon, > +beacon @@ -243,31 +241,31 @@ ignore_broadcast_ssid=0 # to the clients. > + # > + # Low priority / AC_BK = background > +-#tx_queue_data3_aifs=7 > +-#tx_queue_data3_cwmin=15 > +-#tx_queue_data3_cwmax=1023 > +-#tx_queue_data3_burst=0 > ++tx_queue_data3_aifs=7 > ++tx_queue_data3_cwmin=15 > ++tx_queue_data3_cwmax=1023 > ++tx_queue_data3_burst=0 > + # Note: for IEEE 802.11b mode: cWmin=31 cWmax=1023 burst=0 # # > +Normal priority / AC_BE = best effort > +-#tx_queue_data2_aifs=3 > +-#tx_queue_data2_cwmin=15 > +-#tx_queue_data2_cwmax=63 > +-#tx_queue_data2_burst=0 > ++tx_queue_data2_aifs=3 > ++tx_queue_data2_cwmin=15 > ++tx_queue_data2_cwmax=63 > ++tx_queue_data2_burst=0 > + # Note: for IEEE 802.11b mode: cWmin=31 cWmax=127 burst=0 # # High > +priority / AC_VI = video > +-#tx_queue_data1_aifs=1 > +-#tx_queue_data1_cwmin=7 > +-#tx_queue_data1_cwmax=15 > +-#tx_queue_data1_burst=3.0 > ++tx_queue_data1_aifs=1 > ++tx_queue_data1_cwmin=7 > ++tx_queue_data1_cwmax=15 > ++tx_queue_data1_burst=3.0 > + # Note: for IEEE 802.11b mode: cWmin=15 cWmax=31 burst=6.0 # # > +Highest priority / AC_VO = voice > +-#tx_queue_data0_aifs=1 > +-#tx_queue_data0_cwmin=3 > +-#tx_queue_data0_cwmax=7 > +-#tx_queue_data0_burst=1.5 > ++tx_queue_data0_aifs=1 > ++tx_queue_data0_cwmin=3 > ++tx_queue_data0_cwmax=7 > ++tx_queue_data0_burst=1.5 > + # Note: for IEEE 802.11b mode: cWmin=7 cWmax=15 burst=3.3 > + > + # 802.1D Tag (= UP) to AC mappings > +@@ -298,42 +296,42 @@ ignore_broadcast_ssid=0 # note - here cwMin and > +cmMax are in exponent form. the actual cw value used # will be (2^n)-1 > +where n is the value given here # > +-wmm_enabled=1 > ++wme_enabled=1 > + # > + # WMM-PS Unscheduled Automatic Power Save Delivery [U-APSD] # Enable > +this flag if U-APSD supported outside hostapd (eg., Firmware/driver) > +-#uapsd_advertisement_enabled=1 > ++uapsd_advertisement_enabled=1 > + # > + # Low priority / AC_BK = background > +-wmm_ac_bk_cwmin=4 > +-wmm_ac_bk_cwmax=10 > +-wmm_ac_bk_aifs=7 > +-wmm_ac_bk_txop_limit=0 > +-wmm_ac_bk_acm=0 > ++wme_ac_bk_cwmin=4 > ++wme_ac_bk_cwmax=10 > ++wme_ac_bk_aifs=7 > ++wme_ac_bk_txop_limit=0 > ++wme_ac_bk_acm=0 > + # Note: for IEEE 802.11b mode: cWmin=5 cWmax=10 # # Normal priority > +/ AC_BE = best effort > +-wmm_ac_be_aifs=3 > +-wmm_ac_be_cwmin=4 > +-wmm_ac_be_cwmax=10 > +-wmm_ac_be_txop_limit=0 > +-wmm_ac_be_acm=0 > ++wme_ac_be_aifs=3 > ++wme_ac_be_cwmin=4 > ++wme_ac_be_cwmax=10 > ++wme_ac_be_txop_limit=0 > ++wme_ac_be_acm=0 > + # Note: for IEEE 802.11b mode: cWmin=5 cWmax=7 # # High priority / > +AC_VI = video > +-wmm_ac_vi_aifs=2 > +-wmm_ac_vi_cwmin=3 > +-wmm_ac_vi_cwmax=4 > +-wmm_ac_vi_txop_limit=94 > +-wmm_ac_vi_acm=0 > ++wme_ac_vi_aifs=2 > ++wme_ac_vi_cwmin=3 > ++wme_ac_vi_cwmax=4 > ++wme_ac_vi_txop_limit=94 > ++wme_ac_vi_acm=0 > + # Note: for IEEE 802.11b mode: cWmin=4 cWmax=5 txop_limit=188 # # > +Highest priority / AC_VO = voice > +-wmm_ac_vo_aifs=2 > +-wmm_ac_vo_cwmin=2 > +-wmm_ac_vo_cwmax=3 > +-wmm_ac_vo_txop_limit=47 > +-wmm_ac_vo_acm=0 > ++wme_ac_vo_aifs=2 > ++wme_ac_vo_cwmin=2 > ++wme_ac_vo_cwmax=3 > ++wme_ac_vo_txop_limit=47 > ++wme_ac_vo_acm=0 > + # Note: for IEEE 802.11b mode: cWmin=3 cWmax=4 burst=102 > + > + # Static WEP key configuration > +@@ -353,7 +351,6 @@ wmm_ac_vo_acm=0 > + #wep_key1="vwxyz" > + #wep_key2=0102030405060708090a0b0c0d > + #wep_key3=".2.4.6.8.0.23" > +- > + # Station inactivity limit > + # > + # If a station does not send anything in ap_max_inactivity seconds, an > +@@ -369,7 +366,7 @@ wmm_ac_vo_acm=0 # disassociation frame is not > sent > +immediately without first polling # the STA with a data frame. > + # default: 300 (i.e., 5 minutes) > +-#ap_max_inactivity=300 > ++ap_max_inactivity=10000 > + # > + # The inactivity polling can be disabled to disconnect stations based > +on # inactivity timeout so that idle stations are more likely to be > +disconnected @@ -380,7 +377,7 @@ wmm_ac_vo_acm=0 # Disassociate > +stations based on excessive transmission failures or other # > +indications of connection loss. This depends on the driver capabilities > +and # may not be available with all drivers. > +-#disassoc_low_ack=1 > ++disassoc_low_ack=1 > + > + # Maximum allowed Listen Interval (how many Beacon periods STAs are > +allowed to # remain asleep). Default: 65535 (no limit apart from field > +size) @@ -400,14 +397,13 @@ wmm_ac_vo_acm=0 # Client isolation can be > +used to prevent low-level bridging of frames between # associated > +stations in the BSS. By default, this bridging is allowed. > + #ap_isolate=1 > +- > + ##### IEEE 802.11n related configuration > +###################################### > + > + # ieee80211n: Whether IEEE 802.11n (HT) is enabled # 0 = disabled > +(default) # 1 = enabled # Note: You will also need to enable WMM for > +full HT functionality. > +-#ieee80211n=1 > ++ieee80211n=1 > + > + # ht_capab: HT capabilities (list of flags) # LDPC coding capability: > +[LDPC] = supported @@ -442,162 +438,10 @@ wmm_ac_vo_acm=0 # > DSSS/CCK > +Mode in 40 MHz: [DSSS_CCK-40] = allowed (not allowed if not set) # > +PSMP support: [PSMP] (disabled if not set) # L-SIG TXOP protection > +support: [LSIG-TXOP-PROT] (disabled if not set) > +-#ht_capab=[HT40-][SHORT-GI-20][SHORT-GI-40] > ++ht_capab=[SHORT-GI-20][GF] > + > + # Require stations to support HT PHY (reject association if they do > +not) > + #require_ht=1 > +- > +-##### IEEE 802.11ac related configuration > +##################################### > +- > +-# ieee80211ac: Whether IEEE 802.11ac (VHT) is enabled -# 0 = disabled > +(default) -# 1 = enabled -# Note: You will also need to enable WMM for > +full VHT functionality. > +-#ieee80211ac=1 > +- > +-# vht_capab: VHT capabilities (list of flags) -# -# vht_max_mpdu_len: > +[MAX-MPDU-7991] [MAX-MPDU-11454] -# Indicates maximum MPDU length > -# 0 > += 3895 octets (default) -# 1 = 7991 octets -# 2 = 11454 octets -# 3 = > +reserved -# -# supported_chan_width: [VHT160] [VHT160-80PLUS80] -# > +Indicates supported Channel widths -# 0 = 160 MHz & 80+80 channel > +widths are not supported (default) -# 1 = 160 MHz channel width is > +supported -# 2 = 160 MHz & 80+80 channel widths are supported -# 3 = > +reserved -# -# Rx LDPC coding capability: [RXLDPC] -# Indicates support > +for receiving LDPC coded pkts -# 0 = Not supported (default) -# 1 = > +Supported -# -# Short GI for 80 MHz: [SHORT-GI-80] -# Indicates short > +GI support for reception of packets transmitted with TXVECTOR -# params > +format equal to VHT and CBW = 80Mhz -# 0 = Not supported (default) -# 1 > += Supported -# -# Short GI for 160 MHz: [SHORT-GI-160] -# Indicates > +short GI support for reception of packets transmitted with TXVECTOR -# > +params format equal to VHT and CBW = 160Mhz -# 0 = Not supported > +(default) -# 1 = Supported -# -# Tx STBC: [TX-STBC-2BY1] -# Indicates > +support for the transmission of at least 2x1 STBC -# 0 = Not supported > +(default) -# 1 = Supported -# -# Rx STBC: [RX-STBC-1] [RX-STBC-12] > +[RX-STBC-123] [RX-STBC-1234] -# Indicates support for the reception of > +PPDUs using STBC -# 0 = Not supported (default) -# 1 = support of one > +spatial stream -# 2 = support of one and two spatial streams -# 3 = > +support of one, two and three spatial streams -# 4 = support of one, > +two, three and four spatial streams -# 5,6,7 = reserved -# -# SU > +Beamformer Capable: [SU-BEAMFORMER] -# Indicates support for operation > +as a single user beamformer -# 0 = Not supported (default) -# 1 = > +Supported -# -# SU Beamformee Capable: [SU-BEAMFORMEE] -# Indicates > +support for operation as a single user beamformee -# 0 = Not supported > +(default) -# 1 = Supported -# -# Compressed Steering Number of > +Beamformer Antennas Supported: [BF-ANTENNA-2] > +-# Beamformee's capability indicating the maximum number of beamformer > +-# antennas the beamformee can support when sending compressed > beamforming > +-# feedback > +-# If SU beamformer capable, set to maximum value minus 1 -# else > +reserved (default) -# -# Number of Sounding Dimensions: > +[SOUNDING-DIMENSION-2] -# Beamformer's capability indicating the > +maximum value of the NUM_STS parameter -# in the TXVECTOR of a VHT NDP > +-# If SU beamformer capable, set to maximum value minus 1 -# else > +reserved (default) -# -# MU Beamformer Capable: [MU-BEAMFORMER] -# > +Indicates support for operation as an MU beamformer -# 0 = Not > +supported or sent by Non-AP STA (default) -# 1 = Supported -# -# MU > +Beamformee Capable: [MU-BEAMFORMEE] -# Indicates support for operation > +as an MU beamformee -# 0 = Not supported or sent by AP (default) -# 1 = > +Supported -# -# VHT TXOP PS: [VHT-TXOP-PS] -# Indicates whether or not > +the AP supports VHT TXOP Power Save Mode -# or whether or not the STA > +is in VHT TXOP Power Save mode -# 0 = VHT AP doesnt support VHT TXOP PS > +mode (OR) VHT Sta not in VHT TXOP PS -# mode -# 1 = VHT AP supports > +VHT TXOP PS mode (OR) VHT Sta is in VHT TXOP power save -# mode -# -# > ++HTC-VHT Capable: [HTC-VHT] -# Indicates whether or not the STA > +supports receiving a VHT variant HT Control -# field. > +-# 0 = Not supported (default) > +-# 1 = supported > +-# > +-# Maximum A-MPDU Length Exponent: > +[MAX-A-MPDU-LEN-EXP0]..[MAX-A-MPDU-LEN-EXP7] > +-# Indicates the maximum length of A-MPDU pre-EOF padding that the STA > +can recv -# This field is an integer in the range of 0 to 7. > +-# The length defined by this field is equal to -# 2 pow(13 + Maximum > +A-MPDU Length Exponent) -1 octets -# -# VHT Link Adaptation Capable: > +[VHT-LINK-ADAPT2] [VHT-LINK-ADAPT3] -# Indicates whether or not the STA > +supports link adaptation using VHT variant -# HT Control field -# If > ++HTC-VHTcapable is 1 -# 0 = (no feedback) if the STA does not provide > +VHT MFB (default) -# 1 = reserved -# 2 = (Unsolicited) if the STA > +provides only unsolicited VHT MFB -# 3 = (Both) if the STA can provide > +VHT MFB in response to VHT MRQ and if the > +-# STA provides unsolicited VHT MFB > +-# Reserved if +HTC-VHTcapable is 0 > +-# > +-# Rx Antenna Pattern Consistency: [RX-ANTENNA-PATTERN] -# Indicates > +the possibility of Rx antenna pattern change -# 0 = Rx antenna pattern > +might change during the lifetime of an association -# 1 = Rx antenna > +pattern does not change during the lifetime of an association -# -# Tx > +Antenna Pattern Consistency: [TX-ANTENNA-PATTERN] -# Indicates the > +possibility of Tx antenna pattern change -# 0 = Tx antenna pattern > +might change during the lifetime of an association -# 1 = Tx antenna > +pattern does not change during the lifetime of an association > +-#vht_capab=[SHORT-GI-80][HTC-VHT] > +-# > +-# Require stations to support VHT PHY (reject association if they do > +not) > +-#require_vht=1 > +- > +-# 0 = 20 or 40 MHz operating Channel width -# 1 = 80 MHz channel width > +-# 2 = 160 MHz channel width -# 3 = 80+80 MHz channel width > +-#vht_oper_chwidth=1 > +-# > +-# center freq = 5 GHz + (5 * index) > +-# So index 42 gives center freq 5.210 GHz -# which is channel 42 in 5G > +band -# > +-#vht_oper_centr_freq_seg0_idx=42 > +-# > +-# center freq = 5 GHz + (5 * index) > +-# So index 159 gives center freq 5.795 GHz -# which is channel 159 in > +5G band -# > +-#vht_oper_centr_freq_seg1_idx=159 > +- > + ##### IEEE 802.1X-2004 related configuration > +################################## > + > + # Require IEEE 802.1X authorization > +@@ -625,11 +469,10 @@ wmm_ac_vo_acm=0 > + #wep_key_len_broadcast=5 > + #wep_key_len_unicast=5 > + # Rekeying period in seconds. 0 = do not rekey (i.e., set keys only > +once) > +-#wep_rekey_period=300 > +- > ++wep_rekey_period=0 > + # EAPOL-Key index workaround (set bit7) for WinXP Supplicant (needed > +only if # only broadcast keys are used) > +-eapol_key_index_workaround=0 > ++#eapol_key_index_workaround=0 > + > + # EAP reauthentication period in seconds (default: 3600 seconds; 0 = > +disable # reauthentication). > +@@ -640,7 +483,6 @@ eapol_key_index_workaround=0 # mechanism used > in > +wired authentication, but it also requires that the port # is only > +used by one station. > + #use_pae_group_addr=1 > +- > + ##### Integrated EAP server > +################################################### > + > + # Optionally, hostapd can be configured to use an integrated EAP > +server @@ -651,8 +493,7 @@ eapol_key_index_workaround=0 # Use > +integrated EAP server instead of external RADIUS authentication # > +server. This is also needed if hostapd is configured to act as a RADIUS > +# authentication server. > +-eap_server=0 > +- > ++eap_server=1 > + # Path for EAP server user database > + # If SQLite support is included, this can be set to > "sqlite:/path/to/sqlite.db" > + # to use SQLite database instead of a text file. > +@@ -757,21 +598,12 @@ eap_server=0 > + # connect. Note: This is only used with EAP-TTLS and EAP-FAST. If any > +other # EAP method is enabled, the peer will be allowed to connect without > TNC. > + #tnc=1 > +- > +- > +-##### IEEE 802.11f - Inter-Access Point Protocol (IAPP) > +####################### > +- > +-# Interface to be used for IAPP broadcast packets > +-#iapp_interface=eth0 > +- > +- > + ##### RADIUS client configuration > +############################################# > + # for IEEE 802.1X with external Authentication Server, IEEE 802.11 # > +authentication with external ACL for MAC addresses, and accounting > + > + # The own IP address of the access point (used as NAS-IP-Address) > + own_ip_addr=127.0.0.1 > +- > + # Optional NAS-Identifier string for RADIUS messages. When used, this > +should be # a unique to the NAS within the scope of the RADIUS server. > +For example, a # fully qualified domain name can be used here. > +@@ -922,8 +754,6 @@ own_ip_addr=127.0.0.1 > + > + # Use IPv6 with RADIUS server (IPv4 will also be supported using IPv6 > +API) > + #radius_server_ipv6=1 > +- > +- > + ##### WPA/IEEE 802.11i configuration > +########################################## > + > + # Enable WPA. Setting this variable configures the AP to require WPA > +(either @@ -982,23 +812,18 @@ own_ip_addr=127.0.0.1 > #wpa_pairwise=TKIP > +CCMP # Pairwise cipher for RSN/WPA2 (default: use wpa_pairwise value) > +#rsn_pairwise=CCMP > +- > + # Time interval for rekeying GTK (broadcast/multicast encryption keys) > +in # seconds. (dot11RSNAConfigGroupRekeyTime) > +-#wpa_group_rekey=600 > +- > ++wpa_group_rekey=0 > + # Rekey GTK when any STA that possesses the current GTK is leaving the BSS. > + # (dot11RSNAConfigGroupRekeyStrict) > + #wpa_strict_rekey=1 > +- > + # Time interval for rekeying GMK (master key used internally to > +generate GTKs # (in seconds). > +-#wpa_gmk_rekey=86400 > +- > ++wpa_gmk_rekey=0 > + # Maximum lifetime for PTK in seconds. This can be used to enforce > +rekeying of # PTK to mitigate some attacks against TKIP deficiencies. > +-#wpa_ptk_rekey=600 > +- > ++wpa_ptk_rekey=0 > + # Enable IEEE 802.11i/RSN/WPA2 pre-authentication. This is used to > +speed up # roaming be pre-authenticating IEEE 802.1X/EAP part of the > +full RSN # authentication and key handshake before actually associating > with a > new AP. > +@@ -1050,55 +875,6 @@ own_ip_addr=127.0.0.1 # 0 = disabled (default) > +# 1 = enabled > + #okc=1 > +- > +- > +-##### IEEE 802.11r configuration > +############################################## > +- > +-# Mobility Domain identifier (dot11FTMobilityDomainID, MDID) -# MDID > +is used to indicate a group of APs (within an ESS, i.e., sharing the -# > +same SSID) between which a STA can use Fast BSS Transition. > +-# 2-octet identifier as a hex string. > +-#mobility_domain=a1b2 > +- > +-# PMK-R0 Key Holder identifier (dot11FTR0KeyHolderID) -# 1 to 48 octet > +identifier. > +-# This is configured with nas_identifier (see RADIUS client section above). > +- > +-# Default lifetime of the PMK-RO in minutes; range 1..65535 -# > +(dot11FTR0KeyLifetime) > +-#r0_key_lifetime=10000 > +- > +-# PMK-R1 Key Holder identifier (dot11FTR1KeyHolderID) -# 6-octet > +identifier as a hex string. > +-#r1_key_holder=000102030405 > +- > +-# Reassociation deadline in time units (TUs / 1.024 ms; range > +1000..65535) -# (dot11FTReassociationDeadline) > +-#reassociation_deadline=1000 > +- > +-# List of R0KHs in the same Mobility Domain -# format: <MAC address> > +<NAS Identifier> <128-bit key as hex string> -# This list is used to > +map R0KH-ID (NAS Identifier) to a destination MAC -# address when > +requesting PMK-R1 key from the R0KH that the STA used during the -# > +Initial Mobility Domain Association. > +-#r0kh=02:01:02:03:04:05 r0kh-1.example.com > +000102030405060708090a0b0c0d0e0f > +-#r0kh=02:01:02:03:04:06 r0kh-2.example.com > +00112233445566778899aabbccddeeff -# And so on.. One line per R0KH. > +- > +-# List of R1KHs in the same Mobility Domain -# format: <MAC address> > +<R1KH-ID> <128-bit key as hex string> -# This list is used to map > +R1KH-ID to a destination MAC address when sending -# PMK-R1 key from > +the R0KH. This is also the list of authorized R1KHs in the MD -# that > +can request PMK-R1 keys. > +-#r1kh=02:01:02:03:04:05 02:11:22:33:44:55 > +000102030405060708090a0b0c0d0e0f > +-#r1kh=02:01:02:03:04:06 02:11:22:33:44:66 > +00112233445566778899aabbccddeeff -# And so on.. One line per R1KH. > +- > +-# Whether PMK-R1 push is enabled at R0KH -# 0 = do not push PMK-R1 to > +all configured R1KHs (default) -# 1 = push PMK-R1 to all configured > +R1KHs whenever a new PMK-R0 is derived > +-#pmk_r1_push=1 > +- > + ##### Neighbor table > +########################################################## > + # Maximum number of entries kept in AP table (either for neigbor table > +or for # detecting Overlapping Legacy BSS Condition). The oldest entry > +will be @@ -1106,36 +882,29 @@ own_ip_addr=127.0.0.1 # limit. Note! > +WFA certification for IEEE 802.11g requires that OLBC is # enabled, so > +this field should not be set to 0 when using IEEE 802.11g. > + # default: 255 > +-#ap_table_max_size=255 > +- > ++ap_table_max_size=255 > + # Number of seconds of no frames received after which entries may be > +deleted # from the AP table. Since passive scanning is not usually > +performed frequently # this should not be set to very small value. In > +addition, there is no # guarantee that every scan cycle will receive > +beacon frames from the # neighboring APs. > + # default: 60 > +-#ap_table_expiration_time=3600 > +- > +- > ++ap_table_expiration_time=60 > + ##### Wi-Fi Protected Setup (WPS) > +############################################# > +- > + # WPS state > + # 0 = WPS disabled (default) > + # 1 = WPS enabled, not configured > + # 2 = WPS enabled, configured > +-#wps_state=2 > +- > ++wps_state=2 > + # AP can be configured into a locked state where new WPS Registrar are > +not # accepted, but previously authorized Registrars (including the > +internal one) # can continue to add new Enrollees. > +-#ap_setup_locked=1 > +- > ++ap_setup_locked=1 > + # Universally Unique IDentifier (UUID; see RFC 4122) of the device # > +This value is used as the UUID for the internal WPS Registrar. If the > +AP # is also using UPnP, this value should be set to the device's UPnP UUID. > + # If not configured, UUID will be generated based on the local MAC address. > +-#uuid=12345678-9abc-def0-1234-56789abcdef0 > +- > ++uuid=12345678-9abc-def0-1234-56789abcdef0 > + # Note: If wpa_psk_file is set, WPS is used to generate random, > +per-device PSKs # that will be appended to the wpa_psk_file. If > +wpa_psk_file is not set, the # default PSK (wpa_psk/wpa_passphrase) > +will be delivered to Enrollees. Use of @@ -1149,27 +918,21 @@ > +own_ip_addr=127.0.0.1 # pending PIN requests. If the following > +variable is set, the PIN requests will # be written to the configured file. > + #wps_pin_requests=/var/run/hostapd_wps_pin_requests > +- > + # Device Name > + # User-friendly description of device; up to 32 octets encoded in > +UTF-8 -#device_name=Wireless AP > +- > ++device_name=Sitara > + # Manufacturer > + # The manufacturer of the device (up to 64 ASCII characters) > +-#manufacturer=Company > +- > ++manufacturer=TexasInstruments > + # Model Name > + # Model of the device (up to 32 ASCII characters) -#model_name=WAP > +- > ++model_name=TI_Connectivity_module > + # Model Number > + # Additional device description (up to 32 ASCII characters) > +-#model_number=123 > +- > ++model_number=wl18xx > + # Serial Number > + # Serial number of the device (up to 32 characters) > +-#serial_number=12345 > +- > ++serial_number=12345 > + # Primary Device Type > + # Used format: <categ>-<OUI>-<subcateg> # categ = Category as an > +integer value @@ -1181,8 +944,7 @@ own_ip_addr=127.0.0.1 > + # 1-0050F204-2 (Computer / Server) > + # 5-0050F204-1 (Storage / NAS) > + # 6-0050F204-1 (Network Infrastructure / AP) > +-#device_type=6-0050F204-1 > +- > ++device_type=0-00000000-0 > + # OS Version > + # 4-octet operating system version number (hex string) > + #os_version=01020300 > +@@ -1192,8 +954,7 @@ own_ip_addr=127.0.0.1 # Available methods: usba > +ethernet label display ext_nfc_token int_nfc_token > + # nfc_interface push_button keypad virtual_display physical_display > + # virtual_push_button physical_push_button > +-#config_methods=label virtual_display virtual_push_button keypad > +- > ++config_methods=virtual_display virtual_push_button keypad > + # WPS capability discovery workaround for PBC with Windows 7 # > +Windows 7 uses incorrect way of figuring out AP's WPS capabilities by > +acting # as a Registrar and using M1 from the AP. The config methods > +attribute in that @@ -1228,312 +989,3 @@ own_ip_addr=127.0.0.1 # > +option points to an external file that much contain the WPS Credential > +# attribute(s) as binary data. > + #extra_cred=hostapd.cred > +- > +-# Credential processing > +-# 0 = process received credentials internally (default) > +-# 1 = do not process received credentials; just pass them over ctrl_iface > to > +-# external program(s) > +-# 2 = process received credentials internally and pass them over > ctrl_iface > +-# to external program(s) > +-# Note: With wps_cred_processing=1, skip_cred_build should be set to 1 > +and -# extra_cred be used to provide the Credential data for Enrollees. > +-# > +-# wps_cred_processing=1 will disabled automatic updates of > +hostapd.conf file -# both for Credential processing and for marking AP > +Setup Locked based on -# validation failures of AP PIN. An external > +program is responsible on updating -# the configuration appropriately in this > case. > +-#wps_cred_processing=0 > +- > +-# AP Settings Attributes for M7 > +-# By default, hostapd generates the AP Settings Attributes for M7 > +based on the -# current configuration. It is possible to override this > +by providing a file -# with pre-configured attributes. This is similar > +to extra_cred file format, -# but the AP Settings attributes are not > +encapsulated in a Credential -# attribute. > +-#ap_settings=hostapd.ap_settings > +- > +-# WPS UPnP interface > +-# If set, support for external Registrars is enabled. > +-#upnp_iface=br0 > +- > +-# Friendly Name (required for UPnP) > +-# Short description for end use. Should be less than 64 characters. > +-#friendly_name=WPS Access Point > +- > +-# Manufacturer URL (optional for UPnP) > +-#manufacturer_url=http://www.example.com/ > +- > +-# Model Description (recommended for UPnP) -# Long description for end > +user. Should be less than 128 characters. > +-#model_description=Wireless Access Point > +- > +-# Model URL (optional for UPnP) > +-#model_url=http://www.example.com/model/ > +- > +-# Universal Product Code (optional for UPnP) -# 12-digit, all-numeric > +code that identifies the consumer package. > +-#upc=123456789012 > +- > +-# WPS RF Bands (a = 5G, b = 2.4G, g = 2.4G, ag = dual band) -# This > +value should be set according to RF band(s) supported by the AP if -# > +hw_mode is not set. For dual band dual concurrent devices, this needs > +to be -# set to ag to allow both RF bands to be advertized. > +-#wps_rf_bands=ag > +- > +-# NFC password token for WPS > +-# These parameters can be used to configure a fixed NFC password token > +for the -# AP. This can be generated, e.g., with nfc_pw_token from > +wpa_supplicant. When -# these parameters are used, the AP is assumed to > +be deployed with a NFC tag -# that includes the matching NFC password > +token (e.g., written based on the -# NDEF record from nfc_pw_token). > +-# > +-#wps_nfc_dev_pw_id: Device Password ID (16..65535) > +-#wps_nfc_dh_pubkey: Hexdump of DH Public Key > +-#wps_nfc_dh_privkey: Hexdump of DH Private Key > +-#wps_nfc_dev_pw: Hexdump of Device Password > +- > +-##### Wi-Fi Direct (P2P) > +###################################################### > +- > +-# Enable P2P Device management > +-#manage_p2p=1 > +- > +-# Allow cross connection > +-#allow_cross_connection=1 > +- > +-#### TDLS (IEEE 802.11z-2010) > +################################################# > +- > +-# Prohibit use of TDLS in this BSS > +-#tdls_prohibit=1 > +- > +-# Prohibit use of TDLS Channel Switching in this BSS > +-#tdls_prohibit_chan_switch=1 > +- > +-##### IEEE 802.11v-2011 > +####################################################### > +- > +-# Time advertisement > +-# 0 = disabled (default) > +-# 2 = UTC time at which the TSF timer is 0 > +-#time_advertisement=2 > +- > +-# Local time zone as specified in 8.3 of IEEE Std 1003.1-2004: > +-# stdoffset[dst[offset][,start[/time],end[/time]]] > +-#time_zone=EST5 > +- > +-##### IEEE 802.11u-2011 > +####################################################### > +- > +-# Enable Interworking service > +-#interworking=1 > +- > +-# Access Network Type > +-# 0 = Private network > +-# 1 = Private network with guest access -# 2 = Chargeable public > +network -# 3 = Free public network -# 4 = Personal device network -# 5 > += Emergency services only network -# 14 = Test or experimental -# 15 = > +Wildcard > +-#access_network_type=0 > +- > +-# Whether the network provides connectivity to the Internet -# 0 = > +Unspecified -# 1 = Network provides connectivity to the Internet > +-#internet=1 > +- > +-# Additional Step Required for Access > +-# Note: This is only used with open network, i.e., ASRA shall ne set > +to 0 if -# RSN is used. > +-#asra=0 > +- > +-# Emergency services reachable > +-#esr=0 > +- > +-# Unauthenticated emergency service accessible > +-#uesa=0 > +- > +-# Venue Info (optional) > +-# The available values are defined in IEEE Std 802.11u-2011, 7.3.1.34. > +-# Example values (group,type): > +-# 0,0 = Unspecified > +-# 1,7 = Convention Center > +-# 1,13 = Coffee Shop > +-# 2,0 = Unspecified Business > +-# 7,1 Private Residence > +-#venue_group=7 > +-#venue_type=1 > +- > +-# Homogeneous ESS identifier (optional; dot11HESSID) -# If set, this > +shall be identifical to one of the BSSIDs in the homogeneous -# ESS and > +this shall be set to the same value across all BSSs in homogeneous -# > +ESS. > +-#hessid=02:03:04:05:06:07 > +- > +-# Roaming Consortium List > +-# Arbitrary number of Roaming Consortium OIs can be configured with > +each line -# adding a new OI to the list. The first three entries are > +available through -# Beacon and Probe Response frames. Any additional > +entry will be available only -# through ANQP queries. Each OI is > +between 3 and 15 octets and is configured as -# a hexstring. > +-#roaming_consortium=021122 > +-#roaming_consortium=2233445566 > +- > +-# Venue Name information > +-# This parameter can be used to configure one or more Venue Name > +Duples for -# Venue Name ANQP information. Each entry has a two or > +three character language -# code (ISO-639) separated by colon from the venue > name string. > +-# Note that venue_group and venue_type have to be set for Venue Name > +-# information to be complete. > +-#venue_name=eng:Example venue > +-#venue_name=fin:Esimerkkipaikka > +- > +-# Network Authentication Type > +-# This parameter indicates what type of network authentication is used > +in the -# network. > +-# format: <network auth type indicator (1-octet hex str)> [redirect > +URL] -# Network Authentication Type Indicator values: > +-# 00 = Acceptance of terms and conditions -# 01 = On-line enrollment > +supported -# 02 = http/https redirection -# 03 = DNS redirection > +-#network_auth_type=00 > +-#network_auth_type=02http://www.example.com/redirect/me/here/ > +- > +-# IP Address Type Availability > +-# format: <1-octet encoded value as hex str> -# (ipv4_type & 0x3f) << > +2 | (ipv6_type & 0x3) -# ipv4_type: > +-# 0 = Address type not available > +-# 1 = Public IPv4 address available > +-# 2 = Port-restricted IPv4 address available -# 3 = Single NATed > +private IPv4 address available -# 4 = Double NATed private IPv4 address > +available -# 5 = Port-restricted IPv4 address and single NATed IPv4 > +address available -# 6 = Port-restricted IPv4 address and double NATed > +IPv4 address available -# 7 = Availability of the address type is not > +known -# ipv6_type: > +-# 0 = Address type not available > +-# 1 = Address type available > +-# 2 = Availability of the address type not known > +-#ipaddr_type_availability=14 > +- > +-# Domain Name > +-# format: <variable-octet str>[,<variable-octet str>] > +-#domain_name=example.com,another.example.com,yet- > another.example.com > +- > +-# 3GPP Cellular Network information > +-# format: <MCC1,MNC1>[;<MCC2,MNC2>][;...] > +-#anqp_3gpp_cell_net=244,91;310,026;234,56 > +- > +-# NAI Realm information > +-# One or more realm can be advertised. Each nai_realm line adds a new > +realm to -# the set. These parameters provide information for stations > +using Interworking -# network selection to allow automatic connection > +to a network based on -# credentials. > +-# format: <encoding>,<NAI Realm(s)>[,<EAP Method 1>][,<EAP Method > +2>][,...] -# encoding: > +-# 0 = Realm formatted in accordance with IETF RFC 4282 > +-# 1 = UTF-8 formatted character string that is not formatted in > +-# accordance with IETF RFC 4282 > +-# NAI Realm(s): Semi-colon delimited NAI Realm(s) -# EAP Method: <EAP > +Method>[:<[AuthParam1:Val1]>][<[AuthParam2:Val2]>][...] > +-# 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 > +-# ID 3 = Inner authentication EAP Method Type -# ID 5 = Credential > +Type > +-# 1 = SIM, 2 = USIM, 3 = NFC Secure Element, 4 = Hardware Token, > +-# 5 = Softoken, 6 = Certificate, 7 = username/password, 9 = Anonymous, > +-# 10 = Vendor Specific > +-#nai_realm=0,example.com;example.net > +-# EAP methods EAP-TLS with certificate and EAP-TTLS/MSCHAPv2 with -# > +username/password -#nai_realm=0,example.org,13[5:6],21[2:4][5:7] > +- > +-##### Hotspot 2.0 > +############################################################ > # > +- > +-# Enable Hotspot 2.0 support > +-#hs20=1 > +- > +-# Disable Downstream Group-Addressed Forwarding (DGAF) -# This can be > +used to configure a network where no group-addressed frames are -# > +allowed. The AP will not forward any group-address frames to the > +stations and -# random GTKs are issued for each station to prevent > +associated stations from -# forging such frames to other stations in the BSS. > +-#disable_dgaf=1 > +- > +-# Operator Friendly Name > +-# This parameter can be used to configure one or more Operator > +Friendly Name -# Duples. Each entry has a two or three character > +language code (ISO-639) -# separated by colon from the operator friendly > name string. > +-#hs20_oper_friendly_name=eng:Example operator > +-#hs20_oper_friendly_name=fin:Esimerkkioperaattori > +- > +-# Connection Capability > +-# This can be used to advertise what type of IP traffic can be sent > +through the -# hotspot (e.g., due to firewall allowing/blocking > protocols/ports). > +-# format: <IP Protocol>:<Port Number>:<Status> -# IP Protocol: 1 = > +ICMP, 6 = TCP, 17 = UDP -# Port Number: 0..65535 -# Status: 0 = Closed, > +1 = Open, 2 = Unknown -# Each hs20_conn_capab line is added to the list > +of advertised tuples. > +-#hs20_conn_capab=1:0:2 > +-#hs20_conn_capab=6:22:1 > +-#hs20_conn_capab=17:5060:0 > +- > +-# WAN Metrics > +-# format: <WAN Info>:<DL Speed>:<UL Speed>:<DL Load>:<UL Load>:<LMD> > +-# WAN Info: B0-B1: Link Status, B2: Symmetric Link, B3: At Capabity > +-# (encoded as two hex digits) > +-# Link Status: 1 = Link up, 2 = Link down, 3 = Link in test state > +-# Downlink Speed: Estimate of WAN backhaul link current downlink speed in > kbps; > +-# 1..4294967295; 0 = unknown > +-# Uplink Speed: Estimate of WAN backhaul link current uplink speed in kbps > +-# 1..4294967295; 0 = unknown > +-# Downlink Load: Current load of downlink WAN connection (scaled to > +255 = 100%) -# Uplink Load: Current load of uplink WAN connection > +(scaled to 255 = 100%) -# Load Measurement Duration: Duration for > +measuring downlink/uplink load in -# tenths of a second (1..65535); 0 > +if load cannot be determined > +-#hs20_wan_metrics=01:8000:1000:80:240:3000 > +- > +-# Operating Class Indication > +-# List of operating classes the BSSes in this ESS use. The Global > +operating -# classes in Table E-4 of IEEE Std 802.11-2012 Annex E > +define the values that -# can be used in this. > +-# format: hexdump of operating class octets -# for example, operating > +classes 81 (2.4 GHz channels 1-13) and 115 (5 GHz -# channels 36-48): > +-#hs20_operating_class=5173 > +- > +-##### Multiple BSSID support > +################################################## > +-# > +-# Above configuration is using the default interface (wlan#, or > +multi-SSID VLAN -# interfaces). Other BSSIDs can be added by using > +separator 'bss' with -# default interface name to be allocated for the data > packets of the new BSS. > +-# > +-# hostapd will generate BSSID mask based on the BSSIDs that are -# > +configured. hostapd will verify that dev_addr & MASK == dev_addr. If > +this is -# not the case, the MAC address of the radio must be changed > +before starting -# hostapd (ifconfig wlan0 hw ether <MAC addr>). If a > +BSSID is configured for -# every secondary BSS, this limitation is not > +applied at hostapd and other -# masks may be used if the driver > +supports them (e.g., swap the locally -# administered bit) -# -# BSSIDs > +are assigned in order to each BSS, unless an explicit BSSID is -# > +specified using the 'bssid' parameter. > +-# If an explicit BSSID is specified, it must be chosen such that it: > +-# - results in a valid MASK that covers it and the dev_addr -# - is > +not the same as the MAC address of the radio -# - is not the same as > +any other explicitly specified BSSID -# -# Please note that hostapd > +uses some of the values configured for the first BSS -# as the defaults > +for the following BSSes. However, it is recommended that all -# BSSes > +include explicit configuration of all relevant configuration items. > +-# > +-#bss=wlan0_0 > +-#ssid=test2 > +-# most of the above items can be used here (apart from radio interface > +specific -# items, like channel) > +- > +-#bss=wlan0_1 > +-#bssid=00:13:10:95:fe:0b > +-# ... > -- > 1.7.9.5 > > diff --git a/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon- > wl18xx_r8.a6.01.bb b/meta-arago-extras/recipes-connectivity/hostap/hostap- > daemon-wl18xx_r8.a8.08.bb > similarity index 84% > copy from meta-arago-extras/recipes-connectivity/hostap/hostap-daemon- > wl18xx_r8.a6.01.bb > copy to meta-arago-extras/recipes-connectivity/hostap/hostap-daemon- > wl18xx_r8.a8.08.bb > index e232b32..861c97b 100644 > --- a/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon- > wl18xx_r8.a6.01.bb > +++ b/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon-wl18xx > +++ _r8.a8.08.bb > @@ -6,7 +6,7 @@ require hostap.inc > LICENSE = "GPLv2" > LIC_FILES_CHKSUM = > "file://../COPYING;md5=ab87f20cd7e8c0d0a6539b34d3791d0e" > > -PR_append = "b+gitr${SRCPV}" > +PR_append = "a+gitr${SRCPV}" > > FILESEXTRAPATHS_append := "${THISDIR}/hostap-daemon:" > > @@ -14,8 +14,8 @@ FILESEXTRAPATHS_append := "${THISDIR}/hostap- > daemon:" > # of hostap > PV = "2.0-devel-ti" > > -# Tag: ol_r8.a6.01 > -SRCREV = "7190ff7dbd43243290b626068ded0d61c5019050" > +# Tag: ol_r8.a8.08 > +SRCREV = "257ab333aad993b4be81808524bc0d939c276058" > > PROVIDES += "hostap-daemon" > RPROVIDES_${PN} += "hostap-daemon" > diff --git a/meta-arago-extras/recipes-connectivity/hostap/hostap- > daemon/defconfig b/meta-arago-extras/recipes-connectivity/hostap/hostap- > daemon/defconfig > index 6a654c9..ccc0996 100644 > --- a/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon/defconfig > +++ b/meta-arago-extras/recipes-connectivity/hostap/hostap-daemon/defcon > +++ fig > @@ -10,7 +10,7 @@ > # to override previous values of the variables. > > # Driver interface for Host AP driver > -CONFIG_DRIVER_HOSTAP=y > +#CONFIG_DRIVER_HOSTAP=y > > # Driver interface for wired authenticator #CONFIG_DRIVER_WIRED=y @@ - > 21,13 +21,13 @@ CONFIG_DRIVER_HOSTAP=y > > # Driver interface for drivers using the nl80211 kernel interface > CONFIG_DRIVER_NL80211=y -CONFIG_LIBNL20=y # driver_nl80211.c requires > a rather new libnl (version 1.1) which may not be # shipped with your > distribution yet. If that is the case, you need to build # newer libnl > version and > point the hostapd build to use it. > #LIBNL=/usr/src/libnl > #CFLAGS += -I$(LIBNL)/include > #LIBS += -L$(LIBNL)/lib > +CONFIG_LIBNL32=y > > # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver) > #CONFIG_DRIVER_BSD=y @@ -40,13 +40,13 @@ CONFIG_LIBNL20=y > #CONFIG_DRIVER_NONE=y > > # IEEE 802.11F/IAPP > -CONFIG_IAPP=y > +#CONFIG_IAPP=y > > # WPA2/IEEE 802.11i RSN pre-authentication -CONFIG_RSN_PREAUTH=y > +#CONFIG_RSN_PREAUTH=y > > # PeerKey handshake for Station to Station Link (IEEE 802.11e DLS) - > CONFIG_PEERKEY=y > +#CONFIG_PEERKEY=y > > # IEEE 802.11w (management frame protection) # This version is an > experimental implementation based on IEEE 802.11w/D1.0 @@ -55,25 +55,25 > @@ CONFIG_PEERKEY=y #CONFIG_IEEE80211W=y > > # Integrated EAP server > -CONFIG_EAP=y > +#CONFIG_EAP=y > > # EAP-MD5 for the integrated EAP server -CONFIG_EAP_MD5=y > +#CONFIG_EAP_MD5=y > > # EAP-TLS for the integrated EAP server -CONFIG_EAP_TLS=y > +#CONFIG_EAP_TLS=y > > # EAP-MSCHAPv2 for the integrated EAP server -CONFIG_EAP_MSCHAPV2=y > +#CONFIG_EAP_MSCHAPV2=y > > # EAP-PEAP for the integrated EAP server -CONFIG_EAP_PEAP=y > +#CONFIG_EAP_PEAP=y > > # EAP-GTC for the integrated EAP server -CONFIG_EAP_GTC=y > +#CONFIG_EAP_GTC=y > > # EAP-TTLS for the integrated EAP server -CONFIG_EAP_TTLS=y > +#CONFIG_EAP_TTLS=y > > # EAP-SIM for the integrated EAP server #CONFIG_EAP_SIM=y @@ -111,7 > +111,7 @@ CONFIG_WPS=y # Enable WSC 2.0 support CONFIG_WPS2=y # > Enable UPnP support for external WPS Registrars -CONFIG_WPS_UPNP=y > +#CONFIG_WPS_UPNP=y > > # EAP-IKEv2 > #CONFIG_EAP_IKEV2=y > @@ -145,11 +145,14 @@ CONFIG_IEEE80211N=y # code is not needed. > #CONFIG_NO_STDOUT_DEBUG=y > > +# Add support for writing debug log to Android logcat instead of > +standard output CONFIG_ANDROID_LOG=y > + > # Remove support for RADIUS accounting > #CONFIG_NO_ACCOUNTING=y > > # Remove support for RADIUS > -#CONFIG_NO_RADIUS=y > +CONFIG_NO_RADIUS=y > > # Remove support for VLANs > #CONFIG_NO_VLAN=y > @@ -159,6 +162,12 @@ CONFIG_IEEE80211N=y # option. > #CONFIG_NO_DUMP_STATE=y > > +# Select wrapper for operatins system and C library specific functions > +# unix = UNIX/POSIX like systems (default) # win32 = Windows systems # > +none = Empty template CONFIG_OS=unix > + > # Enable tracing code for developer debugging # This tracks use of memory > allocations and other registrations and reports # incorrect use with a > backtrace > of call (or allocation) location. > @@ -176,7 +185,6 @@ CONFIG_IEEE80211N=y > #LIBS += -lbfd -liberty -lz > #LIBS_p += -lbfd -liberty -lz > #LIBS_c += -lbfd -liberty -lz > -# > -# > > -CONFIG_NO_RANDOM_POOL=y > +# Enable AP > +CONFIG_AP=y > diff --git a/meta-arago-extras/recipes-connectivity/hostap/hostap.inc b/meta- > arago-extras/recipes-connectivity/hostap/hostap.inc > index 8f6488b..9be2585 100644 > --- a/meta-arago-extras/recipes-connectivity/hostap/hostap.inc > +++ b/meta-arago-extras/recipes-connectivity/hostap/hostap.inc > @@ -11,7 +11,7 @@ DEPENDS = "libnl openssl" > # default > DEFAULT_PREFERENCE = "-1" > > -PR = "r4" > +PR = "r5" > > inherit update-rc.d > INITSCRIPT_NAME="hostapd" > @@ -28,6 +28,7 @@ S = "${WORKDIR}/git/hostapd" > do_configure() { > install -m 0644 ${WORKDIR}/defconfig ${S}/.config > echo "CFLAGS += -I${STAGING_INCDIR}" >> .config > + echo "CFLAGS += -I${STAGING_INCDIR}/libnl3/" >> .config > echo "LIBS += -L${STAGING_LIBDIR}" >> .config } > > -- > 1.7.9 > > _______________________________________________ > meta-arago mailing list > [email protected] > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
