* [PATCH 2/8] hostap-daemon-wl18xx: Update recipe to ol_r8.a8.08 version
2013-12-08 8:18 [PATCH 1/8] wpa-supplicant-wl18xx: Update recipe to ol_r8.a8.08 version Yaniv Mahani
@ 2013-12-08 8:18 ` Yaniv Mahani
2014-01-14 13:28 ` Cooper Jr., Franklin
2013-12-08 8:18 ` [PATCH 3/8] wlconf : " Yaniv Mahani
` (7 subsequent siblings)
8 siblings, 1 reply; 18+ messages in thread
From: Yaniv Mahani @ 2013-12-08 8:18 UTC (permalink / raw)
To: meta-arago
From: Yaniv Machani <yanivma@ti.com>
- 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 <yanivma@ti.com>
---
...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(-)
rename 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 <eyalr@ti.com>
-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 <yanivma@ti.com>
+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 <eyalr@ti.com>
+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%
rename from meta-arago-extras/recipes-connectivity/hostap/hostap-daemon-wl18xx_r8.a6.01.bb
rename 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/defconfig
@@ -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
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 2/8] hostap-daemon-wl18xx: Update recipe to ol_r8.a8.08 version
2013-12-08 8:18 ` [PATCH 2/8] hostap-daemon-wl18xx: " Yaniv Mahani
@ 2014-01-14 13:28 ` Cooper Jr., Franklin
0 siblings, 0 replies; 18+ messages in thread
From: Cooper Jr., Franklin @ 2014-01-14 13:28 UTC (permalink / raw)
To: Machani, Yaniv, meta-arago@arago-project.org
Acked-by: Franklin Cooper Jr. <fcooper@ti.com>
> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Machani, Yaniv
> Sent: Sunday, December 08, 2013 2:18 AM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [PATCH 2/8] hostap-daemon-wl18xx: Update recipe to
> ol_r8.a8.08 version
>
> From: Yaniv Machani <yanivma@ti.com>
>
> - 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 <yanivma@ti.com>
> ---
> ...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(-) rename 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 <eyalr@ti.com>
> -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 <yanivma@ti.com>
> +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 <eyalr@ti.com>
> +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%
> rename from meta-arago-extras/recipes-connectivity/hostap/hostap-daemon-
> wl18xx_r8.a6.01.bb
> rename 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
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 3/8] wlconf : Update recipe to ol_r8.a8.08 version.
2013-12-08 8:18 [PATCH 1/8] wpa-supplicant-wl18xx: Update recipe to ol_r8.a8.08 version Yaniv Mahani
2013-12-08 8:18 ` [PATCH 2/8] hostap-daemon-wl18xx: " Yaniv Mahani
@ 2013-12-08 8:18 ` Yaniv Mahani
2014-01-14 13:28 ` Cooper Jr., Franklin
2013-12-08 8:18 ` [PATCH 4/8] ti-wifi-utils-wl18xx: " Yaniv Mahani
` (6 subsequent siblings)
8 siblings, 1 reply; 18+ messages in thread
From: Yaniv Mahani @ 2013-12-08 8:18 UTC (permalink / raw)
To: meta-arago
From: Yaniv Machani <yanivma@ti.com>
- Added missing default configuration file.
Signed-off-by: Yaniv Machani <yanivma@ti.com>
---
.../{wlconf_r8.a6.01.bb => wlconf_r8.a8.08.bb} | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
rename meta-arago-extras/recipes-connectivity/wlconf/{wlconf_r8.a6.01.bb => wlconf_r8.a8.08.bb} (88%)
diff --git a/meta-arago-extras/recipes-connectivity/wlconf/wlconf_r8.a6.01.bb b/meta-arago-extras/recipes-connectivity/wlconf/wlconf_r8.a8.08.bb
similarity index 88%
rename from meta-arago-extras/recipes-connectivity/wlconf/wlconf_r8.a6.01.bb
rename to meta-arago-extras/recipes-connectivity/wlconf/wlconf_r8.a8.08.bb
index 8076350..f4adc18 100644
--- a/meta-arago-extras/recipes-connectivity/wlconf/wlconf_r8.a6.01.bb
+++ b/meta-arago-extras/recipes-connectivity/wlconf/wlconf_r8.a8.08.bb
@@ -2,11 +2,11 @@ DESCRIPTION = "Configuration utility for TI wireless drivers"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://README;beginline=1;endline=21;md5=adc05a1903d3f107f85c90328e3a9438"
-PR ="r2"
+PR ="r0"
PR_append = "+gitr${SRCPV}"
-# Tag: ol_r8.a6.01
-SRCREV = "214dfbdf97cc390b0020c4ea9331a1cf82240a64"
+# Tag: ol_r8.a8.08
+SRCREV = "c976584589981c9ab8741d1819a5019e17cac13b"
SRC_URI = "git://github.com/TI-OpenLink/18xx-ti-utils.git"
S = "${WORKDIR}/git/wlconf"
@@ -21,6 +21,7 @@ do_install() {
install -m 0755 wlconf ${D}${bindir}/wlconf/
install -m 0755 dictionary.txt ${D}${bindir}/wlconf/
install -m 0755 struct.bin ${D}${bindir}/wlconf/
+ install -m 0755 default.conf ${D}${bindir}/wlconf/
install -m 0755 wl18xx-conf-default.bin ${D}${bindir}/wlconf/
install -m 0755 README ${D}${bindir}/wlconf/
install -m 0755 example.conf ${D}${bindir}/wlconf/
--
1.7.9
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 3/8] wlconf : Update recipe to ol_r8.a8.08 version.
2013-12-08 8:18 ` [PATCH 3/8] wlconf : " Yaniv Mahani
@ 2014-01-14 13:28 ` Cooper Jr., Franklin
0 siblings, 0 replies; 18+ messages in thread
From: Cooper Jr., Franklin @ 2014-01-14 13:28 UTC (permalink / raw)
To: Machani, Yaniv, meta-arago@arago-project.org
Acked-by: Franklin Cooper Jr. <fcooper@ti.com>
> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Machani, Yaniv
> Sent: Sunday, December 08, 2013 2:18 AM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [PATCH 3/8] wlconf : Update recipe to ol_r8.a8.08
> version.
>
> From: Yaniv Machani <yanivma@ti.com>
>
> - Added missing default configuration file.
>
> Signed-off-by: Yaniv Machani <yanivma@ti.com>
> ---
> .../{wlconf_r8.a6.01.bb => wlconf_r8.a8.08.bb} | 7 ++++---
> 1 files changed, 4 insertions(+), 3 deletions(-) rename meta-arago-
> extras/recipes-connectivity/wlconf/{wlconf_r8.a6.01.bb =>
> wlconf_r8.a8.08.bb} (88%)
>
> diff --git a/meta-arago-extras/recipes-connectivity/wlconf/wlconf_r8.a6.01.bb
> b/meta-arago-extras/recipes-connectivity/wlconf/wlconf_r8.a8.08.bb
> similarity index 88%
> rename from meta-arago-extras/recipes-
> connectivity/wlconf/wlconf_r8.a6.01.bb
> rename to meta-arago-extras/recipes-connectivity/wlconf/wlconf_r8.a8.08.bb
> index 8076350..f4adc18 100644
> --- a/meta-arago-extras/recipes-connectivity/wlconf/wlconf_r8.a6.01.bb
> +++ b/meta-arago-extras/recipes-connectivity/wlconf/wlconf_r8.a8.08.bb
> @@ -2,11 +2,11 @@ DESCRIPTION = "Configuration utility for TI wireless
> drivers"
> LICENSE = "GPLv2"
> LIC_FILES_CHKSUM =
> "file://README;beginline=1;endline=21;md5=adc05a1903d3f107f85c90328e3
> a9438"
>
> -PR ="r2"
> +PR ="r0"
> PR_append = "+gitr${SRCPV}"
>
> -# Tag: ol_r8.a6.01
> -SRCREV = "214dfbdf97cc390b0020c4ea9331a1cf82240a64"
> +# Tag: ol_r8.a8.08
> +SRCREV = "c976584589981c9ab8741d1819a5019e17cac13b"
> SRC_URI = "git://github.com/TI-OpenLink/18xx-ti-utils.git"
>
> S = "${WORKDIR}/git/wlconf"
> @@ -21,6 +21,7 @@ do_install() {
> install -m 0755 wlconf ${D}${bindir}/wlconf/
> install -m 0755 dictionary.txt ${D}${bindir}/wlconf/
> install -m 0755 struct.bin ${D}${bindir}/wlconf/
> + install -m 0755 default.conf ${D}${bindir}/wlconf/
> install -m 0755 wl18xx-conf-default.bin ${D}${bindir}/wlconf/
> install -m 0755 README ${D}${bindir}/wlconf/
> install -m 0755 example.conf ${D}${bindir}/wlconf/
> --
> 1.7.9
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 4/8] ti-wifi-utils-wl18xx: Update recipe to ol_r8.a8.08 version.
2013-12-08 8:18 [PATCH 1/8] wpa-supplicant-wl18xx: Update recipe to ol_r8.a8.08 version Yaniv Mahani
2013-12-08 8:18 ` [PATCH 2/8] hostap-daemon-wl18xx: " Yaniv Mahani
2013-12-08 8:18 ` [PATCH 3/8] wlconf : " Yaniv Mahani
@ 2013-12-08 8:18 ` Yaniv Mahani
2014-01-14 13:28 ` Cooper Jr., Franklin
2013-12-08 8:18 ` [PATCH 5/8] wl18xx-firmware: update " Yaniv Mahani
` (5 subsequent siblings)
8 siblings, 1 reply; 18+ messages in thread
From: Yaniv Mahani @ 2013-12-08 8:18 UTC (permalink / raw)
To: meta-arago
From: Yaniv Machani <yanivma@ti.com>
- Updated firmware name.
- Added required makefile parameter to support libnl3 compilation.
Signed-off-by: Yaniv Machani <yanivma@ti.com>
---
...8.a6.01.bb => ti-wifi-utils-wl18xx_r8.a8.08.bb} | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
rename meta-arago-extras/recipes-devtools/ti-wifi-utils/{ti-wifi-utils-wl18xx_r8.a6.01.bb => ti-wifi-utils-wl18xx_r8.a8.08.bb} (68%)
diff --git a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils-wl18xx_r8.a6.01.bb b/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils-wl18xx_r8.a8.08.bb
similarity index 68%
rename from meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils-wl18xx_r8.a6.01.bb
rename to meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils-wl18xx_r8.a8.08.bb
index eab94fa..601b203 100644
--- a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils-wl18xx_r8.a6.01.bb
+++ b/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils-wl18xx_r8.a8.08.bb
@@ -3,12 +3,12 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING;md5=4725015cb0be7be389cf06deeae3683d"
DEPENDS = "libnl"
-RDEPENDS_${PN} = "ti-compat-wireless-wl12xx wl12xx-firmware"
+RDEPENDS_${PN} = "wl18xx-firmware"
-PR ="r3+gitr${SRCPV}"
+PR ="r0+gitr${SRCPV}"
-# Tag: ol_r8.a6.01
-SRCREV = "214dfbdf97cc390b0020c4ea9331a1cf82240a64"
+#Tag: ol_r8.a8.08
+SRCREV = "9627cb09b9de32b8ffcc32d3ce3e275b7c56d8e4"
SRC_URI = "git://github.com/TI-OpenLink/18xx-ti-utils.git \
"
@@ -20,7 +20,10 @@ RCONFLICTS_${PN} += "ti-wifi-utils"
S = "${WORKDIR}/git"
export CROSS_COMPILE = "${TARGET_PREFIX}"
-CFLAGS += " -DCONFIG_LIBNL20"
+
+EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -I${STAGING_INCDIR}/libnl3/ -DCONFIG_LIBNL32 " \
+ LDFLAGS="${LDFLAGS} -L${STAGING_LIBDIR}" \
+ NLVER=3'
do_install() {
install -d ${D}${bindir}
--
1.7.9
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 4/8] ti-wifi-utils-wl18xx: Update recipe to ol_r8.a8.08 version.
2013-12-08 8:18 ` [PATCH 4/8] ti-wifi-utils-wl18xx: " Yaniv Mahani
@ 2014-01-14 13:28 ` Cooper Jr., Franklin
0 siblings, 0 replies; 18+ messages in thread
From: Cooper Jr., Franklin @ 2014-01-14 13:28 UTC (permalink / raw)
To: Machani, Yaniv, meta-arago@arago-project.org
Acked-by: Franklin Cooper Jr. <fcooper@ti.com>
> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Machani, Yaniv
> Sent: Sunday, December 08, 2013 2:18 AM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [PATCH 4/8] ti-wifi-utils-wl18xx: Update recipe to
> ol_r8.a8.08 version.
>
> From: Yaniv Machani <yanivma@ti.com>
>
> - Updated firmware name.
> - Added required makefile parameter to support libnl3 compilation.
>
> Signed-off-by: Yaniv Machani <yanivma@ti.com>
> ---
> ...8.a6.01.bb => ti-wifi-utils-wl18xx_r8.a8.08.bb} | 13 ++++++++-----
> 1 files changed, 8 insertions(+), 5 deletions(-) rename meta-arago-
> extras/recipes-devtools/ti-wifi-utils/{ti-wifi-utils-wl18xx_r8.a6.01.bb => ti-wifi-
> utils-wl18xx_r8.a8.08.bb} (68%)
>
> diff --git a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils-
> wl18xx_r8.a6.01.bb b/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-
> utils-wl18xx_r8.a8.08.bb
> similarity index 68%
> rename from meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils-
> wl18xx_r8.a6.01.bb
> rename to meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils-
> wl18xx_r8.a8.08.bb
> index eab94fa..601b203 100644
> --- a/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils-
> wl18xx_r8.a6.01.bb
> +++ b/meta-arago-extras/recipes-devtools/ti-wifi-utils/ti-wifi-utils-wl1
> +++ 8xx_r8.a8.08.bb
> @@ -3,12 +3,12 @@ LICENSE = "BSD"
> LIC_FILES_CHKSUM =
> "file://COPYING;md5=4725015cb0be7be389cf06deeae3683d"
>
> DEPENDS = "libnl"
> -RDEPENDS_${PN} = "ti-compat-wireless-wl12xx wl12xx-firmware"
> +RDEPENDS_${PN} = "wl18xx-firmware"
>
> -PR ="r3+gitr${SRCPV}"
> +PR ="r0+gitr${SRCPV}"
>
> -# Tag: ol_r8.a6.01
> -SRCREV = "214dfbdf97cc390b0020c4ea9331a1cf82240a64"
> +#Tag: ol_r8.a8.08
> +SRCREV = "9627cb09b9de32b8ffcc32d3ce3e275b7c56d8e4"
> SRC_URI = "git://github.com/TI-OpenLink/18xx-ti-utils.git \ "
>
> @@ -20,7 +20,10 @@ RCONFLICTS_${PN} += "ti-wifi-utils"
> S = "${WORKDIR}/git"
>
> export CROSS_COMPILE = "${TARGET_PREFIX}"
> -CFLAGS += " -DCONFIG_LIBNL20"
> +
> +EXTRA_OEMAKE = 'CFLAGS="${CFLAGS} -I${STAGING_INCDIR}/libnl3/ -
> DCONFIG_LIBNL32 " \
> + LDFLAGS="${LDFLAGS} -L${STAGING_LIBDIR}" \
> + NLVER=3'
>
> do_install() {
> install -d ${D}${bindir}
> --
> 1.7.9
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 5/8] wl18xx-firmware: update recipe to ol_r8.a8.08 version.
2013-12-08 8:18 [PATCH 1/8] wpa-supplicant-wl18xx: Update recipe to ol_r8.a8.08 version Yaniv Mahani
` (2 preceding siblings ...)
2013-12-08 8:18 ` [PATCH 4/8] ti-wifi-utils-wl18xx: " Yaniv Mahani
@ 2013-12-08 8:18 ` Yaniv Mahani
2014-01-14 13:28 ` Cooper Jr., Franklin
2013-12-08 8:18 ` [PATCH 6/8] arago-prefs: update default value for am335x and am43x for WILINK-8 Yaniv Mahani
` (4 subsequent siblings)
8 siblings, 1 reply; 18+ messages in thread
From: Yaniv Mahani @ 2013-12-08 8:18 UTC (permalink / raw)
To: meta-arago
From: Yaniv Machani <yanivma@ti.com>
Signed-off-by: Yaniv Machani <yanivma@ti.com>
---
...are_r8.a6.01.bb => wl18xx-firmware_r8.a8.08.bb} | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
rename meta-arago-extras/recipes-bsp/wl18xx-firmware/{wl18xx-firmware_r8.a6.01.bb => wl18xx-firmware_r8.a8.08.bb} (76%)
diff --git a/meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-firmware_r8.a6.01.bb b/meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-firmware_r8.a8.08.bb
similarity index 76%
rename from meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-firmware_r8.a6.01.bb
rename to meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-firmware_r8.a8.08.bb
index 4b3f22a..759bf47 100644
--- a/meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-firmware_r8.a6.01.bb
+++ b/meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-firmware_r8.a8.08.bb
@@ -1,18 +1,18 @@
DESCRIPTION = "Firmware files for use with TI wl18xx"
LICENSE = "TI-TSPA"
-LIC_FILES_CHKSUM = "file://LICENCE;md5=b28122fd6678e89fd3a8d4bc80922969"
+LIC_FILES_CHKSUM = "file://LICENCE;md5=4977a0fe767ee17765ae63c435a32a9e"
PACKAGE_ARCH = "all"
-PR = "r2+gitr${SRCPV}"
+PR = "r0+gitr${SRCPV}"
PROVIDES += "wl12xx-firmware"
RPROVIDES_${PN} += "wl12xx-firmware"
RREPLACES_${PN} += "wl12xx-firmware"
RCONFLICTS_${PN} += "wl12xx-firmware"
-# Tag: ol_r8.a6.01
-SRCREV = "1c0f45f0e8aec0823175f7ac977908888c424aa1"
+# Tag: ol_r8.a8.08
+SRCREV = "8e7f455e726f2bf92c568286a5cca510d7718dc1"
SRC_URI = "git://github.com/TI-OpenLink/wl18xx_fw.git;protocol=git \
file://Makefile \
"
--
1.7.9
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 5/8] wl18xx-firmware: update recipe to ol_r8.a8.08 version.
2013-12-08 8:18 ` [PATCH 5/8] wl18xx-firmware: update " Yaniv Mahani
@ 2014-01-14 13:28 ` Cooper Jr., Franklin
0 siblings, 0 replies; 18+ messages in thread
From: Cooper Jr., Franklin @ 2014-01-14 13:28 UTC (permalink / raw)
To: Machani, Yaniv, meta-arago@arago-project.org
Acked-by: Franklin Cooper Jr. <fcooper@ti.com>
> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Machani, Yaniv
> Sent: Sunday, December 08, 2013 2:18 AM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [PATCH 5/8] wl18xx-firmware: update recipe to
> ol_r8.a8.08 version.
>
> From: Yaniv Machani <yanivma@ti.com>
>
> Signed-off-by: Yaniv Machani <yanivma@ti.com>
> ---
> ...are_r8.a6.01.bb => wl18xx-firmware_r8.a8.08.bb} | 8 ++++----
> 1 files changed, 4 insertions(+), 4 deletions(-) rename meta-arago-
> extras/recipes-bsp/wl18xx-firmware/{wl18xx-firmware_r8.a6.01.bb => wl18xx-
> firmware_r8.a8.08.bb} (76%)
>
> diff --git a/meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-
> firmware_r8.a6.01.bb b/meta-arago-extras/recipes-bsp/wl18xx-
> firmware/wl18xx-firmware_r8.a8.08.bb
> similarity index 76%
> rename from meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-
> firmware_r8.a6.01.bb
> rename to meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-
> firmware_r8.a8.08.bb
> index 4b3f22a..759bf47 100644
> --- a/meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-
> firmware_r8.a6.01.bb
> +++ b/meta-arago-extras/recipes-bsp/wl18xx-firmware/wl18xx-firmware_r8.a
> +++ 8.08.bb
> @@ -1,18 +1,18 @@
> DESCRIPTION = "Firmware files for use with TI wl18xx"
> LICENSE = "TI-TSPA"
> -LIC_FILES_CHKSUM =
> "file://LICENCE;md5=b28122fd6678e89fd3a8d4bc80922969"
> +LIC_FILES_CHKSUM =
> "file://LICENCE;md5=4977a0fe767ee17765ae63c435a32a9e"
>
> PACKAGE_ARCH = "all"
>
> -PR = "r2+gitr${SRCPV}"
> +PR = "r0+gitr${SRCPV}"
>
> PROVIDES += "wl12xx-firmware"
> RPROVIDES_${PN} += "wl12xx-firmware"
> RREPLACES_${PN} += "wl12xx-firmware"
> RCONFLICTS_${PN} += "wl12xx-firmware"
>
> -# Tag: ol_r8.a6.01
> -SRCREV = "1c0f45f0e8aec0823175f7ac977908888c424aa1"
> +# Tag: ol_r8.a8.08
> +SRCREV = "8e7f455e726f2bf92c568286a5cca510d7718dc1"
> SRC_URI = "git://github.com/TI-OpenLink/wl18xx_fw.git;protocol=git \
> file://Makefile \
> "
> --
> 1.7.9
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 6/8] arago-prefs: update default value for am335x and am43x for WILINK-8
2013-12-08 8:18 [PATCH 1/8] wpa-supplicant-wl18xx: Update recipe to ol_r8.a8.08 version Yaniv Mahani
` (3 preceding siblings ...)
2013-12-08 8:18 ` [PATCH 5/8] wl18xx-firmware: update " Yaniv Mahani
@ 2013-12-08 8:18 ` Yaniv Mahani
2014-01-14 13:28 ` Cooper Jr., Franklin
2013-12-08 8:18 ` [PATCH 7/8] arago-tisdk-connectivity: Restored connectivity modules compilation Yaniv Mahani
` (3 subsequent siblings)
8 siblings, 1 reply; 18+ messages in thread
From: Yaniv Mahani @ 2013-12-08 8:18 UTC (permalink / raw)
To: meta-arago
From: Yaniv Machani <yanivma@ti.com>
- Also change the default supported WILINK version
Signed-off-by: Yaniv Machani <yanivma@ti.com>
---
.../conf/distro/include/arago-prefs.inc | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc
index 7d9afe7..412fa3a 100644
--- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
+++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
@@ -99,7 +99,10 @@ PREFERRED_VERSION_bluez-hcidump = "2.2"
PREFERRED_VERSION_bash = "3.2.48"
PREFERRED_VERSION_gettext = "0.16.1"
-WILINK_VERSION = "WILINK-6"
+WILINK_VERSION = "WILINK-8"
+# For AM335x & AM43x Wilink 8 is now the default version to be used
+WILINK_VERSION_ti33x = "WILINK-8"
+WILINK_VERSION_ti43x = "WILINK-8"
PREFERRED_PROVIDER_wl12xx-firmware = "${@base_contains('WILINK_VERSION','WILINK-8','wl18xx-firmware','wl12xx-firmware',d)}"
PREFERRED_PROVIDER_ti-compat-wireless-wl12xx = "${@base_contains('WILINK_VERSION','WILINK-8','ti-compat-wireless-wl18xx','ti-compat-wireless-wl12xx',d)}"
PREFERRED_PROVIDER_hostap-daemon = "${@base_contains('WILINK_VERSION','WILINK-8','hostap-daemon-wl18xx','hostap-daemon',d)}"
--
1.7.9
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 6/8] arago-prefs: update default value for am335x and am43x for WILINK-8
2013-12-08 8:18 ` [PATCH 6/8] arago-prefs: update default value for am335x and am43x for WILINK-8 Yaniv Mahani
@ 2014-01-14 13:28 ` Cooper Jr., Franklin
0 siblings, 0 replies; 18+ messages in thread
From: Cooper Jr., Franklin @ 2014-01-14 13:28 UTC (permalink / raw)
To: Machani, Yaniv, meta-arago@arago-project.org
Acked-by: Franklin Cooper Jr. <fcooper@ti.com>
> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Machani, Yaniv
> Sent: Sunday, December 08, 2013 2:18 AM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [PATCH 6/8] arago-prefs: update default value for
> am335x and am43x for WILINK-8
>
> From: Yaniv Machani <yanivma@ti.com>
>
> - Also change the default supported WILINK version
>
> Signed-off-by: Yaniv Machani <yanivma@ti.com>
> ---
> .../conf/distro/include/arago-prefs.inc | 5 ++++-
> 1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-
> arago-distro/conf/distro/include/arago-prefs.inc
> index 7d9afe7..412fa3a 100644
> --- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
> +++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
> @@ -99,7 +99,10 @@ PREFERRED_VERSION_bluez-hcidump = "2.2"
> PREFERRED_VERSION_bash = "3.2.48"
> PREFERRED_VERSION_gettext = "0.16.1"
>
> -WILINK_VERSION = "WILINK-6"
> +WILINK_VERSION = "WILINK-8"
> +# For AM335x & AM43x Wilink 8 is now the default version to be used
> +WILINK_VERSION_ti33x = "WILINK-8"
> +WILINK_VERSION_ti43x = "WILINK-8"
> PREFERRED_PROVIDER_wl12xx-firmware =
> "${@base_contains('WILINK_VERSION','WILINK-8','wl18xx-firmware','wl12xx-
> firmware',d)}"
> PREFERRED_PROVIDER_ti-compat-wireless-wl12xx =
> "${@base_contains('WILINK_VERSION','WILINK-8','ti-compat-wireless-
> wl18xx','ti-compat-wireless-wl12xx',d)}"
> PREFERRED_PROVIDER_hostap-daemon =
> "${@base_contains('WILINK_VERSION','WILINK-8','hostap-daemon-
> wl18xx','hostap-daemon',d)}"
> --
> 1.7.9
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 7/8] arago-tisdk-connectivity: Restored connectivity modules compilation
2013-12-08 8:18 [PATCH 1/8] wpa-supplicant-wl18xx: Update recipe to ol_r8.a8.08 version Yaniv Mahani
` (4 preceding siblings ...)
2013-12-08 8:18 ` [PATCH 6/8] arago-prefs: update default value for am335x and am43x for WILINK-8 Yaniv Mahani
@ 2013-12-08 8:18 ` Yaniv Mahani
2014-01-14 13:28 ` Cooper Jr., Franklin
2013-12-08 8:18 ` [PATCH 8/8] crda: Removed redundant recipe Yaniv Mahani
` (2 subsequent siblings)
8 siblings, 1 reply; 18+ messages in thread
From: Yaniv Mahani @ 2013-12-08 8:18 UTC (permalink / raw)
To: meta-arago
From: Yaniv Machani <yanivma@ti.com>
- Modules compatibility issues with libnl were fixed.
- Removed unused components
Signed-off-by: Yaniv Machani <yanivma@ti.com>
---
.../packagegroup-arago-tisdk-connectivity.bb | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
index 0aa019d..d7d2ef2 100644
--- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
+++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Task to install wlan and bluetooth packages into the target FS"
LICENSE = "MIT"
-PR = "r17"
+PR = "r18"
inherit packagegroup
@@ -23,16 +23,12 @@ WLAN_COMMON = "\
pulseaudio-module-bluetooth-device \
eventdump \
${@base_contains('WILINK_VERSION','WILINK-8','wlconf','',d)} \
+ wpa-supplicant \
+ crda \
+ hostap-daemon \
+ ti-wifi-utils \
"
-
-# TI/ECS versions of wpa-supplicant/crda/hostap/wifi-utils require older libnl,
-# which no longer exists
-# wpa-supplicant
-# crda
-# hostap-daemon
-# ti-wifi-utils
# No bluetooth/bluetooth.h
-# oppserver
# netperf has non-standard license, needs verifying
# netperf
@@ -42,8 +38,7 @@ WLAN_COMMON = "\
# ti-compat-bluetooth
FIRMWARE_AND_DRIVERS = "\
- bt-firmware \
- bt-enable \
+ "${@base_contains('WILINK_VERSION','WILINK-6',' oppserver bt-firmware bt-enable' , '',d)}"\
wl12xx-firmware \
"
--
1.7.9
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 7/8] arago-tisdk-connectivity: Restored connectivity modules compilation
2013-12-08 8:18 ` [PATCH 7/8] arago-tisdk-connectivity: Restored connectivity modules compilation Yaniv Mahani
@ 2014-01-14 13:28 ` Cooper Jr., Franklin
0 siblings, 0 replies; 18+ messages in thread
From: Cooper Jr., Franklin @ 2014-01-14 13:28 UTC (permalink / raw)
To: Machani, Yaniv, meta-arago@arago-project.org
Acked-by: Franklin Cooper Jr. <fcooper@ti.com>
> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Machani, Yaniv
> Sent: Sunday, December 08, 2013 2:18 AM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [PATCH 7/8] arago-tisdk-connectivity: Restored
> connectivity modules compilation
>
> From: Yaniv Machani <yanivma@ti.com>
>
> - Modules compatibility issues with libnl were fixed.
> - Removed unused components
>
> Signed-off-by: Yaniv Machani <yanivma@ti.com>
> ---
> .../packagegroup-arago-tisdk-connectivity.bb | 17 ++++++-----------
> 1 files changed, 6 insertions(+), 11 deletions(-)
>
> diff --git a/meta-arago-distro/recipes-core/packagegroups/packagegroup-
> arago-tisdk-connectivity.bb b/meta-arago-distro/recipes-
> core/packagegroups/packagegroup-arago-tisdk-connectivity.bb
> index 0aa019d..d7d2ef2 100644
> --- a/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-
> tisdk-connectivity.bb
> +++ b/meta-arago-distro/recipes-core/packagegroups/packagegroup-arago-ti
> +++ sdk-connectivity.bb
> @@ -1,6 +1,6 @@
> DESCRIPTION = "Task to install wlan and bluetooth packages into the target FS"
> LICENSE = "MIT"
> -PR = "r17"
> +PR = "r18"
>
> inherit packagegroup
>
> @@ -23,16 +23,12 @@ WLAN_COMMON = "\
> pulseaudio-module-bluetooth-device \
> eventdump \
> ${@base_contains('WILINK_VERSION','WILINK-8','wlconf','',d)} \
> + wpa-supplicant \
> + crda \
> + hostap-daemon \
> + ti-wifi-utils \
> "
> -
> -# TI/ECS versions of wpa-supplicant/crda/hostap/wifi-utils require older libnl, -
> # which no longer exists
> -# wpa-supplicant
> -# crda
> -# hostap-daemon
> -# ti-wifi-utils
> # No bluetooth/bluetooth.h
> -# oppserver
>
> # netperf has non-standard license, needs verifying
> # netperf
> @@ -42,8 +38,7 @@ WLAN_COMMON = "\
> # ti-compat-bluetooth
>
> FIRMWARE_AND_DRIVERS = "\
> - bt-firmware \
> - bt-enable \
> + "${@base_contains('WILINK_VERSION','WILINK-6',' oppserver
> + bt-firmware bt-enable' , '',d)}"\
> wl12xx-firmware \
> "
>
> --
> 1.7.9
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH 8/8] crda: Removed redundant recipe.
2013-12-08 8:18 [PATCH 1/8] wpa-supplicant-wl18xx: Update recipe to ol_r8.a8.08 version Yaniv Mahani
` (5 preceding siblings ...)
2013-12-08 8:18 ` [PATCH 7/8] arago-tisdk-connectivity: Restored connectivity modules compilation Yaniv Mahani
@ 2013-12-08 8:18 ` Yaniv Mahani
2014-01-14 13:28 ` Cooper Jr., Franklin
2013-12-09 5:46 ` [PATCH 1/8] wpa-supplicant-wl18xx: Update recipe to ol_r8.a8.08 version Denys Dmytriyenko
2014-01-14 13:28 ` Cooper Jr., Franklin
8 siblings, 1 reply; 18+ messages in thread
From: Yaniv Mahani @ 2013-12-08 8:18 UTC (permalink / raw)
To: meta-arago
From: Yaniv Machani <yanivma@ti.com>
- crda 1.1.3 from meta-openembedded can be used.
Signed-off-by: Yaniv Machani <yanivma@ti.com>
---
.../conf/distro/include/arago-prefs.inc | 2 +-
.../recipes-connectivity/crda/crda_1.1.1.bb | 37 --------------------
2 files changed, 1 insertions(+), 38 deletions(-)
delete mode 100644 meta-arago-extras/recipes-connectivity/crda/crda_1.1.1.bb
diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc
index 412fa3a..a19e425 100644
--- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
+++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
@@ -92,7 +92,7 @@ PREFERRED_VERSION_readline-native = "5.2"
PREFERRED_VERSION_readline-nativesdk = "5.2"
PREFERRED_VERSION_libnl = "3.2.21"
-PREFERRED_VERSION_crda = "1.1.1"
+PREFERRED_VERSION_crda = "1.1.3"
PREFERRED_VERSION_obex = "0.34"
PREFERRED_VERSION_bluez4 = "4.101"
PREFERRED_VERSION_bluez-hcidump = "2.2"
diff --git a/meta-arago-extras/recipes-connectivity/crda/crda_1.1.1.bb b/meta-arago-extras/recipes-connectivity/crda/crda_1.1.1.bb
deleted file mode 100644
index e3880a1..0000000
--- a/meta-arago-extras/recipes-connectivity/crda/crda_1.1.1.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-DESCRIPTION = "Wireless Central Regulatory Domain Agent"
-HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA"
-SECTION = "base"
-LICENSE = "ISC"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c"
-
-PR = "r0"
-
-DEPENDS = "libgcrypt libnl python-native python-m2crypto-native"
-RDEPENDS_${PN} = "udev"
-
-SRC_URI = "http://wireless.kernel.org/download/crda/${P}.tar.bz2;name=crda \
- http://wireless.kernel.org/download/wireless-regdb/regulatory.bins/2011.04.28-regulatory.bin;name=reg \
-"
-
-CFLAGS += " -DCONFIG_LIBNL20"
-
-EXTRA_OEMAKE = "MAKEFLAGS="
-do_compile() {
- oe_runmake all_noverify
-}
-
-do_install() {
- oe_runmake DESTDIR=${D} install
- install -d ${D}/usr/lib/crda/
- install -m 0644 ${WORKDIR}/2011.04.28-regulatory.bin ${D}/usr/lib/crda/regulatory.bin
-}
-
-SRC_URI[crda.md5sum] = "5fc77af68b3e21736b8ef2f8b061c810"
-SRC_URI[crda.sha256sum] = "59b4760da44a8f803caeaaa7fb97e0c6bd3f35f40445b28258e7f14c2fbe13b5"
-SRC_URI[reg.md5sum] = "1535e98bcaba732e2f8e8f62dac6f369"
-SRC_URI[reg.sha256sum] = "bb6ba6f5dcdf7106a19c588b0e4d43ab7af26f6474fe01011a318b3dceaba33b"
-
-FILES_${PN} += "\
- /lib/udev/rules.d/85-regulatory.rules \
- /usr/lib/crda/regulatory.bin \
-"
--
1.7.9
^ permalink raw reply related [flat|nested] 18+ messages in thread* Re: [PATCH 8/8] crda: Removed redundant recipe.
2013-12-08 8:18 ` [PATCH 8/8] crda: Removed redundant recipe Yaniv Mahani
@ 2014-01-14 13:28 ` Cooper Jr., Franklin
0 siblings, 0 replies; 18+ messages in thread
From: Cooper Jr., Franklin @ 2014-01-14 13:28 UTC (permalink / raw)
To: Machani, Yaniv, meta-arago@arago-project.org
Acked-by: Franklin Cooper Jr. <fcooper@ti.com>
> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Machani, Yaniv
> Sent: Sunday, December 08, 2013 2:18 AM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [PATCH 8/8] crda: Removed redundant recipe.
>
> From: Yaniv Machani <yanivma@ti.com>
>
> - crda 1.1.3 from meta-openembedded can be used.
>
> Signed-off-by: Yaniv Machani <yanivma@ti.com>
> ---
> .../conf/distro/include/arago-prefs.inc | 2 +-
> .../recipes-connectivity/crda/crda_1.1.1.bb | 37 --------------------
> 2 files changed, 1 insertions(+), 38 deletions(-) delete mode 100644 meta-
> arago-extras/recipes-connectivity/crda/crda_1.1.1.bb
>
> diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-
> arago-distro/conf/distro/include/arago-prefs.inc
> index 412fa3a..a19e425 100644
> --- a/meta-arago-distro/conf/distro/include/arago-prefs.inc
> +++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc
> @@ -92,7 +92,7 @@ PREFERRED_VERSION_readline-native = "5.2"
> PREFERRED_VERSION_readline-nativesdk = "5.2"
>
> PREFERRED_VERSION_libnl = "3.2.21"
> -PREFERRED_VERSION_crda = "1.1.1"
> +PREFERRED_VERSION_crda = "1.1.3"
> PREFERRED_VERSION_obex = "0.34"
> PREFERRED_VERSION_bluez4 = "4.101"
> PREFERRED_VERSION_bluez-hcidump = "2.2"
> diff --git a/meta-arago-extras/recipes-connectivity/crda/crda_1.1.1.bb b/meta-
> arago-extras/recipes-connectivity/crda/crda_1.1.1.bb
> deleted file mode 100644
> index e3880a1..0000000
> --- a/meta-arago-extras/recipes-connectivity/crda/crda_1.1.1.bb
> +++ /dev/null
> @@ -1,37 +0,0 @@
> -DESCRIPTION = "Wireless Central Regulatory Domain Agent"
> -HOMEPAGE = "http://wireless.kernel.org/en/developers/Regulatory/CRDA"
> -SECTION = "base"
> -LICENSE = "ISC"
> -LIC_FILES_CHKSUM =
> "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c"
> -
> -PR = "r0"
> -
> -DEPENDS = "libgcrypt libnl python-native python-m2crypto-native"
> -RDEPENDS_${PN} = "udev"
> -
> -SRC_URI = "http://wireless.kernel.org/download/crda/${P}.tar.bz2;name=crda
> \
> - http://wireless.kernel.org/download/wireless-
> regdb/regulatory.bins/2011.04.28-regulatory.bin;name=reg \
> -"
> -
> -CFLAGS += " -DCONFIG_LIBNL20"
> -
> -EXTRA_OEMAKE = "MAKEFLAGS="
> -do_compile() {
> - oe_runmake all_noverify
> -}
> -
> -do_install() {
> - oe_runmake DESTDIR=${D} install
> - install -d ${D}/usr/lib/crda/
> - install -m 0644 ${WORKDIR}/2011.04.28-regulatory.bin
> ${D}/usr/lib/crda/regulatory.bin
> -}
> -
> -SRC_URI[crda.md5sum] = "5fc77af68b3e21736b8ef2f8b061c810"
> -SRC_URI[crda.sha256sum] =
> "59b4760da44a8f803caeaaa7fb97e0c6bd3f35f40445b28258e7f14c2fbe13b5
> "
> -SRC_URI[reg.md5sum] = "1535e98bcaba732e2f8e8f62dac6f369"
> -SRC_URI[reg.sha256sum] =
> "bb6ba6f5dcdf7106a19c588b0e4d43ab7af26f6474fe01011a318b3dceaba33b
> "
> -
> -FILES_${PN} += "\
> - /lib/udev/rules.d/85-regulatory.rules \
> - /usr/lib/crda/regulatory.bin \
> -"
> --
> 1.7.9
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/8] wpa-supplicant-wl18xx: Update recipe to ol_r8.a8.08 version.
2013-12-08 8:18 [PATCH 1/8] wpa-supplicant-wl18xx: Update recipe to ol_r8.a8.08 version Yaniv Mahani
` (6 preceding siblings ...)
2013-12-08 8:18 ` [PATCH 8/8] crda: Removed redundant recipe Yaniv Mahani
@ 2013-12-09 5:46 ` Denys Dmytriyenko
2013-12-14 9:40 ` Denys Dmytriyenko
2014-01-14 13:28 ` Cooper Jr., Franklin
8 siblings, 1 reply; 18+ messages in thread
From: Denys Dmytriyenko @ 2013-12-09 5:46 UTC (permalink / raw)
To: Yaniv Mahani; +Cc: meta-arago
Thanks, Yaniv. Please give me a day or so to review your patches. Thanks
again for submission!
--
Denys
On Sun, Dec 08, 2013 at 10:18:09AM +0200, Yaniv Mahani wrote:
> From: Yaniv Machani <yanivma@ti.com>
>
> - Build wpa-supplicant from TI_Openlink ol_r8.a8.08
> - Add missing includes for building with libnl3.
> - Adjusted configuration files, and added p2p conf.
>
> Signed-off-by: Yaniv Machani <yanivma@ti.com>
> ---
> This set of patches should allow integration of WiLink-8 into meta-arago.
> It should replace the set of 14 patches previously submitted for review.
>
>
> Note :
> Wilink-6 is currently not supported with the latest meta-arago builds.
> ECS have decided not to support Wilink-6 in the core SDK also in the future.
> Therefore any Wilink-6 broken recipes should not be a concern, as we will clean them up on a different set of patches.
>
> wifi-direct-demo, battleship, wpa-gui-e applications will shortly be removed as well.
>
> Yaniv
>
> .../wpa-supplicant/wpa-supplicant-wl18xx/defconfig | 164 ++++--
> ....a6.01.bb => wpa-supplicant-wl18xx_r8.a8.08.bb} | 6 +-
> .../wpa-supplicant/wpa-supplicant.inc | 3 +
> .../wpa-supplicant/p2p_supplicant.conf | 14 +
> .../wpa-supplicant/wpa_supplicant.conf | 674 +-------------------
> 5 files changed, 164 insertions(+), 697 deletions(-)
> rename meta-arago-extras/recipes-connectivity/wpa-supplicant/{wpa-supplicant-wl18xx_r8.a6.01.bb => wpa-supplicant-wl18xx_r8.a8.08.bb} (88%)
> create mode 100755 meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/p2p_supplicant.conf
>
> diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx/defconfig b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx/defconfig
> index b982e2a..f357b79 100755
> --- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx/defconfig
> +++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx/defconfig
> @@ -39,18 +39,6 @@
> #LIBS = -lssl
> ###############################################################################
>
> -#CC=$(CROSS_COMPILE)gcc
> -#CFLAGS += -DCONFIG_LIBNL20
> -#CPPFLAGS += -DCONFIG_LIBNL20
> -#LIBS += -L$(NFSROOT)/lib -lnl
> -#LIBS_p += -L$(NFSROOT)/lib
> -#LIBDIR = $(NFSROOT)/lib
> -#BINDIR = $(NFSROOT)/usr/sbin
> -
> -CONFIG_WAPI=y
> -CONFIG_LIBNL20=y
> -NEED_BGSCAN=y
> -CONFIG_BGSCAN_LEARN=y
>
> # Driver interface for Host AP driver
> #CONFIG_DRIVER_HOSTAP=y
> @@ -75,7 +63,7 @@ CONFIG_BGSCAN_LEARN=y
> #CONFIG_DRIVER_ATMEL=y
>
> # Driver interface for old Broadcom driver
> -# Please note that the newer Broadcom driver ("hybrid Linux driver") supportsBG
> +# Please note that the newer Broadcom driver ("hybrid Linux driver") supports
> # Linux wireless extensions and does not need (or even work) with the old
> # driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver.
> #CONFIG_DRIVER_BROADCOM=y
> @@ -90,16 +78,22 @@ CONFIG_BGSCAN_LEARN=y
> #CONFIG_DRIVER_RALINK=y
>
> # Driver interface for generic Linux wireless extensions
> -CONFIG_DRIVER_WEXT=y
> +# Note: WEXT is deprecated in the current Linux kernel version and no new
> +# functionality is added to it. nl80211-based interface is the new
> +# replacement for WEXT and its use allows wpa_supplicant to properly control
> +# the driver to improve existing functionality like roaming and to support new
> +# functionality.
> +#CONFIG_DRIVER_WEXT=y
>
> # Driver interface for Linux drivers using the nl80211 kernel interface
> CONFIG_DRIVER_NL80211=y
> +CONFIG_LIBNL32=y
>
> # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
> #CONFIG_DRIVER_BSD=y
> #CFLAGS += -I/usr/local/include
> #LIBS += -L/usr/local/lib
> -#LIBS_p += -L/usr/local/libBG
> +#LIBS_p += -L/usr/local/lib
> #LIBS_c += -L/usr/local/lib
>
> # Driver interface for Windows NDIS
> @@ -121,13 +115,8 @@ CONFIG_DRIVER_NL80211=y
> # Driver interface for development testing
> #CONFIG_DRIVER_TEST=y
>
> -# Include client MLME (management frame processing) for test driver
> -# This can be used to test MLME operations in hostapd with the test interface.
> -# space.
> -#CONFIG_CLIENT_MLME=y
> -
> # Driver interface for wired Ethernet drivers
> -CONFIG_DRIVER_WIRED=y
> +#CONFIG_DRIVER_WIRED=y
>
> # Driver interface for the Broadcom RoboSwitch family
> #CONFIG_DRIVER_ROBOSWITCH=y
> @@ -163,7 +152,7 @@ CONFIG_EAP_TTLS=y
> # functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
> # the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch)
> # to add the needed functions.
> -#CONFIG_EAP_FAST=y
> +CONFIG_EAP_FAST=y
>
> # EAP-GTC
> CONFIG_EAP_GTC=y
> @@ -172,11 +161,14 @@ CONFIG_EAP_GTC=y
> CONFIG_EAP_OTP=y
>
> # EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
> -#CONFIG_EAP_SIM=y
> +CONFIG_EAP_SIM=y
>
> # EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
> #CONFIG_EAP_PSK=y
>
> +# EAP-pwd (secure authentication using only a password)
> +CONFIG_EAP_PWD=y
> +
> # EAP-PAX
> #CONFIG_EAP_PAX=y
>
> @@ -208,6 +200,11 @@ CONFIG_EAP_LEAP=y
> CONFIG_WPS=y
> # Enable WSC 2.0 support
> CONFIG_WPS2=y
> +# Enable WPS external registrar functionality
> +#CONFIG_WPS_ER=y
> +# Disable credentials for an open network by default when acting as a WPS
> +# registrar.
> +#CONFIG_WPS_REG_DISABLE_OPEN=y
>
> # EAP-IKEv2
> #CONFIG_EAP_IKEV2=y
> @@ -224,7 +221,10 @@ CONFIG_SMARTCARD=y
> # Enable this if EAP-SIM or EAP-AKA is included
> #CONFIG_PCSC=y
>
> -# Development testingBG
> +# Support HT overrides (disable HT/HT40, mask MCS rates, etc.)
> +#CONFIG_HT_OVERRIDES=y
> +
> +# Development testing
> #CONFIG_EAPOL_TEST=y
>
> # Select control interface backend for external programs, e.g, wpa_cli:
> @@ -242,6 +242,10 @@ CONFIG_CTRL_IFACE=y
> # the resulting binary.
> #CONFIG_READLINE=y
>
> +# Include internal line edit mode in wpa_cli. This can be used as a replacement
> +# for GNU Readline to provide limited command line editing and history support.
> +CONFIG_WPA_CLI_EDIT=y
> +
> # Remove debugging code that is printing out debug message to stdout.
> # This can be used to reduce the size of the wpa_supplicant considerably
> # if debugging code is not needed. The size reduction can be around 35%
> @@ -295,13 +299,16 @@ CONFIG_BACKEND=file
> # unix = UNIX/POSIX like systems (default)
> # win32 = Windows systems
> # none = Empty template
> -#CONFIG_OS=unix
> +CONFIG_OS=unix
>
> # Select event loop implementation
> # eloop = select() loop (default)
> # eloop_win = Windows events and WaitForMultipleObject() loop
> # eloop_none = Empty template
> -#CONFIG_ELOOP=eloop
> +CONFIG_ELOOP=eloop
> +
> +# Should we use poll instead of select? Select is used by default.
> +#CONFIG_ELOOP_POLL=y
>
> # Select layer 2 packet implementation
> # linux = Linux packet socket (default)
> @@ -310,7 +317,7 @@ CONFIG_BACKEND=file
> # winpcap = WinPcap with receive thread
> # ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y)
> # none = Empty template
> -#CONFIG_L2_PACKET=linux
> +CONFIG_L2_PACKET=linux
>
> # PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
> CONFIG_PEERKEY=y
> @@ -323,18 +330,24 @@ CONFIG_PEERKEY=y
>
> # Select TLS implementation
> # openssl = OpenSSL (default)
> -# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
> +# gnutls = GnuTLS
> # internal = Internal TLSv1 implementation (experimental)
> # none = Empty template
> #CONFIG_TLS=openssl
>
> -# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
> -# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
> -# even though the core GnuTLS library is released under LGPL, this extra
> -# library uses GPL and as such, the terms of GPL apply to the combination
> -# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
> -# apply for distribution of the resulting binary.
> -#CONFIG_GNUTLS_EXTRA=y
> +# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1)
> +# can be enabled to get a stronger construction of messages when block ciphers
> +# are used. It should be noted that some existing TLS v1.0 -based
> +# implementation may not be compatible with TLS v1.1 message (ClientHello is
> +# sent prior to negotiating which version will be used)
> +#CONFIG_TLSV11=y
> +
> +# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2)
> +# can be enabled to enable use of stronger crypto algorithms. It should be
> +# noted that some existing TLS v1.0 -based implementation may not be compatible
> +# with TLS v1.2 message (ClientHello is sent prior to negotiating which version
> +# will be used)
> +#CONFIG_TLSV12=y
>
> # If CONFIG_TLS=internal is used, additional library and include paths are
> # needed for LibTomMath. Alternatively, an integrated, minimal version of
> @@ -360,14 +373,14 @@ CONFIG_PEERKEY=y
>
> # Add support for old DBus control interface
> # (fi.epitest.hostap.WPASupplicant)
> -CONFIG_CTRL_IFACE_DBUS=y
> +#CONFIG_CTRL_IFACE_DBUS=y
>
> # Add support for new DBus control interface
> # (fi.w1.hostap.wpa_supplicant1)
> -CONFIG_CTRL_IFACE_DBUS_NEW=y
> +#CONFIG_CTRL_IFACE_DBUS_NEW=y
>
> # Add introspection support for new DBus control interface
> -CONFIG_CTRL_IFACE_DBUS_INTRO=y
> +#CONFIG_CTRL_IFACE_DBUS_INTRO=y
>
> # Add support for loading EAP methods dynamically as shared libraries.
> # When this option is enabled, each EAP method can be either included
> @@ -394,7 +407,22 @@ CONFIG_CTRL_IFACE_DBUS_INTRO=y
> #CONFIG_IEEE80211R=y
>
> # Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
> -CONFIG_DEBUG_FILE=y
> +#CONFIG_DEBUG_FILE=y
> +
> +# Send debug messages to syslog instead of stdout
> +#CONFIG_DEBUG_SYSLOG=y
> +# Set syslog facility for debug messages
> +#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
> +
> +# Add support for sending all debug messages (regardless of debug verbosity)
> +# to the Linux kernel tracing facility. This helps debug the entire stack by
> +# making it easy to record everything happening from the driver up into the
> +# same file, e.g., using trace-cmd.
> +#CONFIG_DEBUG_LINUX_TRACING=y
> +
> +# Add support for writing debug log to Android logcat instead of standard
> +# output
> +CONFIG_ANDROID_LOG=y
>
> # Enable privilege separation (see README 'Privilege separation' for details)
> #CONFIG_PRIVSEP=y
> @@ -407,7 +435,7 @@ CONFIG_DEBUG_FILE=y
> # This tracks use of memory allocations and other registrations and reports
> # incorrect use with a backtrace of call (or allocation) location.
> #CONFIG_WPA_TRACE=y
> -# For BSD, comment out these.
> +# For BSD, uncomment these.
> #LIBS += -lexecinfo
> #LIBS_p += -lexecinfo
> #LIBS_c += -lexecinfo
> @@ -416,15 +444,63 @@ CONFIG_DEBUG_FILE=y
> # This enables use of libbfd to get more detailed symbols for the backtraces
> # generated by CONFIG_WPA_TRACE=y.
> #CONFIG_WPA_TRACE_BFD=y
> -# For BSD, comment out these.
> +# For BSD, uncomment these.
> #LIBS += -lbfd -liberty -lz
> #LIBS_p += -lbfd -liberty -lz
> #LIBS_c += -lbfd -liberty -lz
>
> -# for p2p
> +# wpa_supplicant depends on strong random number generation being available
> +# from the operating system. os_get_random() function is used to fetch random
> +# data when needed, e.g., for key generation. On Linux and BSD systems, this
> +# works by reading /dev/urandom. It should be noted that the OS entropy pool
> +# needs to be properly initialized before wpa_supplicant is started. This is
> +# important especially on embedded devices that do not have a hardware random
> +# number generator and may by default start up with minimal entropy available
> +# for random number generation.
> +#
> +# As a safety net, wpa_supplicant is by default trying to internally collect
> +# additional entropy for generating random data to mix in with the data fetched
> +# from the OS. This by itself is not considered to be very strong, but it may
> +# help in cases where the system pool is not initialized properly. However, it
> +# is very strongly recommended that the system pool is initialized with enough
> +# entropy either by using hardware assisted random number generator or by
> +# storing state over device reboots.
> +#
> +# wpa_supplicant can be configured to maintain its own entropy store over
> +# restarts to enhance random number generation. This is not perfect, but it is
> +# much more secure than using the same sequence of random numbers after every
> +# reboot. This can be enabled with -e<entropy file> command line option. The
> +# specified file needs to be readable and writable by wpa_supplicant.
> +#
> +# If the os_get_random() is known to provide strong random data (e.g., on
> +# Linux/BSD, the board in question is known to have reliable source of random
> +# data from /dev/urandom), the internal wpa_supplicant random pool can be
> +# disabled. This will save some in binary size and CPU use. However, this
> +# should only be considered for builds that are known to be used on devices
> +# that meet the requirements described above.
> +#CONFIG_NO_RANDOM_POOL=y
> +
> +# IEEE 802.11n (High Throughput) support (mainly for AP mode)
> +CONFIG_IEEE80211N=y
> +
> +# Interworking (IEEE 802.11u)
> +# This can be used to enable functionality to improve interworking with
> +# external networks (GAS/ANQP to learn more about the networks and network
> +# selection based on available credentials).
> +CONFIG_INTERWORKING=y
> +
> +# Hotspot 2.0
> +CONFIG_HS20=y
> +
> +# Disable roaming in wpa_supplicant
> +#CONFIG_NO_ROAMING=y
> +
> +# Enable P2P
> CONFIG_P2P=y
> CONFIG_AP=y
>
> -# IEEE 802.11n (High Throughput) support
> -CONFIG_IEEE80211N=y
> +# bgscan
> +NEED_BGSCAN=y
> +CONFIG_BGSCAN_LEARN=y
> +CONFIG_BGSCAN_SIMPLE=y
>
> diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx_r8.a6.01.bb b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx_r8.a8.08.bb
> similarity index 88%
> rename from meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx_r8.a6.01.bb
> rename to meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx_r8.a8.08.bb
> index f6c4f70..ec7a0c7 100644
> --- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx_r8.a6.01.bb
> +++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx_r8.a8.08.bb
> @@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://../COPYING;md5=ab87f20cd7e8c0d0a6539b34d3791d0e \
>
> FILESEXTRAPATHS_append := "${THISDIR}/wpa-supplicant:"
>
> -# Tag: ol_r8.a6.01
> -SRCREV = "7190ff7dbd43243290b626068ded0d61c5019050"
> -PR = "r2+gitr${SRCPV}"
> +# Tag: ol_r8.a8.08
> +SRCREV = "257ab333aad993b4be81808524bc0d939c276058"
> +PR_append = "a+gitr${SRCPV}"
>
> # Add ti to the PV to indicate that this is a TI modify version of wpa-supplicant.
> PV = "2.0-devel-ti"
> diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
> index 2d8970f..9678b1b 100644
> --- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
> +++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/TI-OpenLink/hostap.git;protocol=git \
> file://defaults-sane \
> file://wpa-supplicant.sh \
> file://wpa_supplicant.conf \
> + file://p2p_supplicant.conf \
> file://wpa_supplicant.conf-sane \
> file://99_wpa_supplicant \
> file://wpa_supplicant.conf \
> @@ -55,6 +56,7 @@ do_install () {
> install -d ${D}${sysconfdir}/default
> install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa
> install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
> + install -m 600 ${WORKDIR}/p2p_supplicant.conf ${D}${sysconfdir}/p2p_supplicant.conf
>
> if grep -q ^CONFIG_CTRL_IFACE_DBUS=y .config || grep -q ^CONFIG_CTRL_IFACE_DBUS_NEW=y .config; then
> install -d ${D}/${sysconfdir}/dbus-1/system.d
> @@ -104,6 +106,7 @@ pkg_postinst_wpa-supplicant () {
> do_configure () {
> install -m 0755 ${WORKDIR}/defconfig .config
> echo "CFLAGS += -I${STAGING_INCDIR}" >> .config
> + echo "CFLAGS += -I${STAGING_INCDIR}/libnl3/" >> .config
> echo "LIBS += -L${STAGING_LIBDIR}" >> .config
> echo "LIBS_p += -L${STAGING_LIBDIR}" >> .config
> if [ "${@base_contains('COMBINED_FEATURES', 'madwifi', 1, 0, d)}" = "1" ]; then
> diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/p2p_supplicant.conf b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/p2p_supplicant.conf
> new file mode 100755
> index 0000000..2de8730
> --- /dev/null
> +++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/p2p_supplicant.conf
> @@ -0,0 +1,14 @@
> +ctrl_interface=/var/run/wpa_supplicant
> +update_config=0
> +device_name=TI-SITARA-P2P
> +device_type=1-0050F204-1
> +config_methods=virtual_push_button physical_display keypad
> +p2p_go_intent=0
> +country=US
> +##p2p_pref_chan=115:36 115:40
> +driver_param=use_multi_chan_concurrent=1 use_p2p_group_interface=1
> +p2p_go_max_inactivity=60
> +p2p_go_ht40=1
> +p2p_multi_chan=1
> +disassoc_low_ack=1
> +concurrent_sched_scan=1
> diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
> index f0c993d..f144a38 100644
> --- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
> +++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
> @@ -1,19 +1,4 @@
> -##### Example wpa_supplicant configuration file ###############################
> -#
> -# This file describes configuration file format and lists all available option.
> -# Please also take a look at simpler configuration examples in 'examples'
> -# subdirectory.
> -#
> -# Empty lines and lines starting with # are ignored
> -
> -# NOTE! This file may contain password information and should probably be made
> -# readable only by root user on multiuser systems.
> -
> -# Note: All file paths in this configuration file should use full (absolute,
> -# not relative to working directory) path in order to allow working directory
> -# to be changed. This can happen if wpa_supplicant is run in the background.
> -
> -# Whether to allow wpa_supplicant to update (overwrite) configuration
> +##### wpa_supplicant configuration file template #####
> #
> # This option can be used to allow wpa_supplicant to overwrite configuration
> # file whenever configuration is changed (e.g., new network block is added with
> @@ -21,59 +6,8 @@
> # wpa_cli/wpa_gui to be able to store the configuration changes permanently.
> # Please note that overwriting configuration file will remove the comments from
> # it.
> -#update_config=1
> -
> -# global configuration (shared by all network blocks)
> -#
> -# Parameters for the control interface. If this is specified, wpa_supplicant
> -# will open a control interface that is available for external programs to
> -# manage wpa_supplicant. The meaning of this string depends on which control
> -# interface mechanism is used. For all cases, the existance of this parameter
> -# in configuration is used to determine whether the control interface is
> -# enabled.
> -#
> -# For UNIX domain sockets (default on Linux and BSD): This is a directory that
> -# will be created for UNIX domain sockets for listening to requests from
> -# external programs (CLI/GUI, etc.) for status information and configuration.
> -# The socket file will be named based on the interface name, so multiple
> -# wpa_supplicant processes can be run at the same time if more than one
> -# interface is used.
> -# /var/run/wpa_supplicant is the recommended directory for sockets and by
> -# default, wpa_cli will use it when trying to connect with wpa_supplicant.
> -#
> -# 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 wpa_supplicant as root (since it needs to change network
> -# configuration and open raw sockets) and still allow GUI/CLI components to be
> -# run as non-root users. However, since the control interface can be used to
> -# change the network configuration, this access needs to be protected in many
> -# cases. By default, wpa_supplicant is configured to use gid 0 (root). If you
> -# want to allow non-root users to use the control interface, add a new group
> -# and change this value to match with that group. Add users that should have
> -# control interface access to this group. If this variable is commented out or
> -# not included in the configuration file, group will not be changed from the
> -# value it got by default when the directory or socket was created.
> -#
> -# When configuring both the directory and group, use following format:
> -# DIR=/var/run/wpa_supplicant GROUP=wheel
> -# DIR=/var/run/wpa_supplicant GROUP=0
> -# (group can be either group name or gid)
> -#
> -# For UDP connections (default on Windows): The value will be ignored. This
> -# variable is just used to select that the control interface is to be created.
> -# The value can be set to, e.g., udp (ctrl_interface=udp)
> -#
> -# For Windows Named Pipe: This value can be used to set the security descriptor
> -# for controlling access to the control interface. Security descriptor can be
> -# set using Security Descriptor String Format (see http://msdn.microsoft.com/
> -# library/default.asp?url=/library/en-us/secauthz/security/
> -# security_descriptor_string_format.asp). The descriptor string needs to be
> -# prefixed with SDDL=. For example, ctrl_interface=SDDL=D: would set an empty
> -# DACL (which will reject all connections). See README-Windows.txt for more
> -# information about SDDL string format.
> -#
> +update_config=1
> ctrl_interface=/var/run/wpa_supplicant
> -
> # IEEE 802.1X/EAPOL version
> # wpa_supplicant is implemented based on IEEE Std 802.1X-2004 which defines
> # EAPOL version 2. However, there are many APs that do not handle the new
> @@ -82,14 +16,15 @@ ctrl_interface=/var/run/wpa_supplicant
> # to 1 by default. This configuration value can be used to set it to the new
> # version (2).
> eapol_version=1
> -
> # AP scanning/selection
> # By default, wpa_supplicant requests driver to perform AP scanning and then
> # uses the scan results to select a suitable AP. Another alternative is to
> # allow the driver to take care of AP scanning and selection and use
> # wpa_supplicant just to process EAPOL frames based on IEEE 802.11 association
> # information from the driver.
> -# 1: wpa_supplicant initiates scanning and AP selection
> +# 1: wpa_supplicant initiates scanning and AP selection; if no APs matching to
> +# the currently enabled networks are found, a new network (IBSS or AP mode
> +# operation) may be initialized (if configured) (default)
> # 0: driver takes care of scanning, AP selection, and IEEE 802.11 association
> # parameters (e.g., WPA IE generation); this mode can also be used with
> # non-WPA drivers when using IEEE 802.1X mode; do not try to associate with
> @@ -102,589 +37,28 @@ eapol_version=1
> # the driver reports successful association; each network block should have
> # explicit security policy (i.e., only one option in the lists) for
> # key_mgmt, pairwise, group, proto variables
> +# When using IBSS or AP mode, ap_scan=2 mode can force the new network to be
> +# created immediately regardless of scan results. ap_scan=1 mode will first try
> +# to scan for existing networks and only if no matches with the enabled
> +# networks are found, a new IBSS or AP mode network is created.
> ap_scan=1
> -
> # EAP fast re-authentication
> # By default, fast re-authentication is enabled for all EAP methods that
> # support it. This variable can be used to disable fast re-authentication.
> # Normally, there is no need to disable this.
> fast_reauth=1
> -
> -# OpenSSL Engine support
> -# These options can be used to load OpenSSL engines.
> -# The two engines that are supported currently are shown below:
> -# They are both from the opensc project (http://www.opensc.org/)
> -# By default no engines are loaded.
> -# make the opensc engine available
> -#opensc_engine_path=/usr/lib/opensc/engine_opensc.so
> -# make the pkcs11 engine available
> -#pkcs11_engine_path=/usr/lib/opensc/engine_pkcs11.so
> -# configure the path to the pkcs11 module required by the pkcs11 engine
> -#pkcs11_module_path=/usr/lib/pkcs11/opensc-pkcs11.so
> -
> -# Dynamic EAP methods
> -# If EAP methods were built dynamically as shared object files, they need to be
> -# loaded here before being used in the network blocks. By default, EAP methods
> -# are included statically in the build, so these lines are not needed
> -#load_dynamic_eap=/usr/lib/wpa_supplicant/eap_tls.so
> -#load_dynamic_eap=/usr/lib/wpa_supplicant/eap_md5.so
> -
> -# Driver interface parameters
> -# This field can be used to configure arbitrary driver interace parameters. The
> -# format is specific to the selected driver interface. This field is not used
> -# in most cases.
> -#driver_param="field=value"
> -
> -# Maximum lifetime for PMKSA in seconds; default 43200
> -#dot11RSNAConfigPMKLifetime=43200
> -# Threshold for reauthentication (percentage of PMK lifetime); default 70
> -#dot11RSNAConfigPMKReauthThreshold=70
> -# Timeout for security association negotiation in seconds; default 60
> -#dot11RSNAConfigSATimeout=60
> -
> -# network block
> -#
> -# Each network (usually AP's sharing the same SSID) is configured as a separate
> -# block in this configuration file. The network blocks are in preference order
> -# (the first match is used).
> -#
> -# network block fields:
> -#
> -# disabled:
> -# 0 = this network can be used (default)
> -# 1 = this network block is disabled (can be enabled through ctrl_iface,
> -# e.g., with wpa_cli or wpa_gui)
> -#
> -# id_str: Network identifier string for external scripts. This value is passed
> -# to external action script through wpa_cli as WPA_ID_STR environment
> -# variable to make it easier to do network specific configuration.
> -#
> -# ssid: SSID (mandatory); either as an ASCII string with double quotation or
> -# as hex string; network name
> -#
> -# scan_ssid:
> -# 0 = do not scan this SSID with specific Probe Request frames (default)
> -# 1 = scan with SSID-specific Probe Request frames (this can be used to
> -# find APs that do not accept broadcast SSID or use multiple SSIDs;
> -# this will add latency to scanning, so enable this only when needed)
> -#
> -# bssid: BSSID (optional); if set, this network block is used only when
> -# associating with the AP using the configured BSSID
> -#
> -# priority: priority group (integer)
> -# By default, all networks will get same priority group (0). If some of the
> -# networks are more desirable, this field can be used to change the order in
> -# which wpa_supplicant goes through the networks when selecting a BSS. The
> -# priority groups will be iterated in decreasing priority (i.e., the larger the
> -# priority value, the sooner the network is matched against the scan results).
> -# Within each priority group, networks will be selected based on security
> -# policy, signal strength, etc.
> -# Please note that AP scanning with scan_ssid=1 and ap_scan=2 mode are not
> -# using this priority to select the order for scanning. Instead, they try the
> -# networks in the order that used in the configuration file.
> -#
> -# mode: IEEE 802.11 operation mode
> -# 0 = infrastructure (Managed) mode, i.e., associate with an AP (default)
> -# 1 = IBSS (ad-hoc, peer-to-peer)
> -# Note: IBSS can only be used with key_mgmt NONE (plaintext and static WEP)
> -# and key_mgmt=WPA-NONE (fixed group key TKIP/CCMP). In addition, ap_scan has
> -# to be set to 2 for IBSS. WPA-None requires following network block options:
> -# proto=WPA, key_mgmt=WPA-NONE, pairwise=NONE, group=TKIP (or CCMP, but not
> -# both), and psk must also be set.
> -#
> -# proto: list of accepted protocols
> -# WPA = WPA/IEEE 802.11i/D3.0
> -# RSN = WPA2/IEEE 802.11i (also WPA2 can be used as an alias for RSN)
> -# If not set, this defaults to: WPA RSN
> -#
> -# key_mgmt: list of accepted authenticated key management protocols
> -# WPA-PSK = WPA pre-shared key (this requires 'psk' field)
> -# WPA-EAP = WPA using EAP authentication (this can use an external
> -# program, e.g., Xsupplicant, for IEEE 802.1X EAP Authentication
> -# IEEE8021X = IEEE 802.1X using EAP authentication and (optionally) dynamically
> -# generated WEP keys
> -# NONE = WPA is not used; plaintext or static WEP could be used
> -# If not set, this defaults to: WPA-PSK WPA-EAP
> -#
> -# auth_alg: list of allowed IEEE 802.11 authentication algorithms
> -# OPEN = Open System authentication (required for WPA/WPA2)
> -# SHARED = Shared Key authentication (requires static WEP keys)
> -# LEAP = LEAP/Network EAP (only used with LEAP)
> -# If not set, automatic selection is used (Open System with LEAP enabled if
> -# LEAP is allowed as one of the EAP methods).
> -#
> -# pairwise: list of accepted pairwise (unicast) ciphers for WPA
> -# CCMP = AES in Counter mode with CBC-MAC [RFC 3610, IEEE 802.11i/D7.0]
> -# TKIP = Temporal Key Integrity Protocol [IEEE 802.11i/D7.0]
> -# NONE = Use only Group Keys (deprecated, should not be included if APs support
> -# pairwise keys)
> -# If not set, this defaults to: CCMP TKIP
> -#
> -# group: list of accepted group (broadcast/multicast) ciphers for WPA
> -# CCMP = AES in Counter mode with CBC-MAC [RFC 3610, IEEE 802.11i/D7.0]
> -# TKIP = Temporal Key Integrity Protocol [IEEE 802.11i/D7.0]
> -# WEP104 = WEP (Wired Equivalent Privacy) with 104-bit key
> -# WEP40 = WEP (Wired Equivalent Privacy) with 40-bit key [IEEE 802.11]
> -# If not set, this defaults to: CCMP TKIP WEP104 WEP40
> -#
> -# psk: WPA preshared key; 256-bit pre-shared key
> -# The key used in WPA-PSK mode can be entered either as 64 hex-digits, i.e.,
> -# 32 bytes or as an ASCII passphrase (in which case, the real PSK will be
> -# generated using the passphrase and SSID). ASCII passphrase must be between
> -# 8 and 63 characters (inclusive).
> -# This field is not needed, if WPA-EAP is used.
> -# Note: Separate tool, wpa_passphrase, can be used to generate 256-bit keys
> -# from ASCII passphrase. This process uses lot of CPU and wpa_supplicant
> -# startup and reconfiguration time can be optimized by generating the PSK only
> -# only when the passphrase or SSID has actually changed.
> -#
> -# eapol_flags: IEEE 802.1X/EAPOL options (bit field)
> -# Dynamic WEP key required for non-WPA mode
> -# bit0 (1): require dynamically generated unicast WEP key
> -# bit1 (2): require dynamically generated broadcast WEP key
> -# (3 = require both keys; default)
> -# Note: When using wired authentication, eapol_flags must be set to 0 for the
> -# authentication to be completed successfully.
> -#
> -# proactive_key_caching:
> -# Enable/disable opportunistic PMKSA caching for WPA2.
> -# 0 = disabled (default)
> -# 1 = enabled
> -#
> -# wep_key0..3: Static WEP key (ASCII in double quotation, e.g. "abcde" or
> -# hex without quotation, e.g., 0102030405)
> -# wep_tx_keyidx: Default WEP key index (TX) (0..3)
> -#
> -# peerkey: Whether PeerKey negotiation for direct links (IEEE 802.11e DLS) is
> -# allowed. This is only used with RSN/WPA2.
> -# 0 = disabled (default)
> -# 1 = enabled
> -#peerkey=1
> -#
> -# Following fields are only used with internal EAP implementation.
> -# eap: space-separated list of accepted EAP methods
> -# MD5 = EAP-MD5 (unsecure and does not generate keying material ->
> -# cannot be used with WPA; to be used as a Phase 2 method
> -# with EAP-PEAP or EAP-TTLS)
> -# MSCHAPV2 = EAP-MSCHAPv2 (cannot be used separately with WPA; to be used
> -# as a Phase 2 method with EAP-PEAP or EAP-TTLS)
> -# OTP = EAP-OTP (cannot be used separately with WPA; to be used
> -# as a Phase 2 method with EAP-PEAP or EAP-TTLS)
> -# GTC = EAP-GTC (cannot be used separately with WPA; to be used
> -# as a Phase 2 method with EAP-PEAP or EAP-TTLS)
> -# TLS = EAP-TLS (client and server certificate)
> -# PEAP = EAP-PEAP (with tunnelled EAP authentication)
> -# TTLS = EAP-TTLS (with tunnelled EAP or PAP/CHAP/MSCHAP/MSCHAPV2
> -# authentication)
> -# If not set, all compiled in methods are allowed.
> -#
> -# identity: Identity string for EAP
> -# anonymous_identity: Anonymous identity string for EAP (to be used as the
> -# unencrypted identity with EAP types that support different tunnelled
> -# identity, e.g., EAP-TTLS)
> -# password: Password string for EAP
> -# ca_cert: File path to CA certificate file (PEM/DER). This file can have one
> -# or more trusted CA certificates. If ca_cert and ca_path are not
> -# included, server certificate will not be verified. This is insecure and
> -# a trusted CA certificate should always be configured when using
> -# EAP-TLS/TTLS/PEAP. Full path should be used since working directory may
> -# change when wpa_supplicant is run in the background.
> -# On Windows, trusted CA certificates can be loaded from the system
> -# certificate store by setting this to cert_store://<name>, e.g.,
> -# ca_cert="cert_store://CA" or ca_cert="cert_store://ROOT".
> -# Note that when running wpa_supplicant as an application, the user
> -# certificate store (My user account) is used, whereas computer store
> -# (Computer account) is used when running wpasvc as a service.
> -# ca_path: Directory path for CA certificate files (PEM). This path may
> -# contain multiple CA certificates in OpenSSL format. Common use for this
> -# is to point to system trusted CA list which is often installed into
> -# directory like /etc/ssl/certs. If configured, these certificates are
> -# added to the list of trusted CAs. ca_cert may also be included in that
> -# case, but it is not required.
> -# client_cert: File path to client certificate file (PEM/DER)
> -# Full path should be used since working directory may change when
> -# wpa_supplicant is run in the background.
> -# Alternatively, a named configuration blob can be used by setting this
> -# to blob://<blob name>.
> -# private_key: File path to client private key file (PEM/DER/PFX)
> -# When PKCS#12/PFX file (.p12/.pfx) is used, client_cert should be
> -# commented out. Both the private key and certificate will be read from
> -# the PKCS#12 file in this case. Full path should be used since working
> -# directory may change when wpa_supplicant is run in the background.
> -# Windows certificate store can be used by leaving client_cert out and
> -# configuring private_key in one of the following formats:
> -# cert://substring_to_match
> -# hash://certificate_thumbprint_in_hex
> -# for example: private_key="hash://63093aa9c47f56ae88334c7b65a4"
> -# Note that when running wpa_supplicant as an application, the user
> -# certificate store (My user account) is used, whereas computer store
> -# (Computer account) is used when running wpasvc as a service.
> -# Alternatively, a named configuration blob can be used by setting this
> -# to blob://<blob name>.
> -# private_key_passwd: Password for private key file (if left out, this will be
> -# asked through control interface)
> -# dh_file: File path to DH/DSA parameters file (in PEM format)
> -# This is an optional configuration file for setting parameters for an
> -# ephemeral DH key exchange. In most cases, the default RSA
> -# authentication does not use this configuration. However, it is possible
> -# setup RSA to use ephemeral DH key exchange. In addition, ciphers with
> -# DSA keys always use ephemeral DH keys. This can be used to achieve
> -# forward secrecy. If the file is in DSA parameters format, it will be
> -# automatically converted into DH params.
> -# subject_match: Substring to be matched against the subject of the
> -# authentication server certificate. If this string is set, the server
> -# sertificate is only accepted if it contains this string in the subject.
> -# The subject string is in following format:
> -# /C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com
> -# altsubject_match: Semicolon separated string of entries to be matched against
> -# the alternative subject name of the authentication server certificate.
> -# If this string is set, the server sertificate is only accepted if it
> -# contains one of the entries in an alternative subject name extension.
> -# altSubjectName string is in following format: TYPE:VALUE
> -# Example: EMAIL:server@example.com
> -# Example: DNS:server.example.com;DNS:server2.example.com
> -# Following types are supported: EMAIL, DNS, URI
> -# phase1: Phase1 (outer authentication, i.e., TLS tunnel) parameters
> -# (string with field-value pairs, e.g., "peapver=0" or
> -# "peapver=1 peaplabel=1")
> -# 'peapver' can be used to force which PEAP version (0 or 1) is used.
> -# 'peaplabel=1' can be used to force new label, "client PEAP encryption",
> -# to be used during key derivation when PEAPv1 or newer. Most existing
> -# PEAPv1 implementation seem to be using the old label, "client EAP
> -# encryption", and wpa_supplicant is now using that as the default value.
> -# Some servers, e.g., Radiator, may require peaplabel=1 configuration to
> -# interoperate with PEAPv1; see eap_testing.txt for more details.
> -# 'peap_outer_success=0' can be used to terminate PEAP authentication on
> -# tunneled EAP-Success. This is required with some RADIUS servers that
> -# implement draft-josefsson-pppext-eap-tls-eap-05.txt (e.g.,
> -# Lucent NavisRadius v4.4.0 with PEAP in "IETF Draft 5" mode)
> -# include_tls_length=1 can be used to force wpa_supplicant to include
> -# TLS Message Length field in all TLS messages even if they are not
> -# fragmented.
> -# sim_min_num_chal=3 can be used to configure EAP-SIM to require three
> -# challenges (by default, it accepts 2 or 3)
> -# phase2: Phase2 (inner authentication with TLS tunnel) parameters
> -# (string with field-value pairs, e.g., "auth=MSCHAPV2" for EAP-PEAP or
> -# "autheap=MSCHAPV2 autheap=MD5" for EAP-TTLS)
> -# Following certificate/private key fields are used in inner Phase2
> -# authentication when using EAP-TTLS or EAP-PEAP.
> -# ca_cert2: File path to CA certificate file. This file can have one or more
> -# trusted CA certificates. If ca_cert2 and ca_path2 are not included,
> -# server certificate will not be verified. This is insecure and a trusted
> -# CA certificate should always be configured.
> -# ca_path2: Directory path for CA certificate files (PEM)
> -# client_cert2: File path to client certificate file
> -# private_key2: File path to client private key file
> -# private_key2_passwd: Password for private key file
> -# dh_file2: File path to DH/DSA parameters file (in PEM format)
> -# subject_match2: Substring to be matched against the subject of the
> -# authentication server certificate.
> -# altsubject_match2: Substring to be matched against the alternative subject
> -# name of the authentication server certificate.
> -#
> -# fragment_size: Maximum EAP fragment size in bytes (default 1398).
> -# This value limits the fragment size for EAP methods that support
> -# fragmentation (e.g., EAP-TLS and EAP-PEAP). This value should be set
> -# small enough to make the EAP messages fit in MTU of the network
> -# interface used for EAPOL. The default value is suitable for most
> -# cases.
> -#
> -# EAP-PSK variables:
> -# eappsk: 16-byte (128-bit, 32 hex digits) pre-shared key in hex format
> -# nai: user NAI
> -#
> -# EAP-PAX variables:
> -# eappsk: 16-byte (128-bit, 32 hex digits) pre-shared key in hex format
> -#
> -# EAP-SAKE variables:
> -# eappsk: 32-byte (256-bit, 64 hex digits) pre-shared key in hex format
> -# (this is concatenation of Root-Secret-A and Root-Secret-B)
> -# nai: user NAI (PEERID)
> -#
> -# EAP-GPSK variables:
> -# eappsk: Pre-shared key in hex format (at least 128 bits, i.e., 32 hex digits)
> -# nai: user NAI (ID_Client)
> -#
> -# EAP-FAST variables:
> -# pac_file: File path for the PAC entries. wpa_supplicant will need to be able
> -# to create this file and write updates to it when PAC is being
> -# provisioned or refreshed. Full path to the file should be used since
> -# working directory may change when wpa_supplicant is run in the
> -# background. Alternatively, a named configuration blob can be used by
> -# setting this to blob://<blob name>
> -# phase1: fast_provisioning=1 option enables in-line provisioning of EAP-FAST
> -# credentials (PAC)
> -#
> -# wpa_supplicant supports number of "EAP workarounds" to work around
> -# interoperability issues with incorrectly behaving authentication servers.
> -# These are enabled by default because some of the issues are present in large
> -# number of authentication servers. Strict EAP conformance mode can be
> -# configured by disabling workarounds with eap_workaround=0.
> -
> -# Example blocks:
> -
> -# Simple case: WPA-PSK, PSK as an ASCII passphrase, allow all valid ciphers
> -network={
> - ssid="simple"
> - psk="very secret passphrase"
> - priority=5
> -}
> -
> -# Same as previous, but request SSID-specific scanning (for APs that reject
> -# broadcast SSID)
> -network={
> - ssid="second ssid"
> - scan_ssid=1
> - psk="very secret passphrase"
> - priority=2
> -}
> -
> -# Only WPA-PSK is used. Any valid cipher combination is accepted.
> -network={
> - ssid="example"
> - proto=WPA
> - key_mgmt=WPA-PSK
> - pairwise=CCMP TKIP
> - group=CCMP TKIP WEP104 WEP40
> - psk=06b4be19da289f475aa46a33cb793029d4ab3db7a23ee92382eb0106c72ac7bb
> - priority=2
> -}
> -
> -# Only WPA-EAP is used. Both CCMP and TKIP is accepted. An AP that used WEP104
> -# or WEP40 as the group cipher will not be accepted.
> -network={
> - ssid="example"
> - proto=RSN
> - key_mgmt=WPA-EAP
> - pairwise=CCMP TKIP
> - group=CCMP TKIP
> - eap=TLS
> - identity="user@example.com"
> - ca_cert="/etc/cert/ca.pem"
> - client_cert="/etc/cert/user.pem"
> - private_key="/etc/cert/user.prv"
> - private_key_passwd="password"
> - priority=1
> -}
> -
> -# EAP-PEAP/MSCHAPv2 configuration for RADIUS servers that use the new peaplabel
> -# (e.g., Radiator)
> -network={
> - ssid="example"
> - key_mgmt=WPA-EAP
> - eap=PEAP
> - identity="user@example.com"
> - password="foobar"
> - ca_cert="/etc/cert/ca.pem"
> - phase1="peaplabel=1"
> - phase2="auth=MSCHAPV2"
> - priority=10
> -}
> -
> -# EAP-TTLS/EAP-MD5-Challenge configuration with anonymous identity for the
> -# unencrypted use. Real identity is sent only within an encrypted TLS tunnel.
> -network={
> - ssid="example"
> - key_mgmt=WPA-EAP
> - eap=TTLS
> - identity="user@example.com"
> - anonymous_identity="anonymous@example.com"
> - password="foobar"
> - ca_cert="/etc/cert/ca.pem"
> - priority=2
> -}
> -
> -# EAP-TTLS/MSCHAPv2 configuration with anonymous identity for the unencrypted
> -# use. Real identity is sent only within an encrypted TLS tunnel.
> -network={
> - ssid="example"
> - key_mgmt=WPA-EAP
> - eap=TTLS
> - identity="user@example.com"
> - anonymous_identity="anonymous@example.com"
> - password="foobar"
> - ca_cert="/etc/cert/ca.pem"
> - phase2="auth=MSCHAPV2"
> -}
> -
> -# WPA-EAP, EAP-TTLS with different CA certificate used for outer and inner
> -# authentication.
> -network={
> - ssid="example"
> - key_mgmt=WPA-EAP
> - eap=TTLS
> - # Phase1 / outer authentication
> - anonymous_identity="anonymous@example.com"
> - ca_cert="/etc/cert/ca.pem"
> - # Phase 2 / inner authentication
> - phase2="autheap=TLS"
> - ca_cert2="/etc/cert/ca2.pem"
> - client_cert2="/etc/cer/user.pem"
> - private_key2="/etc/cer/user.prv"
> - private_key2_passwd="password"
> - priority=2
> -}
> -
> -# Both WPA-PSK and WPA-EAP is accepted. Only CCMP is accepted as pairwise and
> -# group cipher.
> -network={
> - ssid="example"
> - bssid=00:11:22:33:44:55
> - proto=WPA RSN
> - key_mgmt=WPA-PSK WPA-EAP
> - pairwise=CCMP
> - group=CCMP
> - psk=06b4be19da289f475aa46a33cb793029d4ab3db7a23ee92382eb0106c72ac7bb
> -}
> -
> -# Special characters in SSID, so use hex string. Default to WPA-PSK, WPA-EAP
> -# and all valid ciphers.
> -network={
> - ssid=00010203
> - psk=000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f
> -}
> -
> -
> -# IEEE 802.1X/EAPOL with dynamically generated WEP keys (i.e., no WPA) using
> -# EAP-TLS for authentication and key generation; require both unicast and
> -# broadcast WEP keys.
> -network={
> - ssid="1x-test"
> - key_mgmt=IEEE8021X
> - eap=TLS
> - identity="user@example.com"
> - ca_cert="/etc/cert/ca.pem"
> - client_cert="/etc/cert/user.pem"
> - private_key="/etc/cert/user.prv"
> - private_key_passwd="password"
> - eapol_flags=3
> -}
> -
> -
> -# LEAP with dynamic WEP keys
> -network={
> - ssid="leap-example"
> - key_mgmt=IEEE8021X
> - eap=LEAP
> - identity="user"
> - password="foobar"
> -}
> -
> -# Plaintext connection (no WPA, no IEEE 802.1X)
> -network={
> - ssid="plaintext-test"
> - key_mgmt=NONE
> -}
> -
> -
> -# Shared WEP key connection (no WPA, no IEEE 802.1X)
> -network={
> - ssid="static-wep-test"
> - key_mgmt=NONE
> - wep_key0="abcde"
> - wep_key1=0102030405
> - wep_key2="1234567890123"
> - wep_tx_keyidx=0
> - priority=5
> -}
> -
> -
> -# Shared WEP key connection (no WPA, no IEEE 802.1X) using Shared Key
> -# IEEE 802.11 authentication
> -network={
> - ssid="static-wep-test2"
> - key_mgmt=NONE
> - wep_key0="abcde"
> - wep_key1=0102030405
> - wep_key2="1234567890123"
> - wep_tx_keyidx=0
> - priority=5
> - auth_alg=SHARED
> -}
> -
> -
> -# IBSS/ad-hoc network with WPA-None/TKIP.
> -network={
> - ssid="test adhoc"
> - mode=1
> - proto=WPA
> - key_mgmt=WPA-NONE
> - pairwise=NONE
> - group=TKIP
> - psk="secret passphrase"
> -}
> -
> -
> -# Catch all example that allows more or less all configuration modes
> -network={
> - ssid="example"
> - scan_ssid=1
> - key_mgmt=WPA-EAP WPA-PSK IEEE8021X NONE
> - pairwise=CCMP TKIP
> - group=CCMP TKIP WEP104 WEP40
> - psk="very secret passphrase"
> - eap=TTLS PEAP TLS
> - identity="user@example.com"
> - password="foobar"
> - ca_cert="/etc/cert/ca.pem"
> - client_cert="/etc/cert/user.pem"
> - private_key="/etc/cert/user.prv"
> - private_key_passwd="password"
> - phase1="peaplabel=0"
> -}
> -
> -# Example of EAP-TLS with smartcard (openssl engine)
> -network={
> - ssid="example"
> - key_mgmt=WPA-EAP
> - eap=TLS
> - proto=RSN
> - pairwise=CCMP TKIP
> - group=CCMP TKIP
> - identity="user@example.com"
> - ca_cert="/etc/cert/ca.pem"
> - client_cert="/etc/cert/user.pem"
> -
> - engine=1
> -
> - # The engine configured here must be available. Look at
> - # OpenSSL engine support in the global section.
> - # The key available through the engine must be the private key
> - # matching the client certificate configured above.
> -
> - # use the opensc engine
> - #engine_id="opensc"
> - #key_id="45"
> -
> - # use the pkcs11 engine
> - engine_id="pkcs11"
> - key_id="id_45"
> -
> - # Optional PIN configuration; this can be left out and PIN will be
> - # asked through the control interface
> - pin="1234"
> -}
> -
> -# Example configuration showing how to use an inlined blob as a CA certificate
> -# data instead of using external file
> -network={
> - ssid="example"
> - key_mgmt=WPA-EAP
> - eap=TTLS
> - identity="user@example.com"
> - anonymous_identity="anonymous@example.com"
> - password="foobar"
> - ca_cert="blob://exampleblob"
> - priority=20
> -}
> -
> -blob-base64-exampleblob={
> -SGVsbG8gV29ybGQhCg==
> -}
> -
> -
> -# Wildcard match for SSID (plaintext APs only). This example select any
> -# open AP regardless of its SSID.
> -network={
> - key_mgmt=NONE
> -}
> +device_name=Blaze
> +manufacturer=TI
> +model_name=Wilink
> +model_number=wl18xx
> +serial_number=12345
> +driver_param=use_multi_chan_concurrent=1 use_p2p_group_interface=1
> +# Timeout in seconds to detect STA inactivity (default: 300 seconds)
> +#
> +# This timeout value is used in P2P GO mode to clean up
> +# inactive stations.
> +p2p_go_max_inactivity=60
> +p2p_go_ht40=1
> +p2p_multi_chan=1
> +disassoc_low_ack=1
> +concurrent_sched_scan=1
> --
> 1.7.9
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 18+ messages in thread* Re: [PATCH 1/8] wpa-supplicant-wl18xx: Update recipe to ol_r8.a8.08 version.
2013-12-09 5:46 ` [PATCH 1/8] wpa-supplicant-wl18xx: Update recipe to ol_r8.a8.08 version Denys Dmytriyenko
@ 2013-12-14 9:40 ` Denys Dmytriyenko
0 siblings, 0 replies; 18+ messages in thread
From: Denys Dmytriyenko @ 2013-12-14 9:40 UTC (permalink / raw)
To: Yaniv Mahani, meta-arago
Sorry for the delay - I didn't forget about the patches, but we are trying to
make a release now and I didn't have time for anything else. I'll try to
allocate some time for this as soon as possible. Thatnks.
--
Denys
On Mon, Dec 09, 2013 at 12:46:45AM -0500, Denys Dmytriyenko wrote:
> Thanks, Yaniv. Please give me a day or so to review your patches. Thanks
> again for submission!
>
> --
> Denys
>
> On Sun, Dec 08, 2013 at 10:18:09AM +0200, Yaniv Mahani wrote:
> > From: Yaniv Machani <yanivma@ti.com>
> >
> > - Build wpa-supplicant from TI_Openlink ol_r8.a8.08
> > - Add missing includes for building with libnl3.
> > - Adjusted configuration files, and added p2p conf.
> >
> > Signed-off-by: Yaniv Machani <yanivma@ti.com>
> > ---
> > This set of patches should allow integration of WiLink-8 into meta-arago.
> > It should replace the set of 14 patches previously submitted for review.
> >
> >
> > Note :
> > Wilink-6 is currently not supported with the latest meta-arago builds.
> > ECS have decided not to support Wilink-6 in the core SDK also in the future.
> > Therefore any Wilink-6 broken recipes should not be a concern, as we will clean them up on a different set of patches.
> >
> > wifi-direct-demo, battleship, wpa-gui-e applications will shortly be removed as well.
> >
> > Yaniv
> >
> > .../wpa-supplicant/wpa-supplicant-wl18xx/defconfig | 164 ++++--
> > ....a6.01.bb => wpa-supplicant-wl18xx_r8.a8.08.bb} | 6 +-
> > .../wpa-supplicant/wpa-supplicant.inc | 3 +
> > .../wpa-supplicant/p2p_supplicant.conf | 14 +
> > .../wpa-supplicant/wpa_supplicant.conf | 674 +-------------------
> > 5 files changed, 164 insertions(+), 697 deletions(-)
> > rename meta-arago-extras/recipes-connectivity/wpa-supplicant/{wpa-supplicant-wl18xx_r8.a6.01.bb => wpa-supplicant-wl18xx_r8.a8.08.bb} (88%)
> > create mode 100755 meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/p2p_supplicant.conf
> >
> > diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx/defconfig b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx/defconfig
> > index b982e2a..f357b79 100755
> > --- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx/defconfig
> > +++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx/defconfig
> > @@ -39,18 +39,6 @@
> > #LIBS = -lssl
> > ###############################################################################
> >
> > -#CC=$(CROSS_COMPILE)gcc
> > -#CFLAGS += -DCONFIG_LIBNL20
> > -#CPPFLAGS += -DCONFIG_LIBNL20
> > -#LIBS += -L$(NFSROOT)/lib -lnl
> > -#LIBS_p += -L$(NFSROOT)/lib
> > -#LIBDIR = $(NFSROOT)/lib
> > -#BINDIR = $(NFSROOT)/usr/sbin
> > -
> > -CONFIG_WAPI=y
> > -CONFIG_LIBNL20=y
> > -NEED_BGSCAN=y
> > -CONFIG_BGSCAN_LEARN=y
> >
> > # Driver interface for Host AP driver
> > #CONFIG_DRIVER_HOSTAP=y
> > @@ -75,7 +63,7 @@ CONFIG_BGSCAN_LEARN=y
> > #CONFIG_DRIVER_ATMEL=y
> >
> > # Driver interface for old Broadcom driver
> > -# Please note that the newer Broadcom driver ("hybrid Linux driver") supportsBG
> > +# Please note that the newer Broadcom driver ("hybrid Linux driver") supports
> > # Linux wireless extensions and does not need (or even work) with the old
> > # driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver.
> > #CONFIG_DRIVER_BROADCOM=y
> > @@ -90,16 +78,22 @@ CONFIG_BGSCAN_LEARN=y
> > #CONFIG_DRIVER_RALINK=y
> >
> > # Driver interface for generic Linux wireless extensions
> > -CONFIG_DRIVER_WEXT=y
> > +# Note: WEXT is deprecated in the current Linux kernel version and no new
> > +# functionality is added to it. nl80211-based interface is the new
> > +# replacement for WEXT and its use allows wpa_supplicant to properly control
> > +# the driver to improve existing functionality like roaming and to support new
> > +# functionality.
> > +#CONFIG_DRIVER_WEXT=y
> >
> > # Driver interface for Linux drivers using the nl80211 kernel interface
> > CONFIG_DRIVER_NL80211=y
> > +CONFIG_LIBNL32=y
> >
> > # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
> > #CONFIG_DRIVER_BSD=y
> > #CFLAGS += -I/usr/local/include
> > #LIBS += -L/usr/local/lib
> > -#LIBS_p += -L/usr/local/libBG
> > +#LIBS_p += -L/usr/local/lib
> > #LIBS_c += -L/usr/local/lib
> >
> > # Driver interface for Windows NDIS
> > @@ -121,13 +115,8 @@ CONFIG_DRIVER_NL80211=y
> > # Driver interface for development testing
> > #CONFIG_DRIVER_TEST=y
> >
> > -# Include client MLME (management frame processing) for test driver
> > -# This can be used to test MLME operations in hostapd with the test interface.
> > -# space.
> > -#CONFIG_CLIENT_MLME=y
> > -
> > # Driver interface for wired Ethernet drivers
> > -CONFIG_DRIVER_WIRED=y
> > +#CONFIG_DRIVER_WIRED=y
> >
> > # Driver interface for the Broadcom RoboSwitch family
> > #CONFIG_DRIVER_ROBOSWITCH=y
> > @@ -163,7 +152,7 @@ CONFIG_EAP_TTLS=y
> > # functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
> > # the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch)
> > # to add the needed functions.
> > -#CONFIG_EAP_FAST=y
> > +CONFIG_EAP_FAST=y
> >
> > # EAP-GTC
> > CONFIG_EAP_GTC=y
> > @@ -172,11 +161,14 @@ CONFIG_EAP_GTC=y
> > CONFIG_EAP_OTP=y
> >
> > # EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
> > -#CONFIG_EAP_SIM=y
> > +CONFIG_EAP_SIM=y
> >
> > # EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
> > #CONFIG_EAP_PSK=y
> >
> > +# EAP-pwd (secure authentication using only a password)
> > +CONFIG_EAP_PWD=y
> > +
> > # EAP-PAX
> > #CONFIG_EAP_PAX=y
> >
> > @@ -208,6 +200,11 @@ CONFIG_EAP_LEAP=y
> > CONFIG_WPS=y
> > # Enable WSC 2.0 support
> > CONFIG_WPS2=y
> > +# Enable WPS external registrar functionality
> > +#CONFIG_WPS_ER=y
> > +# Disable credentials for an open network by default when acting as a WPS
> > +# registrar.
> > +#CONFIG_WPS_REG_DISABLE_OPEN=y
> >
> > # EAP-IKEv2
> > #CONFIG_EAP_IKEV2=y
> > @@ -224,7 +221,10 @@ CONFIG_SMARTCARD=y
> > # Enable this if EAP-SIM or EAP-AKA is included
> > #CONFIG_PCSC=y
> >
> > -# Development testingBG
> > +# Support HT overrides (disable HT/HT40, mask MCS rates, etc.)
> > +#CONFIG_HT_OVERRIDES=y
> > +
> > +# Development testing
> > #CONFIG_EAPOL_TEST=y
> >
> > # Select control interface backend for external programs, e.g, wpa_cli:
> > @@ -242,6 +242,10 @@ CONFIG_CTRL_IFACE=y
> > # the resulting binary.
> > #CONFIG_READLINE=y
> >
> > +# Include internal line edit mode in wpa_cli. This can be used as a replacement
> > +# for GNU Readline to provide limited command line editing and history support.
> > +CONFIG_WPA_CLI_EDIT=y
> > +
> > # Remove debugging code that is printing out debug message to stdout.
> > # This can be used to reduce the size of the wpa_supplicant considerably
> > # if debugging code is not needed. The size reduction can be around 35%
> > @@ -295,13 +299,16 @@ CONFIG_BACKEND=file
> > # unix = UNIX/POSIX like systems (default)
> > # win32 = Windows systems
> > # none = Empty template
> > -#CONFIG_OS=unix
> > +CONFIG_OS=unix
> >
> > # Select event loop implementation
> > # eloop = select() loop (default)
> > # eloop_win = Windows events and WaitForMultipleObject() loop
> > # eloop_none = Empty template
> > -#CONFIG_ELOOP=eloop
> > +CONFIG_ELOOP=eloop
> > +
> > +# Should we use poll instead of select? Select is used by default.
> > +#CONFIG_ELOOP_POLL=y
> >
> > # Select layer 2 packet implementation
> > # linux = Linux packet socket (default)
> > @@ -310,7 +317,7 @@ CONFIG_BACKEND=file
> > # winpcap = WinPcap with receive thread
> > # ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y)
> > # none = Empty template
> > -#CONFIG_L2_PACKET=linux
> > +CONFIG_L2_PACKET=linux
> >
> > # PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
> > CONFIG_PEERKEY=y
> > @@ -323,18 +330,24 @@ CONFIG_PEERKEY=y
> >
> > # Select TLS implementation
> > # openssl = OpenSSL (default)
> > -# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
> > +# gnutls = GnuTLS
> > # internal = Internal TLSv1 implementation (experimental)
> > # none = Empty template
> > #CONFIG_TLS=openssl
> >
> > -# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
> > -# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
> > -# even though the core GnuTLS library is released under LGPL, this extra
> > -# library uses GPL and as such, the terms of GPL apply to the combination
> > -# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
> > -# apply for distribution of the resulting binary.
> > -#CONFIG_GNUTLS_EXTRA=y
> > +# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.1)
> > +# can be enabled to get a stronger construction of messages when block ciphers
> > +# are used. It should be noted that some existing TLS v1.0 -based
> > +# implementation may not be compatible with TLS v1.1 message (ClientHello is
> > +# sent prior to negotiating which version will be used)
> > +#CONFIG_TLSV11=y
> > +
> > +# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS (v1.2)
> > +# can be enabled to enable use of stronger crypto algorithms. It should be
> > +# noted that some existing TLS v1.0 -based implementation may not be compatible
> > +# with TLS v1.2 message (ClientHello is sent prior to negotiating which version
> > +# will be used)
> > +#CONFIG_TLSV12=y
> >
> > # If CONFIG_TLS=internal is used, additional library and include paths are
> > # needed for LibTomMath. Alternatively, an integrated, minimal version of
> > @@ -360,14 +373,14 @@ CONFIG_PEERKEY=y
> >
> > # Add support for old DBus control interface
> > # (fi.epitest.hostap.WPASupplicant)
> > -CONFIG_CTRL_IFACE_DBUS=y
> > +#CONFIG_CTRL_IFACE_DBUS=y
> >
> > # Add support for new DBus control interface
> > # (fi.w1.hostap.wpa_supplicant1)
> > -CONFIG_CTRL_IFACE_DBUS_NEW=y
> > +#CONFIG_CTRL_IFACE_DBUS_NEW=y
> >
> > # Add introspection support for new DBus control interface
> > -CONFIG_CTRL_IFACE_DBUS_INTRO=y
> > +#CONFIG_CTRL_IFACE_DBUS_INTRO=y
> >
> > # Add support for loading EAP methods dynamically as shared libraries.
> > # When this option is enabled, each EAP method can be either included
> > @@ -394,7 +407,22 @@ CONFIG_CTRL_IFACE_DBUS_INTRO=y
> > #CONFIG_IEEE80211R=y
> >
> > # Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
> > -CONFIG_DEBUG_FILE=y
> > +#CONFIG_DEBUG_FILE=y
> > +
> > +# Send debug messages to syslog instead of stdout
> > +#CONFIG_DEBUG_SYSLOG=y
> > +# Set syslog facility for debug messages
> > +#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
> > +
> > +# Add support for sending all debug messages (regardless of debug verbosity)
> > +# to the Linux kernel tracing facility. This helps debug the entire stack by
> > +# making it easy to record everything happening from the driver up into the
> > +# same file, e.g., using trace-cmd.
> > +#CONFIG_DEBUG_LINUX_TRACING=y
> > +
> > +# Add support for writing debug log to Android logcat instead of standard
> > +# output
> > +CONFIG_ANDROID_LOG=y
> >
> > # Enable privilege separation (see README 'Privilege separation' for details)
> > #CONFIG_PRIVSEP=y
> > @@ -407,7 +435,7 @@ CONFIG_DEBUG_FILE=y
> > # This tracks use of memory allocations and other registrations and reports
> > # incorrect use with a backtrace of call (or allocation) location.
> > #CONFIG_WPA_TRACE=y
> > -# For BSD, comment out these.
> > +# For BSD, uncomment these.
> > #LIBS += -lexecinfo
> > #LIBS_p += -lexecinfo
> > #LIBS_c += -lexecinfo
> > @@ -416,15 +444,63 @@ CONFIG_DEBUG_FILE=y
> > # This enables use of libbfd to get more detailed symbols for the backtraces
> > # generated by CONFIG_WPA_TRACE=y.
> > #CONFIG_WPA_TRACE_BFD=y
> > -# For BSD, comment out these.
> > +# For BSD, uncomment these.
> > #LIBS += -lbfd -liberty -lz
> > #LIBS_p += -lbfd -liberty -lz
> > #LIBS_c += -lbfd -liberty -lz
> >
> > -# for p2p
> > +# wpa_supplicant depends on strong random number generation being available
> > +# from the operating system. os_get_random() function is used to fetch random
> > +# data when needed, e.g., for key generation. On Linux and BSD systems, this
> > +# works by reading /dev/urandom. It should be noted that the OS entropy pool
> > +# needs to be properly initialized before wpa_supplicant is started. This is
> > +# important especially on embedded devices that do not have a hardware random
> > +# number generator and may by default start up with minimal entropy available
> > +# for random number generation.
> > +#
> > +# As a safety net, wpa_supplicant is by default trying to internally collect
> > +# additional entropy for generating random data to mix in with the data fetched
> > +# from the OS. This by itself is not considered to be very strong, but it may
> > +# help in cases where the system pool is not initialized properly. However, it
> > +# is very strongly recommended that the system pool is initialized with enough
> > +# entropy either by using hardware assisted random number generator or by
> > +# storing state over device reboots.
> > +#
> > +# wpa_supplicant can be configured to maintain its own entropy store over
> > +# restarts to enhance random number generation. This is not perfect, but it is
> > +# much more secure than using the same sequence of random numbers after every
> > +# reboot. This can be enabled with -e<entropy file> command line option. The
> > +# specified file needs to be readable and writable by wpa_supplicant.
> > +#
> > +# If the os_get_random() is known to provide strong random data (e.g., on
> > +# Linux/BSD, the board in question is known to have reliable source of random
> > +# data from /dev/urandom), the internal wpa_supplicant random pool can be
> > +# disabled. This will save some in binary size and CPU use. However, this
> > +# should only be considered for builds that are known to be used on devices
> > +# that meet the requirements described above.
> > +#CONFIG_NO_RANDOM_POOL=y
> > +
> > +# IEEE 802.11n (High Throughput) support (mainly for AP mode)
> > +CONFIG_IEEE80211N=y
> > +
> > +# Interworking (IEEE 802.11u)
> > +# This can be used to enable functionality to improve interworking with
> > +# external networks (GAS/ANQP to learn more about the networks and network
> > +# selection based on available credentials).
> > +CONFIG_INTERWORKING=y
> > +
> > +# Hotspot 2.0
> > +CONFIG_HS20=y
> > +
> > +# Disable roaming in wpa_supplicant
> > +#CONFIG_NO_ROAMING=y
> > +
> > +# Enable P2P
> > CONFIG_P2P=y
> > CONFIG_AP=y
> >
> > -# IEEE 802.11n (High Throughput) support
> > -CONFIG_IEEE80211N=y
> > +# bgscan
> > +NEED_BGSCAN=y
> > +CONFIG_BGSCAN_LEARN=y
> > +CONFIG_BGSCAN_SIMPLE=y
> >
> > diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx_r8.a6.01.bb b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx_r8.a8.08.bb
> > similarity index 88%
> > rename from meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx_r8.a6.01.bb
> > rename to meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx_r8.a8.08.bb
> > index f6c4f70..ec7a0c7 100644
> > --- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx_r8.a6.01.bb
> > +++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-wl18xx_r8.a8.08.bb
> > @@ -10,9 +10,9 @@ LIC_FILES_CHKSUM = "file://../COPYING;md5=ab87f20cd7e8c0d0a6539b34d3791d0e \
> >
> > FILESEXTRAPATHS_append := "${THISDIR}/wpa-supplicant:"
> >
> > -# Tag: ol_r8.a6.01
> > -SRCREV = "7190ff7dbd43243290b626068ded0d61c5019050"
> > -PR = "r2+gitr${SRCPV}"
> > +# Tag: ol_r8.a8.08
> > +SRCREV = "257ab333aad993b4be81808524bc0d939c276058"
> > +PR_append = "a+gitr${SRCPV}"
> >
> > # Add ti to the PV to indicate that this is a TI modify version of wpa-supplicant.
> > PV = "2.0-devel-ti"
> > diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
> > index 2d8970f..9678b1b 100644
> > --- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
> > +++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant.inc
> > @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/TI-OpenLink/hostap.git;protocol=git \
> > file://defaults-sane \
> > file://wpa-supplicant.sh \
> > file://wpa_supplicant.conf \
> > + file://p2p_supplicant.conf \
> > file://wpa_supplicant.conf-sane \
> > file://99_wpa_supplicant \
> > file://wpa_supplicant.conf \
> > @@ -55,6 +56,7 @@ do_install () {
> > install -d ${D}${sysconfdir}/default
> > install -m 600 ${WORKDIR}/defaults-sane ${D}${sysconfdir}/default/wpa
> > install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane ${D}${sysconfdir}/wpa_supplicant.conf
> > + install -m 600 ${WORKDIR}/p2p_supplicant.conf ${D}${sysconfdir}/p2p_supplicant.conf
> >
> > if grep -q ^CONFIG_CTRL_IFACE_DBUS=y .config || grep -q ^CONFIG_CTRL_IFACE_DBUS_NEW=y .config; then
> > install -d ${D}/${sysconfdir}/dbus-1/system.d
> > @@ -104,6 +106,7 @@ pkg_postinst_wpa-supplicant () {
> > do_configure () {
> > install -m 0755 ${WORKDIR}/defconfig .config
> > echo "CFLAGS += -I${STAGING_INCDIR}" >> .config
> > + echo "CFLAGS += -I${STAGING_INCDIR}/libnl3/" >> .config
> > echo "LIBS += -L${STAGING_LIBDIR}" >> .config
> > echo "LIBS_p += -L${STAGING_LIBDIR}" >> .config
> > if [ "${@base_contains('COMBINED_FEATURES', 'madwifi', 1, 0, d)}" = "1" ]; then
> > diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/p2p_supplicant.conf b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/p2p_supplicant.conf
> > new file mode 100755
> > index 0000000..2de8730
> > --- /dev/null
> > +++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/p2p_supplicant.conf
> > @@ -0,0 +1,14 @@
> > +ctrl_interface=/var/run/wpa_supplicant
> > +update_config=0
> > +device_name=TI-SITARA-P2P
> > +device_type=1-0050F204-1
> > +config_methods=virtual_push_button physical_display keypad
> > +p2p_go_intent=0
> > +country=US
> > +##p2p_pref_chan=115:36 115:40
> > +driver_param=use_multi_chan_concurrent=1 use_p2p_group_interface=1
> > +p2p_go_max_inactivity=60
> > +p2p_go_ht40=1
> > +p2p_multi_chan=1
> > +disassoc_low_ack=1
> > +concurrent_sched_scan=1
> > diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
> > index f0c993d..f144a38 100644
> > --- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
> > +++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
> > @@ -1,19 +1,4 @@
> > -##### Example wpa_supplicant configuration file ###############################
> > -#
> > -# This file describes configuration file format and lists all available option.
> > -# Please also take a look at simpler configuration examples in 'examples'
> > -# subdirectory.
> > -#
> > -# Empty lines and lines starting with # are ignored
> > -
> > -# NOTE! This file may contain password information and should probably be made
> > -# readable only by root user on multiuser systems.
> > -
> > -# Note: All file paths in this configuration file should use full (absolute,
> > -# not relative to working directory) path in order to allow working directory
> > -# to be changed. This can happen if wpa_supplicant is run in the background.
> > -
> > -# Whether to allow wpa_supplicant to update (overwrite) configuration
> > +##### wpa_supplicant configuration file template #####
> > #
> > # This option can be used to allow wpa_supplicant to overwrite configuration
> > # file whenever configuration is changed (e.g., new network block is added with
> > @@ -21,59 +6,8 @@
> > # wpa_cli/wpa_gui to be able to store the configuration changes permanently.
> > # Please note that overwriting configuration file will remove the comments from
> > # it.
> > -#update_config=1
> > -
> > -# global configuration (shared by all network blocks)
> > -#
> > -# Parameters for the control interface. If this is specified, wpa_supplicant
> > -# will open a control interface that is available for external programs to
> > -# manage wpa_supplicant. The meaning of this string depends on which control
> > -# interface mechanism is used. For all cases, the existance of this parameter
> > -# in configuration is used to determine whether the control interface is
> > -# enabled.
> > -#
> > -# For UNIX domain sockets (default on Linux and BSD): This is a directory that
> > -# will be created for UNIX domain sockets for listening to requests from
> > -# external programs (CLI/GUI, etc.) for status information and configuration.
> > -# The socket file will be named based on the interface name, so multiple
> > -# wpa_supplicant processes can be run at the same time if more than one
> > -# interface is used.
> > -# /var/run/wpa_supplicant is the recommended directory for sockets and by
> > -# default, wpa_cli will use it when trying to connect with wpa_supplicant.
> > -#
> > -# 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 wpa_supplicant as root (since it needs to change network
> > -# configuration and open raw sockets) and still allow GUI/CLI components to be
> > -# run as non-root users. However, since the control interface can be used to
> > -# change the network configuration, this access needs to be protected in many
> > -# cases. By default, wpa_supplicant is configured to use gid 0 (root). If you
> > -# want to allow non-root users to use the control interface, add a new group
> > -# and change this value to match with that group. Add users that should have
> > -# control interface access to this group. If this variable is commented out or
> > -# not included in the configuration file, group will not be changed from the
> > -# value it got by default when the directory or socket was created.
> > -#
> > -# When configuring both the directory and group, use following format:
> > -# DIR=/var/run/wpa_supplicant GROUP=wheel
> > -# DIR=/var/run/wpa_supplicant GROUP=0
> > -# (group can be either group name or gid)
> > -#
> > -# For UDP connections (default on Windows): The value will be ignored. This
> > -# variable is just used to select that the control interface is to be created.
> > -# The value can be set to, e.g., udp (ctrl_interface=udp)
> > -#
> > -# For Windows Named Pipe: This value can be used to set the security descriptor
> > -# for controlling access to the control interface. Security descriptor can be
> > -# set using Security Descriptor String Format (see http://msdn.microsoft.com/
> > -# library/default.asp?url=/library/en-us/secauthz/security/
> > -# security_descriptor_string_format.asp). The descriptor string needs to be
> > -# prefixed with SDDL=. For example, ctrl_interface=SDDL=D: would set an empty
> > -# DACL (which will reject all connections). See README-Windows.txt for more
> > -# information about SDDL string format.
> > -#
> > +update_config=1
> > ctrl_interface=/var/run/wpa_supplicant
> > -
> > # IEEE 802.1X/EAPOL version
> > # wpa_supplicant is implemented based on IEEE Std 802.1X-2004 which defines
> > # EAPOL version 2. However, there are many APs that do not handle the new
> > @@ -82,14 +16,15 @@ ctrl_interface=/var/run/wpa_supplicant
> > # to 1 by default. This configuration value can be used to set it to the new
> > # version (2).
> > eapol_version=1
> > -
> > # AP scanning/selection
> > # By default, wpa_supplicant requests driver to perform AP scanning and then
> > # uses the scan results to select a suitable AP. Another alternative is to
> > # allow the driver to take care of AP scanning and selection and use
> > # wpa_supplicant just to process EAPOL frames based on IEEE 802.11 association
> > # information from the driver.
> > -# 1: wpa_supplicant initiates scanning and AP selection
> > +# 1: wpa_supplicant initiates scanning and AP selection; if no APs matching to
> > +# the currently enabled networks are found, a new network (IBSS or AP mode
> > +# operation) may be initialized (if configured) (default)
> > # 0: driver takes care of scanning, AP selection, and IEEE 802.11 association
> > # parameters (e.g., WPA IE generation); this mode can also be used with
> > # non-WPA drivers when using IEEE 802.1X mode; do not try to associate with
> > @@ -102,589 +37,28 @@ eapol_version=1
> > # the driver reports successful association; each network block should have
> > # explicit security policy (i.e., only one option in the lists) for
> > # key_mgmt, pairwise, group, proto variables
> > +# When using IBSS or AP mode, ap_scan=2 mode can force the new network to be
> > +# created immediately regardless of scan results. ap_scan=1 mode will first try
> > +# to scan for existing networks and only if no matches with the enabled
> > +# networks are found, a new IBSS or AP mode network is created.
> > ap_scan=1
> > -
> > # EAP fast re-authentication
> > # By default, fast re-authentication is enabled for all EAP methods that
> > # support it. This variable can be used to disable fast re-authentication.
> > # Normally, there is no need to disable this.
> > fast_reauth=1
> > -
> > -# OpenSSL Engine support
> > -# These options can be used to load OpenSSL engines.
> > -# The two engines that are supported currently are shown below:
> > -# They are both from the opensc project (http://www.opensc.org/)
> > -# By default no engines are loaded.
> > -# make the opensc engine available
> > -#opensc_engine_path=/usr/lib/opensc/engine_opensc.so
> > -# make the pkcs11 engine available
> > -#pkcs11_engine_path=/usr/lib/opensc/engine_pkcs11.so
> > -# configure the path to the pkcs11 module required by the pkcs11 engine
> > -#pkcs11_module_path=/usr/lib/pkcs11/opensc-pkcs11.so
> > -
> > -# Dynamic EAP methods
> > -# If EAP methods were built dynamically as shared object files, they need to be
> > -# loaded here before being used in the network blocks. By default, EAP methods
> > -# are included statically in the build, so these lines are not needed
> > -#load_dynamic_eap=/usr/lib/wpa_supplicant/eap_tls.so
> > -#load_dynamic_eap=/usr/lib/wpa_supplicant/eap_md5.so
> > -
> > -# Driver interface parameters
> > -# This field can be used to configure arbitrary driver interace parameters. The
> > -# format is specific to the selected driver interface. This field is not used
> > -# in most cases.
> > -#driver_param="field=value"
> > -
> > -# Maximum lifetime for PMKSA in seconds; default 43200
> > -#dot11RSNAConfigPMKLifetime=43200
> > -# Threshold for reauthentication (percentage of PMK lifetime); default 70
> > -#dot11RSNAConfigPMKReauthThreshold=70
> > -# Timeout for security association negotiation in seconds; default 60
> > -#dot11RSNAConfigSATimeout=60
> > -
> > -# network block
> > -#
> > -# Each network (usually AP's sharing the same SSID) is configured as a separate
> > -# block in this configuration file. The network blocks are in preference order
> > -# (the first match is used).
> > -#
> > -# network block fields:
> > -#
> > -# disabled:
> > -# 0 = this network can be used (default)
> > -# 1 = this network block is disabled (can be enabled through ctrl_iface,
> > -# e.g., with wpa_cli or wpa_gui)
> > -#
> > -# id_str: Network identifier string for external scripts. This value is passed
> > -# to external action script through wpa_cli as WPA_ID_STR environment
> > -# variable to make it easier to do network specific configuration.
> > -#
> > -# ssid: SSID (mandatory); either as an ASCII string with double quotation or
> > -# as hex string; network name
> > -#
> > -# scan_ssid:
> > -# 0 = do not scan this SSID with specific Probe Request frames (default)
> > -# 1 = scan with SSID-specific Probe Request frames (this can be used to
> > -# find APs that do not accept broadcast SSID or use multiple SSIDs;
> > -# this will add latency to scanning, so enable this only when needed)
> > -#
> > -# bssid: BSSID (optional); if set, this network block is used only when
> > -# associating with the AP using the configured BSSID
> > -#
> > -# priority: priority group (integer)
> > -# By default, all networks will get same priority group (0). If some of the
> > -# networks are more desirable, this field can be used to change the order in
> > -# which wpa_supplicant goes through the networks when selecting a BSS. The
> > -# priority groups will be iterated in decreasing priority (i.e., the larger the
> > -# priority value, the sooner the network is matched against the scan results).
> > -# Within each priority group, networks will be selected based on security
> > -# policy, signal strength, etc.
> > -# Please note that AP scanning with scan_ssid=1 and ap_scan=2 mode are not
> > -# using this priority to select the order for scanning. Instead, they try the
> > -# networks in the order that used in the configuration file.
> > -#
> > -# mode: IEEE 802.11 operation mode
> > -# 0 = infrastructure (Managed) mode, i.e., associate with an AP (default)
> > -# 1 = IBSS (ad-hoc, peer-to-peer)
> > -# Note: IBSS can only be used with key_mgmt NONE (plaintext and static WEP)
> > -# and key_mgmt=WPA-NONE (fixed group key TKIP/CCMP). In addition, ap_scan has
> > -# to be set to 2 for IBSS. WPA-None requires following network block options:
> > -# proto=WPA, key_mgmt=WPA-NONE, pairwise=NONE, group=TKIP (or CCMP, but not
> > -# both), and psk must also be set.
> > -#
> > -# proto: list of accepted protocols
> > -# WPA = WPA/IEEE 802.11i/D3.0
> > -# RSN = WPA2/IEEE 802.11i (also WPA2 can be used as an alias for RSN)
> > -# If not set, this defaults to: WPA RSN
> > -#
> > -# key_mgmt: list of accepted authenticated key management protocols
> > -# WPA-PSK = WPA pre-shared key (this requires 'psk' field)
> > -# WPA-EAP = WPA using EAP authentication (this can use an external
> > -# program, e.g., Xsupplicant, for IEEE 802.1X EAP Authentication
> > -# IEEE8021X = IEEE 802.1X using EAP authentication and (optionally) dynamically
> > -# generated WEP keys
> > -# NONE = WPA is not used; plaintext or static WEP could be used
> > -# If not set, this defaults to: WPA-PSK WPA-EAP
> > -#
> > -# auth_alg: list of allowed IEEE 802.11 authentication algorithms
> > -# OPEN = Open System authentication (required for WPA/WPA2)
> > -# SHARED = Shared Key authentication (requires static WEP keys)
> > -# LEAP = LEAP/Network EAP (only used with LEAP)
> > -# If not set, automatic selection is used (Open System with LEAP enabled if
> > -# LEAP is allowed as one of the EAP methods).
> > -#
> > -# pairwise: list of accepted pairwise (unicast) ciphers for WPA
> > -# CCMP = AES in Counter mode with CBC-MAC [RFC 3610, IEEE 802.11i/D7.0]
> > -# TKIP = Temporal Key Integrity Protocol [IEEE 802.11i/D7.0]
> > -# NONE = Use only Group Keys (deprecated, should not be included if APs support
> > -# pairwise keys)
> > -# If not set, this defaults to: CCMP TKIP
> > -#
> > -# group: list of accepted group (broadcast/multicast) ciphers for WPA
> > -# CCMP = AES in Counter mode with CBC-MAC [RFC 3610, IEEE 802.11i/D7.0]
> > -# TKIP = Temporal Key Integrity Protocol [IEEE 802.11i/D7.0]
> > -# WEP104 = WEP (Wired Equivalent Privacy) with 104-bit key
> > -# WEP40 = WEP (Wired Equivalent Privacy) with 40-bit key [IEEE 802.11]
> > -# If not set, this defaults to: CCMP TKIP WEP104 WEP40
> > -#
> > -# psk: WPA preshared key; 256-bit pre-shared key
> > -# The key used in WPA-PSK mode can be entered either as 64 hex-digits, i.e.,
> > -# 32 bytes or as an ASCII passphrase (in which case, the real PSK will be
> > -# generated using the passphrase and SSID). ASCII passphrase must be between
> > -# 8 and 63 characters (inclusive).
> > -# This field is not needed, if WPA-EAP is used.
> > -# Note: Separate tool, wpa_passphrase, can be used to generate 256-bit keys
> > -# from ASCII passphrase. This process uses lot of CPU and wpa_supplicant
> > -# startup and reconfiguration time can be optimized by generating the PSK only
> > -# only when the passphrase or SSID has actually changed.
> > -#
> > -# eapol_flags: IEEE 802.1X/EAPOL options (bit field)
> > -# Dynamic WEP key required for non-WPA mode
> > -# bit0 (1): require dynamically generated unicast WEP key
> > -# bit1 (2): require dynamically generated broadcast WEP key
> > -# (3 = require both keys; default)
> > -# Note: When using wired authentication, eapol_flags must be set to 0 for the
> > -# authentication to be completed successfully.
> > -#
> > -# proactive_key_caching:
> > -# Enable/disable opportunistic PMKSA caching for WPA2.
> > -# 0 = disabled (default)
> > -# 1 = enabled
> > -#
> > -# wep_key0..3: Static WEP key (ASCII in double quotation, e.g. "abcde" or
> > -# hex without quotation, e.g., 0102030405)
> > -# wep_tx_keyidx: Default WEP key index (TX) (0..3)
> > -#
> > -# peerkey: Whether PeerKey negotiation for direct links (IEEE 802.11e DLS) is
> > -# allowed. This is only used with RSN/WPA2.
> > -# 0 = disabled (default)
> > -# 1 = enabled
> > -#peerkey=1
> > -#
> > -# Following fields are only used with internal EAP implementation.
> > -# eap: space-separated list of accepted EAP methods
> > -# MD5 = EAP-MD5 (unsecure and does not generate keying material ->
> > -# cannot be used with WPA; to be used as a Phase 2 method
> > -# with EAP-PEAP or EAP-TTLS)
> > -# MSCHAPV2 = EAP-MSCHAPv2 (cannot be used separately with WPA; to be used
> > -# as a Phase 2 method with EAP-PEAP or EAP-TTLS)
> > -# OTP = EAP-OTP (cannot be used separately with WPA; to be used
> > -# as a Phase 2 method with EAP-PEAP or EAP-TTLS)
> > -# GTC = EAP-GTC (cannot be used separately with WPA; to be used
> > -# as a Phase 2 method with EAP-PEAP or EAP-TTLS)
> > -# TLS = EAP-TLS (client and server certificate)
> > -# PEAP = EAP-PEAP (with tunnelled EAP authentication)
> > -# TTLS = EAP-TTLS (with tunnelled EAP or PAP/CHAP/MSCHAP/MSCHAPV2
> > -# authentication)
> > -# If not set, all compiled in methods are allowed.
> > -#
> > -# identity: Identity string for EAP
> > -# anonymous_identity: Anonymous identity string for EAP (to be used as the
> > -# unencrypted identity with EAP types that support different tunnelled
> > -# identity, e.g., EAP-TTLS)
> > -# password: Password string for EAP
> > -# ca_cert: File path to CA certificate file (PEM/DER). This file can have one
> > -# or more trusted CA certificates. If ca_cert and ca_path are not
> > -# included, server certificate will not be verified. This is insecure and
> > -# a trusted CA certificate should always be configured when using
> > -# EAP-TLS/TTLS/PEAP. Full path should be used since working directory may
> > -# change when wpa_supplicant is run in the background.
> > -# On Windows, trusted CA certificates can be loaded from the system
> > -# certificate store by setting this to cert_store://<name>, e.g.,
> > -# ca_cert="cert_store://CA" or ca_cert="cert_store://ROOT".
> > -# Note that when running wpa_supplicant as an application, the user
> > -# certificate store (My user account) is used, whereas computer store
> > -# (Computer account) is used when running wpasvc as a service.
> > -# ca_path: Directory path for CA certificate files (PEM). This path may
> > -# contain multiple CA certificates in OpenSSL format. Common use for this
> > -# is to point to system trusted CA list which is often installed into
> > -# directory like /etc/ssl/certs. If configured, these certificates are
> > -# added to the list of trusted CAs. ca_cert may also be included in that
> > -# case, but it is not required.
> > -# client_cert: File path to client certificate file (PEM/DER)
> > -# Full path should be used since working directory may change when
> > -# wpa_supplicant is run in the background.
> > -# Alternatively, a named configuration blob can be used by setting this
> > -# to blob://<blob name>.
> > -# private_key: File path to client private key file (PEM/DER/PFX)
> > -# When PKCS#12/PFX file (.p12/.pfx) is used, client_cert should be
> > -# commented out. Both the private key and certificate will be read from
> > -# the PKCS#12 file in this case. Full path should be used since working
> > -# directory may change when wpa_supplicant is run in the background.
> > -# Windows certificate store can be used by leaving client_cert out and
> > -# configuring private_key in one of the following formats:
> > -# cert://substring_to_match
> > -# hash://certificate_thumbprint_in_hex
> > -# for example: private_key="hash://63093aa9c47f56ae88334c7b65a4"
> > -# Note that when running wpa_supplicant as an application, the user
> > -# certificate store (My user account) is used, whereas computer store
> > -# (Computer account) is used when running wpasvc as a service.
> > -# Alternatively, a named configuration blob can be used by setting this
> > -# to blob://<blob name>.
> > -# private_key_passwd: Password for private key file (if left out, this will be
> > -# asked through control interface)
> > -# dh_file: File path to DH/DSA parameters file (in PEM format)
> > -# This is an optional configuration file for setting parameters for an
> > -# ephemeral DH key exchange. In most cases, the default RSA
> > -# authentication does not use this configuration. However, it is possible
> > -# setup RSA to use ephemeral DH key exchange. In addition, ciphers with
> > -# DSA keys always use ephemeral DH keys. This can be used to achieve
> > -# forward secrecy. If the file is in DSA parameters format, it will be
> > -# automatically converted into DH params.
> > -# subject_match: Substring to be matched against the subject of the
> > -# authentication server certificate. If this string is set, the server
> > -# sertificate is only accepted if it contains this string in the subject.
> > -# The subject string is in following format:
> > -# /C=US/ST=CA/L=San Francisco/CN=Test AS/emailAddress=as@example.com
> > -# altsubject_match: Semicolon separated string of entries to be matched against
> > -# the alternative subject name of the authentication server certificate.
> > -# If this string is set, the server sertificate is only accepted if it
> > -# contains one of the entries in an alternative subject name extension.
> > -# altSubjectName string is in following format: TYPE:VALUE
> > -# Example: EMAIL:server@example.com
> > -# Example: DNS:server.example.com;DNS:server2.example.com
> > -# Following types are supported: EMAIL, DNS, URI
> > -# phase1: Phase1 (outer authentication, i.e., TLS tunnel) parameters
> > -# (string with field-value pairs, e.g., "peapver=0" or
> > -# "peapver=1 peaplabel=1")
> > -# 'peapver' can be used to force which PEAP version (0 or 1) is used.
> > -# 'peaplabel=1' can be used to force new label, "client PEAP encryption",
> > -# to be used during key derivation when PEAPv1 or newer. Most existing
> > -# PEAPv1 implementation seem to be using the old label, "client EAP
> > -# encryption", and wpa_supplicant is now using that as the default value.
> > -# Some servers, e.g., Radiator, may require peaplabel=1 configuration to
> > -# interoperate with PEAPv1; see eap_testing.txt for more details.
> > -# 'peap_outer_success=0' can be used to terminate PEAP authentication on
> > -# tunneled EAP-Success. This is required with some RADIUS servers that
> > -# implement draft-josefsson-pppext-eap-tls-eap-05.txt (e.g.,
> > -# Lucent NavisRadius v4.4.0 with PEAP in "IETF Draft 5" mode)
> > -# include_tls_length=1 can be used to force wpa_supplicant to include
> > -# TLS Message Length field in all TLS messages even if they are not
> > -# fragmented.
> > -# sim_min_num_chal=3 can be used to configure EAP-SIM to require three
> > -# challenges (by default, it accepts 2 or 3)
> > -# phase2: Phase2 (inner authentication with TLS tunnel) parameters
> > -# (string with field-value pairs, e.g., "auth=MSCHAPV2" for EAP-PEAP or
> > -# "autheap=MSCHAPV2 autheap=MD5" for EAP-TTLS)
> > -# Following certificate/private key fields are used in inner Phase2
> > -# authentication when using EAP-TTLS or EAP-PEAP.
> > -# ca_cert2: File path to CA certificate file. This file can have one or more
> > -# trusted CA certificates. If ca_cert2 and ca_path2 are not included,
> > -# server certificate will not be verified. This is insecure and a trusted
> > -# CA certificate should always be configured.
> > -# ca_path2: Directory path for CA certificate files (PEM)
> > -# client_cert2: File path to client certificate file
> > -# private_key2: File path to client private key file
> > -# private_key2_passwd: Password for private key file
> > -# dh_file2: File path to DH/DSA parameters file (in PEM format)
> > -# subject_match2: Substring to be matched against the subject of the
> > -# authentication server certificate.
> > -# altsubject_match2: Substring to be matched against the alternative subject
> > -# name of the authentication server certificate.
> > -#
> > -# fragment_size: Maximum EAP fragment size in bytes (default 1398).
> > -# This value limits the fragment size for EAP methods that support
> > -# fragmentation (e.g., EAP-TLS and EAP-PEAP). This value should be set
> > -# small enough to make the EAP messages fit in MTU of the network
> > -# interface used for EAPOL. The default value is suitable for most
> > -# cases.
> > -#
> > -# EAP-PSK variables:
> > -# eappsk: 16-byte (128-bit, 32 hex digits) pre-shared key in hex format
> > -# nai: user NAI
> > -#
> > -# EAP-PAX variables:
> > -# eappsk: 16-byte (128-bit, 32 hex digits) pre-shared key in hex format
> > -#
> > -# EAP-SAKE variables:
> > -# eappsk: 32-byte (256-bit, 64 hex digits) pre-shared key in hex format
> > -# (this is concatenation of Root-Secret-A and Root-Secret-B)
> > -# nai: user NAI (PEERID)
> > -#
> > -# EAP-GPSK variables:
> > -# eappsk: Pre-shared key in hex format (at least 128 bits, i.e., 32 hex digits)
> > -# nai: user NAI (ID_Client)
> > -#
> > -# EAP-FAST variables:
> > -# pac_file: File path for the PAC entries. wpa_supplicant will need to be able
> > -# to create this file and write updates to it when PAC is being
> > -# provisioned or refreshed. Full path to the file should be used since
> > -# working directory may change when wpa_supplicant is run in the
> > -# background. Alternatively, a named configuration blob can be used by
> > -# setting this to blob://<blob name>
> > -# phase1: fast_provisioning=1 option enables in-line provisioning of EAP-FAST
> > -# credentials (PAC)
> > -#
> > -# wpa_supplicant supports number of "EAP workarounds" to work around
> > -# interoperability issues with incorrectly behaving authentication servers.
> > -# These are enabled by default because some of the issues are present in large
> > -# number of authentication servers. Strict EAP conformance mode can be
> > -# configured by disabling workarounds with eap_workaround=0.
> > -
> > -# Example blocks:
> > -
> > -# Simple case: WPA-PSK, PSK as an ASCII passphrase, allow all valid ciphers
> > -network={
> > - ssid="simple"
> > - psk="very secret passphrase"
> > - priority=5
> > -}
> > -
> > -# Same as previous, but request SSID-specific scanning (for APs that reject
> > -# broadcast SSID)
> > -network={
> > - ssid="second ssid"
> > - scan_ssid=1
> > - psk="very secret passphrase"
> > - priority=2
> > -}
> > -
> > -# Only WPA-PSK is used. Any valid cipher combination is accepted.
> > -network={
> > - ssid="example"
> > - proto=WPA
> > - key_mgmt=WPA-PSK
> > - pairwise=CCMP TKIP
> > - group=CCMP TKIP WEP104 WEP40
> > - psk=06b4be19da289f475aa46a33cb793029d4ab3db7a23ee92382eb0106c72ac7bb
> > - priority=2
> > -}
> > -
> > -# Only WPA-EAP is used. Both CCMP and TKIP is accepted. An AP that used WEP104
> > -# or WEP40 as the group cipher will not be accepted.
> > -network={
> > - ssid="example"
> > - proto=RSN
> > - key_mgmt=WPA-EAP
> > - pairwise=CCMP TKIP
> > - group=CCMP TKIP
> > - eap=TLS
> > - identity="user@example.com"
> > - ca_cert="/etc/cert/ca.pem"
> > - client_cert="/etc/cert/user.pem"
> > - private_key="/etc/cert/user.prv"
> > - private_key_passwd="password"
> > - priority=1
> > -}
> > -
> > -# EAP-PEAP/MSCHAPv2 configuration for RADIUS servers that use the new peaplabel
> > -# (e.g., Radiator)
> > -network={
> > - ssid="example"
> > - key_mgmt=WPA-EAP
> > - eap=PEAP
> > - identity="user@example.com"
> > - password="foobar"
> > - ca_cert="/etc/cert/ca.pem"
> > - phase1="peaplabel=1"
> > - phase2="auth=MSCHAPV2"
> > - priority=10
> > -}
> > -
> > -# EAP-TTLS/EAP-MD5-Challenge configuration with anonymous identity for the
> > -# unencrypted use. Real identity is sent only within an encrypted TLS tunnel.
> > -network={
> > - ssid="example"
> > - key_mgmt=WPA-EAP
> > - eap=TTLS
> > - identity="user@example.com"
> > - anonymous_identity="anonymous@example.com"
> > - password="foobar"
> > - ca_cert="/etc/cert/ca.pem"
> > - priority=2
> > -}
> > -
> > -# EAP-TTLS/MSCHAPv2 configuration with anonymous identity for the unencrypted
> > -# use. Real identity is sent only within an encrypted TLS tunnel.
> > -network={
> > - ssid="example"
> > - key_mgmt=WPA-EAP
> > - eap=TTLS
> > - identity="user@example.com"
> > - anonymous_identity="anonymous@example.com"
> > - password="foobar"
> > - ca_cert="/etc/cert/ca.pem"
> > - phase2="auth=MSCHAPV2"
> > -}
> > -
> > -# WPA-EAP, EAP-TTLS with different CA certificate used for outer and inner
> > -# authentication.
> > -network={
> > - ssid="example"
> > - key_mgmt=WPA-EAP
> > - eap=TTLS
> > - # Phase1 / outer authentication
> > - anonymous_identity="anonymous@example.com"
> > - ca_cert="/etc/cert/ca.pem"
> > - # Phase 2 / inner authentication
> > - phase2="autheap=TLS"
> > - ca_cert2="/etc/cert/ca2.pem"
> > - client_cert2="/etc/cer/user.pem"
> > - private_key2="/etc/cer/user.prv"
> > - private_key2_passwd="password"
> > - priority=2
> > -}
> > -
> > -# Both WPA-PSK and WPA-EAP is accepted. Only CCMP is accepted as pairwise and
> > -# group cipher.
> > -network={
> > - ssid="example"
> > - bssid=00:11:22:33:44:55
> > - proto=WPA RSN
> > - key_mgmt=WPA-PSK WPA-EAP
> > - pairwise=CCMP
> > - group=CCMP
> > - psk=06b4be19da289f475aa46a33cb793029d4ab3db7a23ee92382eb0106c72ac7bb
> > -}
> > -
> > -# Special characters in SSID, so use hex string. Default to WPA-PSK, WPA-EAP
> > -# and all valid ciphers.
> > -network={
> > - ssid=00010203
> > - psk=000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f
> > -}
> > -
> > -
> > -# IEEE 802.1X/EAPOL with dynamically generated WEP keys (i.e., no WPA) using
> > -# EAP-TLS for authentication and key generation; require both unicast and
> > -# broadcast WEP keys.
> > -network={
> > - ssid="1x-test"
> > - key_mgmt=IEEE8021X
> > - eap=TLS
> > - identity="user@example.com"
> > - ca_cert="/etc/cert/ca.pem"
> > - client_cert="/etc/cert/user.pem"
> > - private_key="/etc/cert/user.prv"
> > - private_key_passwd="password"
> > - eapol_flags=3
> > -}
> > -
> > -
> > -# LEAP with dynamic WEP keys
> > -network={
> > - ssid="leap-example"
> > - key_mgmt=IEEE8021X
> > - eap=LEAP
> > - identity="user"
> > - password="foobar"
> > -}
> > -
> > -# Plaintext connection (no WPA, no IEEE 802.1X)
> > -network={
> > - ssid="plaintext-test"
> > - key_mgmt=NONE
> > -}
> > -
> > -
> > -# Shared WEP key connection (no WPA, no IEEE 802.1X)
> > -network={
> > - ssid="static-wep-test"
> > - key_mgmt=NONE
> > - wep_key0="abcde"
> > - wep_key1=0102030405
> > - wep_key2="1234567890123"
> > - wep_tx_keyidx=0
> > - priority=5
> > -}
> > -
> > -
> > -# Shared WEP key connection (no WPA, no IEEE 802.1X) using Shared Key
> > -# IEEE 802.11 authentication
> > -network={
> > - ssid="static-wep-test2"
> > - key_mgmt=NONE
> > - wep_key0="abcde"
> > - wep_key1=0102030405
> > - wep_key2="1234567890123"
> > - wep_tx_keyidx=0
> > - priority=5
> > - auth_alg=SHARED
> > -}
> > -
> > -
> > -# IBSS/ad-hoc network with WPA-None/TKIP.
> > -network={
> > - ssid="test adhoc"
> > - mode=1
> > - proto=WPA
> > - key_mgmt=WPA-NONE
> > - pairwise=NONE
> > - group=TKIP
> > - psk="secret passphrase"
> > -}
> > -
> > -
> > -# Catch all example that allows more or less all configuration modes
> > -network={
> > - ssid="example"
> > - scan_ssid=1
> > - key_mgmt=WPA-EAP WPA-PSK IEEE8021X NONE
> > - pairwise=CCMP TKIP
> > - group=CCMP TKIP WEP104 WEP40
> > - psk="very secret passphrase"
> > - eap=TTLS PEAP TLS
> > - identity="user@example.com"
> > - password="foobar"
> > - ca_cert="/etc/cert/ca.pem"
> > - client_cert="/etc/cert/user.pem"
> > - private_key="/etc/cert/user.prv"
> > - private_key_passwd="password"
> > - phase1="peaplabel=0"
> > -}
> > -
> > -# Example of EAP-TLS with smartcard (openssl engine)
> > -network={
> > - ssid="example"
> > - key_mgmt=WPA-EAP
> > - eap=TLS
> > - proto=RSN
> > - pairwise=CCMP TKIP
> > - group=CCMP TKIP
> > - identity="user@example.com"
> > - ca_cert="/etc/cert/ca.pem"
> > - client_cert="/etc/cert/user.pem"
> > -
> > - engine=1
> > -
> > - # The engine configured here must be available. Look at
> > - # OpenSSL engine support in the global section.
> > - # The key available through the engine must be the private key
> > - # matching the client certificate configured above.
> > -
> > - # use the opensc engine
> > - #engine_id="opensc"
> > - #key_id="45"
> > -
> > - # use the pkcs11 engine
> > - engine_id="pkcs11"
> > - key_id="id_45"
> > -
> > - # Optional PIN configuration; this can be left out and PIN will be
> > - # asked through the control interface
> > - pin="1234"
> > -}
> > -
> > -# Example configuration showing how to use an inlined blob as a CA certificate
> > -# data instead of using external file
> > -network={
> > - ssid="example"
> > - key_mgmt=WPA-EAP
> > - eap=TTLS
> > - identity="user@example.com"
> > - anonymous_identity="anonymous@example.com"
> > - password="foobar"
> > - ca_cert="blob://exampleblob"
> > - priority=20
> > -}
> > -
> > -blob-base64-exampleblob={
> > -SGVsbG8gV29ybGQhCg==
> > -}
> > -
> > -
> > -# Wildcard match for SSID (plaintext APs only). This example select any
> > -# open AP regardless of its SSID.
> > -network={
> > - key_mgmt=NONE
> > -}
> > +device_name=Blaze
> > +manufacturer=TI
> > +model_name=Wilink
> > +model_number=wl18xx
> > +serial_number=12345
> > +driver_param=use_multi_chan_concurrent=1 use_p2p_group_interface=1
> > +# Timeout in seconds to detect STA inactivity (default: 300 seconds)
> > +#
> > +# This timeout value is used in P2P GO mode to clean up
> > +# inactive stations.
> > +p2p_go_max_inactivity=60
> > +p2p_go_ht40=1
> > +p2p_multi_chan=1
> > +disassoc_low_ack=1
> > +concurrent_sched_scan=1
> > --
> > 1.7.9
> >
> > _______________________________________________
> > meta-arago mailing list
> > meta-arago@arago-project.org
> > http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH 1/8] wpa-supplicant-wl18xx: Update recipe to ol_r8.a8.08 version.
2013-12-08 8:18 [PATCH 1/8] wpa-supplicant-wl18xx: Update recipe to ol_r8.a8.08 version Yaniv Mahani
` (7 preceding siblings ...)
2013-12-09 5:46 ` [PATCH 1/8] wpa-supplicant-wl18xx: Update recipe to ol_r8.a8.08 version Denys Dmytriyenko
@ 2014-01-14 13:28 ` Cooper Jr., Franklin
8 siblings, 0 replies; 18+ messages in thread
From: Cooper Jr., Franklin @ 2014-01-14 13:28 UTC (permalink / raw)
To: Machani, Yaniv, meta-arago@arago-project.org
Acked-by: Franklin Cooper Jr. <fcooper@ti.com>
> -----Original Message-----
> From: meta-arago-bounces@arago-project.org [mailto:meta-arago-
> bounces@arago-project.org] On Behalf Of Machani, Yaniv
> Sent: Sunday, December 08, 2013 2:18 AM
> To: meta-arago@arago-project.org
> Subject: [meta-arago] [PATCH 1/8] wpa-supplicant-wl18xx: Update recipe to
> ol_r8.a8.08 version.
>
> From: Yaniv Machani <yanivma@ti.com>
>
> - Build wpa-supplicant from TI_Openlink ol_r8.a8.08
> - Add missing includes for building with libnl3.
> - Adjusted configuration files, and added p2p conf.
>
> Signed-off-by: Yaniv Machani <yanivma@ti.com>
> ---
> This set of patches should allow integration of WiLink-8 into meta-arago.
> It should replace the set of 14 patches previously submitted for review.
>
>
> Note :
> Wilink-6 is currently not supported with the latest meta-arago builds.
> ECS have decided not to support Wilink-6 in the core SDK also in the future.
> Therefore any Wilink-6 broken recipes should not be a concern, as we will clean
> them up on a different set of patches.
>
> wifi-direct-demo, battleship, wpa-gui-e applications will shortly be removed as
> well.
>
> Yaniv
>
> .../wpa-supplicant/wpa-supplicant-wl18xx/defconfig | 164 ++++--
> ....a6.01.bb => wpa-supplicant-wl18xx_r8.a8.08.bb} | 6 +-
> .../wpa-supplicant/wpa-supplicant.inc | 3 +
> .../wpa-supplicant/p2p_supplicant.conf | 14 +
> .../wpa-supplicant/wpa_supplicant.conf | 674 +-------------------
> 5 files changed, 164 insertions(+), 697 deletions(-) rename meta-arago-
> extras/recipes-connectivity/wpa-supplicant/{wpa-supplicant-
> wl18xx_r8.a6.01.bb => wpa-supplicant-wl18xx_r8.a8.08.bb} (88%) create
> mode 100755 meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-
> supplicant/p2p_supplicant.conf
>
> diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-
> supplicant-wl18xx/defconfig b/meta-arago-extras/recipes-connectivity/wpa-
> supplicant/wpa-supplicant-wl18xx/defconfig
> index b982e2a..f357b79 100755
> --- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-
> wl18xx/defconfig
> +++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplica
> +++ nt-wl18xx/defconfig
> @@ -39,18 +39,6 @@
> #LIBS = -lssl
>
> #############################################################
> ##################
>
> -#CC=$(CROSS_COMPILE)gcc
> -#CFLAGS += -DCONFIG_LIBNL20
> -#CPPFLAGS += -DCONFIG_LIBNL20
> -#LIBS += -L$(NFSROOT)/lib -lnl
> -#LIBS_p += -L$(NFSROOT)/lib
> -#LIBDIR = $(NFSROOT)/lib
> -#BINDIR = $(NFSROOT)/usr/sbin
> -
> -CONFIG_WAPI=y
> -CONFIG_LIBNL20=y
> -NEED_BGSCAN=y
> -CONFIG_BGSCAN_LEARN=y
>
> # Driver interface for Host AP driver
> #CONFIG_DRIVER_HOSTAP=y
> @@ -75,7 +63,7 @@ CONFIG_BGSCAN_LEARN=y
> #CONFIG_DRIVER_ATMEL=y
>
> # Driver interface for old Broadcom driver -# Please note that the newer
> Broadcom driver ("hybrid Linux driver") supportsBG
> +# Please note that the newer Broadcom driver ("hybrid Linux driver")
> +supports
> # Linux wireless extensions and does not need (or even work) with the old #
> driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver.
> #CONFIG_DRIVER_BROADCOM=y
> @@ -90,16 +78,22 @@ CONFIG_BGSCAN_LEARN=y
> #CONFIG_DRIVER_RALINK=y
>
> # Driver interface for generic Linux wireless extensions -
> CONFIG_DRIVER_WEXT=y
> +# Note: WEXT is deprecated in the current Linux kernel version and no
> +new # functionality is added to it. nl80211-based interface is the new
> +# replacement for WEXT and its use allows wpa_supplicant to properly
> +control # the driver to improve existing functionality like roaming and
> +to support new # functionality.
> +#CONFIG_DRIVER_WEXT=y
>
> # Driver interface for Linux drivers using the nl80211 kernel interface
> CONFIG_DRIVER_NL80211=y
> +CONFIG_LIBNL32=y
>
> # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
> #CONFIG_DRIVER_BSD=y #CFLAGS += -I/usr/local/include #LIBS += -
> L/usr/local/lib -#LIBS_p += -L/usr/local/libBG
> +#LIBS_p += -L/usr/local/lib
> #LIBS_c += -L/usr/local/lib
>
> # Driver interface for Windows NDIS
> @@ -121,13 +115,8 @@ CONFIG_DRIVER_NL80211=y # Driver interface for
> development testing #CONFIG_DRIVER_TEST=y
>
> -# Include client MLME (management frame processing) for test driver -# This
> can be used to test MLME operations in hostapd with the test interface.
> -# space.
> -#CONFIG_CLIENT_MLME=y
> -
> # Driver interface for wired Ethernet drivers -CONFIG_DRIVER_WIRED=y
> +#CONFIG_DRIVER_WIRED=y
>
> # Driver interface for the Broadcom RoboSwitch family
> #CONFIG_DRIVER_ROBOSWITCH=y @@ -163,7 +152,7 @@
> CONFIG_EAP_TTLS=y # functionality needed for EAP-FAST. If EAP-FAST is
> enabled with OpenSSL, # the OpenSSL library must be patched (openssl-0.9.8d-
> tls-extensions.patch)
> # to add the needed functions.
> -#CONFIG_EAP_FAST=y
> +CONFIG_EAP_FAST=y
>
> # EAP-GTC
> CONFIG_EAP_GTC=y
> @@ -172,11 +161,14 @@ CONFIG_EAP_GTC=y
> CONFIG_EAP_OTP=y
>
> # EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used) -#CONFIG_EAP_SIM=y
> +CONFIG_EAP_SIM=y
>
> # EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
> #CONFIG_EAP_PSK=y
>
> +# EAP-pwd (secure authentication using only a password)
> +CONFIG_EAP_PWD=y
> +
> # EAP-PAX
> #CONFIG_EAP_PAX=y
>
> @@ -208,6 +200,11 @@ CONFIG_EAP_LEAP=y
> CONFIG_WPS=y
> # Enable WSC 2.0 support
> CONFIG_WPS2=y
> +# Enable WPS external registrar functionality #CONFIG_WPS_ER=y #
> +Disable credentials for an open network by default when acting as a WPS
> +# registrar.
> +#CONFIG_WPS_REG_DISABLE_OPEN=y
>
> # EAP-IKEv2
> #CONFIG_EAP_IKEV2=y
> @@ -224,7 +221,10 @@ CONFIG_SMARTCARD=y
> # Enable this if EAP-SIM or EAP-AKA is included #CONFIG_PCSC=y
>
> -# Development testingBG
> +# Support HT overrides (disable HT/HT40, mask MCS rates, etc.)
> +#CONFIG_HT_OVERRIDES=y
> +
> +# Development testing
> #CONFIG_EAPOL_TEST=y
>
> # Select control interface backend for external programs, e.g, wpa_cli:
> @@ -242,6 +242,10 @@ CONFIG_CTRL_IFACE=y # the resulting binary.
> #CONFIG_READLINE=y
>
> +# Include internal line edit mode in wpa_cli. This can be used as a
> +replacement # for GNU Readline to provide limited command line editing and
> history support.
> +CONFIG_WPA_CLI_EDIT=y
> +
> # Remove debugging code that is printing out debug message to stdout.
> # This can be used to reduce the size of the wpa_supplicant considerably # if
> debugging code is not needed. The size reduction can be around 35% @@ -
> 295,13 +299,16 @@ CONFIG_BACKEND=file # unix = UNIX/POSIX like systems
> (default) # win32 = Windows systems # none = Empty template -
> #CONFIG_OS=unix
> +CONFIG_OS=unix
>
> # Select event loop implementation
> # eloop = select() loop (default)
> # eloop_win = Windows events and WaitForMultipleObject() loop #
> eloop_none = Empty template -#CONFIG_ELOOP=eloop
> +CONFIG_ELOOP=eloop
> +
> +# Should we use poll instead of select? Select is used by default.
> +#CONFIG_ELOOP_POLL=y
>
> # Select layer 2 packet implementation
> # linux = Linux packet socket (default) @@ -310,7 +317,7 @@
> CONFIG_BACKEND=file # winpcap = WinPcap with receive thread # ndis =
> Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y) # none = Empty
> template -#CONFIG_L2_PACKET=linux
> +CONFIG_L2_PACKET=linux
>
> # PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
> CONFIG_PEERKEY=y @@ -323,18 +330,24 @@ CONFIG_PEERKEY=y
>
> # Select TLS implementation
> # openssl = OpenSSL (default)
> -# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
> +# gnutls = GnuTLS
> # internal = Internal TLSv1 implementation (experimental) # none = Empty
> template #CONFIG_TLS=openssl
>
> -# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
> -# You need CONFIG_TLS=gnutls for this to have any effect. Please note that -#
> even though the core GnuTLS library is released under LGPL, this extra -# library
> uses GPL and as such, the terms of GPL apply to the combination -# of
> wpa_supplicant and GnuTLS if this option is enabled. BSD license may not -#
> apply for distribution of the resulting binary.
> -#CONFIG_GNUTLS_EXTRA=y
> +# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS
> +(v1.1) # can be enabled to get a stronger construction of messages when
> +block ciphers # are used. It should be noted that some existing TLS
> +v1.0 -based # implementation may not be compatible with TLS v1.1
> +message (ClientHello is # sent prior to negotiating which version will
> +be used) #CONFIG_TLSV11=y
> +
> +# TLS-based EAP methods require at least TLS v1.0. Newer version of TLS
> +(v1.2) # can be enabled to enable use of stronger crypto algorithms. It
> +should be # noted that some existing TLS v1.0 -based implementation may
> +not be compatible # with TLS v1.2 message (ClientHello is sent prior to
> +negotiating which version # will be used) #CONFIG_TLSV12=y
>
> # If CONFIG_TLS=internal is used, additional library and include paths are #
> needed for LibTomMath. Alternatively, an integrated, minimal version of @@ -
> 360,14 +373,14 @@ CONFIG_PEERKEY=y
>
> # Add support for old DBus control interface #
> (fi.epitest.hostap.WPASupplicant) -CONFIG_CTRL_IFACE_DBUS=y
> +#CONFIG_CTRL_IFACE_DBUS=y
>
> # Add support for new DBus control interface #
> (fi.w1.hostap.wpa_supplicant1) -CONFIG_CTRL_IFACE_DBUS_NEW=y
> +#CONFIG_CTRL_IFACE_DBUS_NEW=y
>
> # Add introspection support for new DBus control interface -
> CONFIG_CTRL_IFACE_DBUS_INTRO=y
> +#CONFIG_CTRL_IFACE_DBUS_INTRO=y
>
> # Add support for loading EAP methods dynamically as shared libraries.
> # When this option is enabled, each EAP method can be either included @@ -
> 394,7 +407,22 @@ CONFIG_CTRL_IFACE_DBUS_INTRO=y
> #CONFIG_IEEE80211R=y
>
> # Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt) -
> CONFIG_DEBUG_FILE=y
> +#CONFIG_DEBUG_FILE=y
> +
> +# Send debug messages to syslog instead of stdout
> +#CONFIG_DEBUG_SYSLOG=y # Set syslog facility for debug messages
> +#CONFIG_DEBUG_SYSLOG_FACILITY=LOG_DAEMON
> +
> +# Add support for sending all debug messages (regardless of debug
> +verbosity) # to the Linux kernel tracing facility. This helps debug the
> +entire stack by # making it easy to record everything happening from
> +the driver up into the # same file, e.g., using trace-cmd.
> +#CONFIG_DEBUG_LINUX_TRACING=y
> +
> +# Add support for writing debug log to Android logcat instead of
> +standard # output CONFIG_ANDROID_LOG=y
>
> # Enable privilege separation (see README 'Privilege separation' for details)
> #CONFIG_PRIVSEP=y @@ -407,7 +435,7 @@ CONFIG_DEBUG_FILE=y # This
> tracks use of memory allocations and other registrations and reports # incorrect
> use with a backtrace of call (or allocation) location.
> #CONFIG_WPA_TRACE=y
> -# For BSD, comment out these.
> +# For BSD, uncomment these.
> #LIBS += -lexecinfo
> #LIBS_p += -lexecinfo
> #LIBS_c += -lexecinfo
> @@ -416,15 +444,63 @@ CONFIG_DEBUG_FILE=y # This enables use of libbfd
> to get more detailed symbols for the backtraces # generated by
> CONFIG_WPA_TRACE=y.
> #CONFIG_WPA_TRACE_BFD=y
> -# For BSD, comment out these.
> +# For BSD, uncomment these.
> #LIBS += -lbfd -liberty -lz
> #LIBS_p += -lbfd -liberty -lz
> #LIBS_c += -lbfd -liberty -lz
>
> -# for p2p
> +# wpa_supplicant depends on strong random number generation being
> +available # from the operating system. os_get_random() function is used
> +to fetch random # data when needed, e.g., for key generation. On Linux
> +and BSD systems, this # works by reading /dev/urandom. It should be
> +noted that the OS entropy pool # needs to be properly initialized
> +before wpa_supplicant is started. This is # important especially on
> +embedded devices that do not have a hardware random # number generator
> +and may by default start up with minimal entropy available # for random
> number generation.
> +#
> +# As a safety net, wpa_supplicant is by default trying to internally
> +collect # additional entropy for generating random data to mix in with
> +the data fetched # from the OS. This by itself is not considered to be
> +very strong, but it may # help in cases where the system pool is not
> +initialized properly. However, it # is very strongly recommended that
> +the system pool is initialized with enough # entropy either by using
> +hardware assisted random number generator or by # storing state over device
> reboots.
> +#
> +# wpa_supplicant can be configured to maintain its own entropy store
> +over # restarts to enhance random number generation. This is not
> +perfect, but it is # much more secure than using the same sequence of
> +random numbers after every # reboot. This can be enabled with
> +-e<entropy file> command line option. The # specified file needs to be readable
> and writable by wpa_supplicant.
> +#
> +# If the os_get_random() is known to provide strong random data (e.g.,
> +on # Linux/BSD, the board in question is known to have reliable source
> +of random # data from /dev/urandom), the internal wpa_supplicant random
> +pool can be # disabled. This will save some in binary size and CPU use.
> +However, this # should only be considered for builds that are known to
> +be used on devices # that meet the requirements described above.
> +#CONFIG_NO_RANDOM_POOL=y
> +
> +# IEEE 802.11n (High Throughput) support (mainly for AP mode)
> +CONFIG_IEEE80211N=y
> +
> +# Interworking (IEEE 802.11u)
> +# This can be used to enable functionality to improve interworking with
> +# external networks (GAS/ANQP to learn more about the networks and
> +network # selection based on available credentials).
> +CONFIG_INTERWORKING=y
> +
> +# Hotspot 2.0
> +CONFIG_HS20=y
> +
> +# Disable roaming in wpa_supplicant
> +#CONFIG_NO_ROAMING=y
> +
> +# Enable P2P
> CONFIG_P2P=y
> CONFIG_AP=y
>
> -# IEEE 802.11n (High Throughput) support -CONFIG_IEEE80211N=y
> +# bgscan
> +NEED_BGSCAN=y
> +CONFIG_BGSCAN_LEARN=y
> +CONFIG_BGSCAN_SIMPLE=y
>
> diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-
> supplicant-wl18xx_r8.a6.01.bb b/meta-arago-extras/recipes-connectivity/wpa-
> supplicant/wpa-supplicant-wl18xx_r8.a8.08.bb
> similarity index 88%
> rename from meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-
> supplicant-wl18xx_r8.a6.01.bb
> rename to meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-
> supplicant-wl18xx_r8.a8.08.bb
> index f6c4f70..ec7a0c7 100644
> --- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplicant-
> wl18xx_r8.a6.01.bb
> +++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplica
> +++ nt-wl18xx_r8.a8.08.bb
> @@ -10,9 +10,9 @@ LIC_FILES_CHKSUM =
> "file://../COPYING;md5=ab87f20cd7e8c0d0a6539b34d3791d0e \
>
> FILESEXTRAPATHS_append := "${THISDIR}/wpa-supplicant:"
>
> -# Tag: ol_r8.a6.01
> -SRCREV = "7190ff7dbd43243290b626068ded0d61c5019050"
> -PR = "r2+gitr${SRCPV}"
> +# Tag: ol_r8.a8.08
> +SRCREV = "257ab333aad993b4be81808524bc0d939c276058"
> +PR_append = "a+gitr${SRCPV}"
>
> # Add ti to the PV to indicate that this is a TI modify version of wpa-supplicant.
> PV = "2.0-devel-ti"
> diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-
> supplicant.inc b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-
> supplicant.inc
> index 2d8970f..9678b1b 100644
> --- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-
> supplicant.inc
> +++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplica
> +++ nt.inc
> @@ -21,6 +21,7 @@ SRC_URI = "git://github.com/TI-
> OpenLink/hostap.git;protocol=git \
> file://defaults-sane \
> file://wpa-supplicant.sh \
> file://wpa_supplicant.conf \
> + file://p2p_supplicant.conf \
> file://wpa_supplicant.conf-sane \
> file://99_wpa_supplicant \
> file://wpa_supplicant.conf \ @@ -55,6 +56,7 @@ do_install () {
> install -d ${D}${sysconfdir}/default
> install -m 600 ${WORKDIR}/defaults-sane
> ${D}${sysconfdir}/default/wpa
> install -m 600 ${WORKDIR}/wpa_supplicant.conf-sane
> ${D}${sysconfdir}/wpa_supplicant.conf
> + install -m 600 ${WORKDIR}/p2p_supplicant.conf
> +${D}${sysconfdir}/p2p_supplicant.conf
>
> if grep -q ^CONFIG_CTRL_IFACE_DBUS=y .config || grep -q
> ^CONFIG_CTRL_IFACE_DBUS_NEW=y .config; then
> install -d ${D}/${sysconfdir}/dbus-1/system.d
> @@ -104,6 +106,7 @@ pkg_postinst_wpa-supplicant () { do_configure () {
> install -m 0755 ${WORKDIR}/defconfig .config
> echo "CFLAGS += -I${STAGING_INCDIR}" >> .config
> + echo "CFLAGS += -I${STAGING_INCDIR}/libnl3/" >> .config
> echo "LIBS += -L${STAGING_LIBDIR}" >> .config
> echo "LIBS_p += -L${STAGING_LIBDIR}" >> .config
> if [ "${@base_contains('COMBINED_FEATURES', 'madwifi', 1, 0, d)}" =
> "1" ]; then diff --git a/meta-arago-extras/recipes-connectivity/wpa-
> supplicant/wpa-supplicant/p2p_supplicant.conf b/meta-arago-extras/recipes-
> connectivity/wpa-supplicant/wpa-supplicant/p2p_supplicant.conf
> new file mode 100755
> index 0000000..2de8730
> --- /dev/null
> +++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplica
> +++ nt/p2p_supplicant.conf
> @@ -0,0 +1,14 @@
> +ctrl_interface=/var/run/wpa_supplicant
> +update_config=0
> +device_name=TI-SITARA-P2P
> +device_type=1-0050F204-1
> +config_methods=virtual_push_button physical_display keypad
> +p2p_go_intent=0
> +country=US
> +##p2p_pref_chan=115:36 115:40
> +driver_param=use_multi_chan_concurrent=1 use_p2p_group_interface=1
> +p2p_go_max_inactivity=60
> +p2p_go_ht40=1
> +p2p_multi_chan=1
> +disassoc_low_ack=1
> +concurrent_sched_scan=1
> diff --git a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-
> supplicant/wpa_supplicant.conf b/meta-arago-extras/recipes-
> connectivity/wpa-supplicant/wpa-supplicant/wpa_supplicant.conf
> index f0c993d..f144a38 100644
> --- a/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-
> supplicant/wpa_supplicant.conf
> +++ b/meta-arago-extras/recipes-connectivity/wpa-supplicant/wpa-supplica
> +++ nt/wpa_supplicant.conf
> @@ -1,19 +1,4 @@
> -##### Example wpa_supplicant configuration file
> ############################### -# -# This file describes configuration
> file format and lists all available option.
> -# Please also take a look at simpler configuration examples in 'examples'
> -# subdirectory.
> -#
> -# Empty lines and lines starting with # are ignored
> -
> -# NOTE! This file may contain password information and should probably be
> made -# readable only by root user on multiuser systems.
> -
> -# Note: All file paths in this configuration file should use full (absolute, -# not
> relative to working directory) path in order to allow working directory -# to be
> changed. This can happen if wpa_supplicant is run in the background.
> -
> -# Whether to allow wpa_supplicant to update (overwrite) configuration
> +##### wpa_supplicant configuration file template #####
> #
> # This option can be used to allow wpa_supplicant to overwrite configuration #
> file whenever configuration is changed (e.g., new network block is added with
> @@ -21,59 +6,8 @@ # wpa_cli/wpa_gui to be able to store the configuration
> changes permanently.
> # Please note that overwriting configuration file will remove the comments
> from # it.
> -#update_config=1
> -
> -# global configuration (shared by all network blocks) -# -# Parameters for the
> control interface. If this is specified, wpa_supplicant -# will open a control
> interface that is available for external programs to -# manage wpa_supplicant.
> The meaning of this string depends on which control -# interface mechanism is
> used. For all cases, the existance of this parameter -# in configuration is used to
> determine whether the control interface is -# enabled.
> -#
> -# For UNIX domain sockets (default on Linux and BSD): This is a directory that -
> # will be created for UNIX domain sockets for listening to requests from -#
> external programs (CLI/GUI, etc.) for status information and configuration.
> -# The socket file will be named based on the interface name, so multiple -#
> wpa_supplicant processes can be run at the same time if more than one -#
> interface is used.
> -# /var/run/wpa_supplicant is the recommended directory for sockets and by -#
> default, wpa_cli will use it when trying to connect with wpa_supplicant.
> -#
> -# 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 wpa_supplicant as root (since it needs to change network -#
> configuration and open raw sockets) and still allow GUI/CLI components to be -#
> run as non-root users. However, since the control interface can be used to -#
> change the network configuration, this access needs to be protected in many -#
> cases. By default, wpa_supplicant is configured to use gid 0 (root). If you -#
> want to allow non-root users to use the control interface, add a new group -#
> and change this value to match with that group. Add users that should have -#
> control interface access to this group. If this variable is commented out or -# not
> included in the configuration file, group will not be changed from the -# value it
> got by default when the directory or socket was created.
> -#
> -# When configuring both the directory and group, use following format:
> -# DIR=/var/run/wpa_supplicant GROUP=wheel -#
> DIR=/var/run/wpa_supplicant GROUP=0 -# (group can be either group name or
> gid) -# -# For UDP connections (default on Windows): The value will be ignored.
> This -# variable is just used to select that the control interface is to be created.
> -# The value can be set to, e.g., udp (ctrl_interface=udp) -# -# For Windows
> Named Pipe: This value can be used to set the security descriptor -# for
> controlling access to the control interface. Security descriptor can be -# set using
> Security Descriptor String Format (see http://msdn.microsoft.com/ -#
> library/default.asp?url=/library/en-us/secauthz/security/
> -# security_descriptor_string_format.asp). The descriptor string needs to be -#
> prefixed with SDDL=. For example, ctrl_interface=SDDL=D: would set an empty
> -# DACL (which will reject all connections). See README-Windows.txt for more -
> # information about SDDL string format.
> -#
> +update_config=1
> ctrl_interface=/var/run/wpa_supplicant
> -
> # IEEE 802.1X/EAPOL version
> # wpa_supplicant is implemented based on IEEE Std 802.1X-2004 which defines
> # EAPOL version 2. However, there are many APs that do not handle the new
> @@ -82,14 +16,15 @@ ctrl_interface=/var/run/wpa_supplicant
> # to 1 by default. This configuration value can be used to set it to the new #
> version (2).
> eapol_version=1
> -
> # AP scanning/selection
> # By default, wpa_supplicant requests driver to perform AP scanning and then
> # uses the scan results to select a suitable AP. Another alternative is to # allow
> the driver to take care of AP scanning and selection and use # wpa_supplicant
> just to process EAPOL frames based on IEEE 802.11 association # information
> from the driver.
> -# 1: wpa_supplicant initiates scanning and AP selection
> +# 1: wpa_supplicant initiates scanning and AP selection; if no APs matching to
> +# the currently enabled networks are found, a new network (IBSS or AP
> mode
> +# operation) may be initialized (if configured) (default)
> # 0: driver takes care of scanning, AP selection, and IEEE 802.11 association
> # parameters (e.g., WPA IE generation); this mode can also be used with
> # non-WPA drivers when using IEEE 802.1X mode; do not try to associate with
> @@ -102,589 +37,28 @@ eapol_version=1
> # the driver reports successful association; each network block should have
> # explicit security policy (i.e., only one option in the lists) for
> # key_mgmt, pairwise, group, proto variables
> +# When using IBSS or AP mode, ap_scan=2 mode can force the new network
> +to be # created immediately regardless of scan results. ap_scan=1 mode
> +will first try # to scan for existing networks and only if no matches
> +with the enabled # networks are found, a new IBSS or AP mode network is
> created.
> ap_scan=1
> -
> # EAP fast re-authentication
> # By default, fast re-authentication is enabled for all EAP methods that #
> support it. This variable can be used to disable fast re-authentication.
> # Normally, there is no need to disable this.
> fast_reauth=1
> -
> -# OpenSSL Engine support
> -# These options can be used to load OpenSSL engines.
> -# The two engines that are supported currently are shown below:
> -# They are both from the opensc project (http://www.opensc.org/) -# By
> default no engines are loaded.
> -# make the opensc engine available
> -#opensc_engine_path=/usr/lib/opensc/engine_opensc.so
> -# make the pkcs11 engine available
> -#pkcs11_engine_path=/usr/lib/opensc/engine_pkcs11.so
> -# configure the path to the pkcs11 module required by the pkcs11 engine -
> #pkcs11_module_path=/usr/lib/pkcs11/opensc-pkcs11.so
> -
> -# Dynamic EAP methods
> -# If EAP methods were built dynamically as shared object files, they need to be -
> # loaded here before being used in the network blocks. By default, EAP methods
> -# are included statically in the build, so these lines are not needed -
> #load_dynamic_eap=/usr/lib/wpa_supplicant/eap_tls.so
> -#load_dynamic_eap=/usr/lib/wpa_supplicant/eap_md5.so
> -
> -# Driver interface parameters
> -# This field can be used to configure arbitrary driver interace parameters. The -
> # format is specific to the selected driver interface. This field is not used -# in
> most cases.
> -#driver_param="field=value"
> -
> -# Maximum lifetime for PMKSA in seconds; default 43200
> -#dot11RSNAConfigPMKLifetime=43200
> -# Threshold for reauthentication (percentage of PMK lifetime); default 70
> -#dot11RSNAConfigPMKReauthThreshold=70
> -# Timeout for security association negotiation in seconds; default 60
> -#dot11RSNAConfigSATimeout=60
> -
> -# network block
> -#
> -# Each network (usually AP's sharing the same SSID) is configured as a separate
> -# block in this configuration file. The network blocks are in preference order -#
> (the first match is used).
> -#
> -# network block fields:
> -#
> -# disabled:
> -# 0 = this network can be used (default)
> -# 1 = this network block is disabled (can be enabled through ctrl_iface,
> -# e.g., with wpa_cli or wpa_gui)
> -#
> -# id_str: Network identifier string for external scripts. This value is passed
> -# to external action script through wpa_cli as WPA_ID_STR environment
> -# variable to make it easier to do network specific configuration.
> -#
> -# ssid: SSID (mandatory); either as an ASCII string with double quotation or
> -# as hex string; network name
> -#
> -# scan_ssid:
> -# 0 = do not scan this SSID with specific Probe Request frames (default)
> -# 1 = scan with SSID-specific Probe Request frames (this can be used to
> -# find APs that do not accept broadcast SSID or use multiple SSIDs;
> -# this will add latency to scanning, so enable this only when needed)
> -#
> -# bssid: BSSID (optional); if set, this network block is used only when
> -# associating with the AP using the configured BSSID
> -#
> -# priority: priority group (integer)
> -# By default, all networks will get same priority group (0). If some of the -#
> networks are more desirable, this field can be used to change the order in -#
> which wpa_supplicant goes through the networks when selecting a BSS. The -#
> priority groups will be iterated in decreasing priority (i.e., the larger the -#
> priority value, the sooner the network is matched against the scan results).
> -# Within each priority group, networks will be selected based on security -#
> policy, signal strength, etc.
> -# Please note that AP scanning with scan_ssid=1 and ap_scan=2 mode are not -
> # using this priority to select the order for scanning. Instead, they try the -#
> networks in the order that used in the configuration file.
> -#
> -# mode: IEEE 802.11 operation mode
> -# 0 = infrastructure (Managed) mode, i.e., associate with an AP (default) -# 1 =
> IBSS (ad-hoc, peer-to-peer) -# Note: IBSS can only be used with key_mgmt
> NONE (plaintext and static WEP) -# and key_mgmt=WPA-NONE (fixed group key
> TKIP/CCMP). In addition, ap_scan has -# to be set to 2 for IBSS. WPA-None
> requires following network block options:
> -# proto=WPA, key_mgmt=WPA-NONE, pairwise=NONE, group=TKIP (or CCMP,
> but not -# both), and psk must also be set.
> -#
> -# proto: list of accepted protocols
> -# WPA = WPA/IEEE 802.11i/D3.0
> -# RSN = WPA2/IEEE 802.11i (also WPA2 can be used as an alias for RSN) -# If
> not set, this defaults to: WPA RSN -# -# key_mgmt: list of accepted
> authenticated key management protocols -# WPA-PSK = WPA pre-shared key
> (this requires 'psk' field) -# WPA-EAP = WPA using EAP authentication (this can
> use an external
> -# program, e.g., Xsupplicant, for IEEE 802.1X EAP Authentication
> -# IEEE8021X = IEEE 802.1X using EAP authentication and (optionally)
> dynamically
> -# generated WEP keys
> -# NONE = WPA is not used; plaintext or static WEP could be used -# If not set,
> this defaults to: WPA-PSK WPA-EAP -# -# auth_alg: list of allowed IEEE 802.11
> authentication algorithms -# OPEN = Open System authentication (required for
> WPA/WPA2) -# SHARED = Shared Key authentication (requires static WEP keys)
> -# LEAP = LEAP/Network EAP (only used with LEAP) -# If not set, automatic
> selection is used (Open System with LEAP enabled if -# LEAP is allowed as one of
> the EAP methods).
> -#
> -# pairwise: list of accepted pairwise (unicast) ciphers for WPA -# CCMP = AES in
> Counter mode with CBC-MAC [RFC 3610, IEEE 802.11i/D7.0] -# TKIP = Temporal
> Key Integrity Protocol [IEEE 802.11i/D7.0] -# NONE = Use only Group Keys
> (deprecated, should not be included if APs support
> -# pairwise keys)
> -# If not set, this defaults to: CCMP TKIP -# -# group: list of accepted group
> (broadcast/multicast) ciphers for WPA -# CCMP = AES in Counter mode with
> CBC-MAC [RFC 3610, IEEE 802.11i/D7.0] -# TKIP = Temporal Key Integrity
> Protocol [IEEE 802.11i/D7.0] -# WEP104 = WEP (Wired Equivalent Privacy) with
> 104-bit key -# WEP40 = WEP (Wired Equivalent Privacy) with 40-bit key [IEEE
> 802.11] -# If not set, this defaults to: CCMP TKIP WEP104 WEP40 -# -# psk:
> WPA preshared key; 256-bit pre-shared key -# The key used in WPA-PSK mode
> can be entered either as 64 hex-digits, i.e., -# 32 bytes or as an ASCII passphrase
> (in which case, the real PSK will be -# generated using the passphrase and SSID).
> ASCII passphrase must be between -# 8 and 63 characters (inclusive).
> -# This field is not needed, if WPA-EAP is used.
> -# Note: Separate tool, wpa_passphrase, can be used to generate 256-bit keys -
> # from ASCII passphrase. This process uses lot of CPU and wpa_supplicant -#
> startup and reconfiguration time can be optimized by generating the PSK only -#
> only when the passphrase or SSID has actually changed.
> -#
> -# eapol_flags: IEEE 802.1X/EAPOL options (bit field) -# Dynamic WEP key
> required for non-WPA mode -# bit0 (1): require dynamically generated unicast
> WEP key -# bit1 (2): require dynamically generated broadcast WEP key
> -# (3 = require both keys; default)
> -# Note: When using wired authentication, eapol_flags must be set to 0 for the -
> # authentication to be completed successfully.
> -#
> -# proactive_key_caching:
> -# Enable/disable opportunistic PMKSA caching for WPA2.
> -# 0 = disabled (default)
> -# 1 = enabled
> -#
> -# wep_key0..3: Static WEP key (ASCII in double quotation, e.g. "abcde" or -#
> hex without quotation, e.g., 0102030405) -# wep_tx_keyidx: Default WEP key
> index (TX) (0..3) -# -# peerkey: Whether PeerKey negotiation for direct links
> (IEEE 802.11e DLS) is -# allowed. This is only used with RSN/WPA2.
> -# 0 = disabled (default)
> -# 1 = enabled
> -#peerkey=1
> -#
> -# Following fields are only used with internal EAP implementation.
> -# eap: space-separated list of accepted EAP methods
> -# MD5 = EAP-MD5 (unsecure and does not generate keying material ->
> -# cannot be used with WPA; to be used as a Phase 2
> method
> -# with EAP-PEAP or EAP-TTLS)
> -# MSCHAPV2 = EAP-MSCHAPv2 (cannot be used separately with WPA; to be
> used
> -# as a Phase 2 method with EAP-PEAP or EAP-TTLS)
> -# OTP = EAP-OTP (cannot be used separately with WPA; to be used
> -# as a Phase 2 method with EAP-PEAP or EAP-TTLS)
> -# GTC = EAP-GTC (cannot be used separately with WPA; to be used
> -# as a Phase 2 method with EAP-PEAP or EAP-TTLS)
> -# TLS = EAP-TLS (client and server certificate)
> -# PEAP = EAP-PEAP (with tunnelled EAP authentication)
> -# TTLS = EAP-TTLS (with tunnelled EAP or
> PAP/CHAP/MSCHAP/MSCHAPV2
> -# authentication)
> -# If not set, all compiled in methods are allowed.
> -#
> -# identity: Identity string for EAP
> -# anonymous_identity: Anonymous identity string for EAP (to be used as the
> -# unencrypted identity with EAP types that support different tunnelled
> -# identity, e.g., EAP-TTLS)
> -# password: Password string for EAP
> -# ca_cert: File path to CA certificate file (PEM/DER). This file can have one
> -# or more trusted CA certificates. If ca_cert and ca_path are not
> -# included, server certificate will not be verified. This is insecure and
> -# a trusted CA certificate should always be configured when using
> -# EAP-TLS/TTLS/PEAP. Full path should be used since working directory
> may
> -# change when wpa_supplicant is run in the background.
> -# On Windows, trusted CA certificates can be loaded from the system
> -# certificate store by setting this to cert_store://<name>, e.g.,
> -# ca_cert="cert_store://CA" or ca_cert="cert_store://ROOT".
> -# Note that when running wpa_supplicant as an application, the user
> -# certificate store (My user account) is used, whereas computer store
> -# (Computer account) is used when running wpasvc as a service.
> -# ca_path: Directory path for CA certificate files (PEM). This path may
> -# contain multiple CA certificates in OpenSSL format. Common use for this
> -# is to point to system trusted CA list which is often installed into
> -# directory like /etc/ssl/certs. If configured, these certificates are
> -# added to the list of trusted CAs. ca_cert may also be included in that
> -# case, but it is not required.
> -# client_cert: File path to client certificate file (PEM/DER)
> -# Full path should be used since working directory may change when
> -# wpa_supplicant is run in the background.
> -# Alternatively, a named configuration blob can be used by setting this
> -# to blob://<blob name>.
> -# private_key: File path to client private key file (PEM/DER/PFX)
> -# When PKCS#12/PFX file (.p12/.pfx) is used, client_cert should be
> -# commented out. Both the private key and certificate will be read from
> -# the PKCS#12 file in this case. Full path should be used since working
> -# directory may change when wpa_supplicant is run in the background.
> -# Windows certificate store can be used by leaving client_cert out and
> -# configuring private_key in one of the following formats:
> -# cert://substring_to_match
> -# hash://certificate_thumbprint_in_hex
> -# for example: private_key="hash://63093aa9c47f56ae88334c7b65a4"
> -# Note that when running wpa_supplicant as an application, the user
> -# certificate store (My user account) is used, whereas computer store
> -# (Computer account) is used when running wpasvc as a service.
> -# Alternatively, a named configuration blob can be used by setting this
> -# to blob://<blob name>.
> -# private_key_passwd: Password for private key file (if left out, this will be
> -# asked through control interface)
> -# dh_file: File path to DH/DSA parameters file (in PEM format)
> -# This is an optional configuration file for setting parameters for an
> -# ephemeral DH key exchange. In most cases, the default RSA
> -# authentication does not use this configuration. However, it is possible
> -# setup RSA to use ephemeral DH key exchange. In addition, ciphers with
> -# DSA keys always use ephemeral DH keys. This can be used to achieve
> -# forward secrecy. If the file is in DSA parameters format, it will be
> -# automatically converted into DH params.
> -# subject_match: Substring to be matched against the subject of the
> -# authentication server certificate. If this string is set, the server
> -# sertificate is only accepted if it contains this string in the subject.
> -# The subject string is in following format:
> -# /C=US/ST=CA/L=San Francisco/CN=Test
> AS/emailAddress=as@example.com
> -# altsubject_match: Semicolon separated string of entries to be matched
> against
> -# the alternative subject name of the authentication server certificate.
> -# If this string is set, the server sertificate is only accepted if it
> -# contains one of the entries in an alternative subject name extension.
> -# altSubjectName string is in following format: TYPE:VALUE
> -# Example: EMAIL:server@example.com
> -# Example: DNS:server.example.com;DNS:server2.example.com
> -# Following types are supported: EMAIL, DNS, URI
> -# phase1: Phase1 (outer authentication, i.e., TLS tunnel) parameters
> -# (string with field-value pairs, e.g., "peapver=0" or
> -# "peapver=1 peaplabel=1")
> -# 'peapver' can be used to force which PEAP version (0 or 1) is used.
> -# 'peaplabel=1' can be used to force new label, "client PEAP encryption",
> -# to be used during key derivation when PEAPv1 or newer. Most existing
> -# PEAPv1 implementation seem to be using the old label, "client EAP
> -# encryption", and wpa_supplicant is now using that as the default value.
> -# Some servers, e.g., Radiator, may require peaplabel=1 configuration to
> -# interoperate with PEAPv1; see eap_testing.txt for more details.
> -# 'peap_outer_success=0' can be used to terminate PEAP authentication
> on
> -# tunneled EAP-Success. This is required with some RADIUS servers that
> -# implement draft-josefsson-pppext-eap-tls-eap-05.txt (e.g.,
> -# Lucent NavisRadius v4.4.0 with PEAP in "IETF Draft 5" mode)
> -# include_tls_length=1 can be used to force wpa_supplicant to include
> -# TLS Message Length field in all TLS messages even if they are not
> -# fragmented.
> -# sim_min_num_chal=3 can be used to configure EAP-SIM to require
> three
> -# challenges (by default, it accepts 2 or 3)
> -# phase2: Phase2 (inner authentication with TLS tunnel) parameters
> -# (string with field-value pairs, e.g., "auth=MSCHAPV2" for EAP-PEAP or
> -# "autheap=MSCHAPV2 autheap=MD5" for EAP-TTLS)
> -# Following certificate/private key fields are used in inner Phase2 -#
> authentication when using EAP-TTLS or EAP-PEAP.
> -# ca_cert2: File path to CA certificate file. This file can have one or more
> -# trusted CA certificates. If ca_cert2 and ca_path2 are not included,
> -# server certificate will not be verified. This is insecure and a trusted
> -# CA certificate should always be configured.
> -# ca_path2: Directory path for CA certificate files (PEM) -# client_cert2: File
> path to client certificate file -# private_key2: File path to client private key file -#
> private_key2_passwd: Password for private key file -# dh_file2: File path to
> DH/DSA parameters file (in PEM format) -# subject_match2: Substring to be
> matched against the subject of the
> -# authentication server certificate.
> -# altsubject_match2: Substring to be matched against the alternative subject
> -# name of the authentication server certificate.
> -#
> -# fragment_size: Maximum EAP fragment size in bytes (default 1398).
> -# This value limits the fragment size for EAP methods that support
> -# fragmentation (e.g., EAP-TLS and EAP-PEAP). This value should be set
> -# small enough to make the EAP messages fit in MTU of the network
> -# interface used for EAPOL. The default value is suitable for most
> -# cases.
> -#
> -# EAP-PSK variables:
> -# eappsk: 16-byte (128-bit, 32 hex digits) pre-shared key in hex format -# nai:
> user NAI -# -# EAP-PAX variables:
> -# eappsk: 16-byte (128-bit, 32 hex digits) pre-shared key in hex format -# -#
> EAP-SAKE variables:
> -# eappsk: 32-byte (256-bit, 64 hex digits) pre-shared key in hex format
> -# (this is concatenation of Root-Secret-A and Root-Secret-B)
> -# nai: user NAI (PEERID)
> -#
> -# EAP-GPSK variables:
> -# eappsk: Pre-shared key in hex format (at least 128 bits, i.e., 32 hex digits) -#
> nai: user NAI (ID_Client) -# -# EAP-FAST variables:
> -# pac_file: File path for the PAC entries. wpa_supplicant will need to be able
> -# to create this file and write updates to it when PAC is being
> -# provisioned or refreshed. Full path to the file should be used since
> -# working directory may change when wpa_supplicant is run in the
> -# background. Alternatively, a named configuration blob can be used by
> -# setting this to blob://<blob name>
> -# phase1: fast_provisioning=1 option enables in-line provisioning of EAP-FAST
> -# credentials (PAC)
> -#
> -# wpa_supplicant supports number of "EAP workarounds" to work around -#
> interoperability issues with incorrectly behaving authentication servers.
> -# These are enabled by default because some of the issues are present in large -
> # number of authentication servers. Strict EAP conformance mode can be -#
> configured by disabling workarounds with eap_workaround=0.
> -
> -# Example blocks:
> -
> -# Simple case: WPA-PSK, PSK as an ASCII passphrase, allow all valid ciphers -
> network={
> - ssid="simple"
> - psk="very secret passphrase"
> - priority=5
> -}
> -
> -# Same as previous, but request SSID-specific scanning (for APs that reject -#
> broadcast SSID) -network={
> - ssid="second ssid"
> - scan_ssid=1
> - psk="very secret passphrase"
> - priority=2
> -}
> -
> -# Only WPA-PSK is used. Any valid cipher combination is accepted.
> -network={
> - ssid="example"
> - proto=WPA
> - key_mgmt=WPA-PSK
> - pairwise=CCMP TKIP
> - group=CCMP TKIP WEP104 WEP40
> -
> psk=06b4be19da289f475aa46a33cb793029d4ab3db7a23ee92382eb
> 0106c72ac7bb
> - priority=2
> -}
> -
> -# Only WPA-EAP is used. Both CCMP and TKIP is accepted. An AP that used
> WEP104 -# or WEP40 as the group cipher will not be accepted.
> -network={
> - ssid="example"
> - proto=RSN
> - key_mgmt=WPA-EAP
> - pairwise=CCMP TKIP
> - group=CCMP TKIP
> - eap=TLS
> - identity="user@example.com"
> - ca_cert="/etc/cert/ca.pem"
> - client_cert="/etc/cert/user.pem"
> - private_key="/etc/cert/user.prv"
> - private_key_passwd="password"
> - priority=1
> -}
> -
> -# EAP-PEAP/MSCHAPv2 configuration for RADIUS servers that use the new
> peaplabel -# (e.g., Radiator) -network={
> - ssid="example"
> - key_mgmt=WPA-EAP
> - eap=PEAP
> - identity="user@example.com"
> - password="foobar"
> - ca_cert="/etc/cert/ca.pem"
> - phase1="peaplabel=1"
> - phase2="auth=MSCHAPV2"
> - priority=10
> -}
> -
> -# EAP-TTLS/EAP-MD5-Challenge configuration with anonymous identity for the
> -# unencrypted use. Real identity is sent only within an encrypted TLS tunnel.
> -network={
> - ssid="example"
> - key_mgmt=WPA-EAP
> - eap=TTLS
> - identity="user@example.com"
> - anonymous_identity="anonymous@example.com"
> - password="foobar"
> - ca_cert="/etc/cert/ca.pem"
> - priority=2
> -}
> -
> -# EAP-TTLS/MSCHAPv2 configuration with anonymous identity for the
> unencrypted -# use. Real identity is sent only within an encrypted TLS tunnel.
> -network={
> - ssid="example"
> - key_mgmt=WPA-EAP
> - eap=TTLS
> - identity="user@example.com"
> - anonymous_identity="anonymous@example.com"
> - password="foobar"
> - ca_cert="/etc/cert/ca.pem"
> - phase2="auth=MSCHAPV2"
> -}
> -
> -# WPA-EAP, EAP-TTLS with different CA certificate used for outer and inner -#
> authentication.
> -network={
> - ssid="example"
> - key_mgmt=WPA-EAP
> - eap=TTLS
> - # Phase1 / outer authentication
> - anonymous_identity="anonymous@example.com"
> - ca_cert="/etc/cert/ca.pem"
> - # Phase 2 / inner authentication
> - phase2="autheap=TLS"
> - ca_cert2="/etc/cert/ca2.pem"
> - client_cert2="/etc/cer/user.pem"
> - private_key2="/etc/cer/user.prv"
> - private_key2_passwd="password"
> - priority=2
> -}
> -
> -# Both WPA-PSK and WPA-EAP is accepted. Only CCMP is accepted as pairwise
> and -# group cipher.
> -network={
> - ssid="example"
> - bssid=00:11:22:33:44:55
> - proto=WPA RSN
> - key_mgmt=WPA-PSK WPA-EAP
> - pairwise=CCMP
> - group=CCMP
> -
> psk=06b4be19da289f475aa46a33cb793029d4ab3db7a23ee92382eb
> 0106c72ac7bb
> -}
> -
> -# Special characters in SSID, so use hex string. Default to WPA-PSK, WPA-EAP -
> # and all valid ciphers.
> -network={
> - ssid=00010203
> -
> psk=000102030405060708090a0b0c0d0e0f10111213141516171819
> 1a1b1c1d1e1f
> -}
> -
> -
> -# IEEE 802.1X/EAPOL with dynamically generated WEP keys (i.e., no WPA)
> using -# EAP-TLS for authentication and key generation; require both unicast
> and -# broadcast WEP keys.
> -network={
> - ssid="1x-test"
> - key_mgmt=IEEE8021X
> - eap=TLS
> - identity="user@example.com"
> - ca_cert="/etc/cert/ca.pem"
> - client_cert="/etc/cert/user.pem"
> - private_key="/etc/cert/user.prv"
> - private_key_passwd="password"
> - eapol_flags=3
> -}
> -
> -
> -# LEAP with dynamic WEP keys
> -network={
> - ssid="leap-example"
> - key_mgmt=IEEE8021X
> - eap=LEAP
> - identity="user"
> - password="foobar"
> -}
> -
> -# Plaintext connection (no WPA, no IEEE 802.1X) -network={
> - ssid="plaintext-test"
> - key_mgmt=NONE
> -}
> -
> -
> -# Shared WEP key connection (no WPA, no IEEE 802.1X) -network={
> - ssid="static-wep-test"
> - key_mgmt=NONE
> - wep_key0="abcde"
> - wep_key1=0102030405
> - wep_key2="1234567890123"
> - wep_tx_keyidx=0
> - priority=5
> -}
> -
> -
> -# Shared WEP key connection (no WPA, no IEEE 802.1X) using Shared Key -#
> IEEE 802.11 authentication -network={
> - ssid="static-wep-test2"
> - key_mgmt=NONE
> - wep_key0="abcde"
> - wep_key1=0102030405
> - wep_key2="1234567890123"
> - wep_tx_keyidx=0
> - priority=5
> - auth_alg=SHARED
> -}
> -
> -
> -# IBSS/ad-hoc network with WPA-None/TKIP.
> -network={
> - ssid="test adhoc"
> - mode=1
> - proto=WPA
> - key_mgmt=WPA-NONE
> - pairwise=NONE
> - group=TKIP
> - psk="secret passphrase"
> -}
> -
> -
> -# Catch all example that allows more or less all configuration modes -network={
> - ssid="example"
> - scan_ssid=1
> - key_mgmt=WPA-EAP WPA-PSK IEEE8021X NONE
> - pairwise=CCMP TKIP
> - group=CCMP TKIP WEP104 WEP40
> - psk="very secret passphrase"
> - eap=TTLS PEAP TLS
> - identity="user@example.com"
> - password="foobar"
> - ca_cert="/etc/cert/ca.pem"
> - client_cert="/etc/cert/user.pem"
> - private_key="/etc/cert/user.prv"
> - private_key_passwd="password"
> - phase1="peaplabel=0"
> -}
> -
> -# Example of EAP-TLS with smartcard (openssl engine) -network={
> - ssid="example"
> - key_mgmt=WPA-EAP
> - eap=TLS
> - proto=RSN
> - pairwise=CCMP TKIP
> - group=CCMP TKIP
> - identity="user@example.com"
> - ca_cert="/etc/cert/ca.pem"
> - client_cert="/etc/cert/user.pem"
> -
> - engine=1
> -
> - # The engine configured here must be available. Look at
> - # OpenSSL engine support in the global section.
> - # The key available through the engine must be the private key
> - # matching the client certificate configured above.
> -
> - # use the opensc engine
> - #engine_id="opensc"
> - #key_id="45"
> -
> - # use the pkcs11 engine
> - engine_id="pkcs11"
> - key_id="id_45"
> -
> - # Optional PIN configuration; this can be left out and PIN will be
> - # asked through the control interface
> - pin="1234"
> -}
> -
> -# Example configuration showing how to use an inlined blob as a CA certificate -
> # data instead of using external file -network={
> - ssid="example"
> - key_mgmt=WPA-EAP
> - eap=TTLS
> - identity="user@example.com"
> - anonymous_identity="anonymous@example.com"
> - password="foobar"
> - ca_cert="blob://exampleblob"
> - priority=20
> -}
> -
> -blob-base64-exampleblob={
> -SGVsbG8gV29ybGQhCg==
> -}
> -
> -
> -# Wildcard match for SSID (plaintext APs only). This example select any -# open
> AP regardless of its SSID.
> -network={
> - key_mgmt=NONE
> -}
> +device_name=Blaze
> +manufacturer=TI
> +model_name=Wilink
> +model_number=wl18xx
> +serial_number=12345
> +driver_param=use_multi_chan_concurrent=1 use_p2p_group_interface=1 #
> +Timeout in seconds to detect STA inactivity (default: 300 seconds) # #
> +This timeout value is used in P2P GO mode to clean up # inactive
> +stations.
> +p2p_go_max_inactivity=60
> +p2p_go_ht40=1
> +p2p_multi_chan=1
> +disassoc_low_ack=1
> +concurrent_sched_scan=1
> --
> 1.7.9
>
> _______________________________________________
> meta-arago mailing list
> meta-arago@arago-project.org
> http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
^ permalink raw reply [flat|nested] 18+ messages in thread