Revert "[wpa_supplicant] Cumulative patch from b8491ae5a"
This reverts commit 878cf7bcbf2d7d8f08c3d060b8c5fbfcf0743eda.
Reason for revert: git_master/sdk_phone_armv7-sdk
Change-Id: I6070fc5c1f9c20867f6dfce90e529e35578d572e
diff --git a/hostapd/hostapd.conf b/hostapd/hostapd.conf
index f2d5873..f8caa56 100644
--- a/hostapd/hostapd.conf
+++ b/hostapd/hostapd.conf
@@ -782,8 +782,10 @@
# 1 = supported
#he_mu_beamformer=1
-# he_bss_color: BSS color (1-63)
-#he_bss_color=1
+# he_bss_color: BSS color
+# 0 = no BSS color (default)
+# unsigned integer = BSS color
+#he_bss_color=0
#he_default_pe_duration: The duration of PE field in an HE PPDU in us
# Possible values are 0 us (default), 4 us, 8 us, 12 us, and 16 us
@@ -799,17 +801,6 @@
# unsigned integer = duration in units of 16 us
#he_rts_threshold=0
-# HE operating channel information; see matching vht_* parameters for details.
-#he_oper_chwidth
-#he_oper_centr_freq_seg0_idx
-#he_oper_centr_freq_seg1_idx
-
-#he_basic_mcs_nss_set: Basic NSS/MCS set
-# 16-bit combination of 2-bit values of Max HE-MCS For 1..8 SS; each 2-bit
-# value having following meaning:
-# 0 = HE-MCS 0-7, 1 = HE-MCS 0-9, 2 = HE-MCS 0-11, 3 = not supported
-#he_basic_mcs_nss_set
-
#he_mu_edca_qos_info_param_count
#he_mu_edca_qos_info_q_ack
#he_mu_edca_qos_info_queue_request=1
@@ -834,12 +825,6 @@
#he_mu_edca_ac_vo_ecwmax=15
#he_mu_edca_ac_vo_timer=255
-# Spatial Reuse Parameter Set
-#he_spr_sr_control
-#he_spr_non_srg_obss_pd_max_offset
-#he_spr_srg_obss_pd_min_offset
-#he_spr_srg_obss_pd_max_offset
-
##### IEEE 802.1X-2004 related configuration ##################################
# Require IEEE 802.1X authorization
@@ -851,8 +836,6 @@
# the new version number correctly (they seem to drop the frames completely).
# In order to make hostapd interoperate with these clients, the version number
# can be set to the older version (1) with this configuration value.
-# Note: When using MACsec, eapol_version shall be set to 3, which is
-# defined in IEEE Std 802.1X-2010.
#eapol_version=2
# Optional displayable message sent with EAP Request-Identity. The first \0
@@ -896,54 +879,6 @@
# ERP is enabled (eap_server_erp=1).
#erp_domain=example.com
-##### MACsec ##################################################################
-
-# macsec_policy: IEEE 802.1X/MACsec options
-# This determines how sessions are secured with MACsec (only for MACsec
-# drivers).
-# 0: MACsec not in use (default)
-# 1: MACsec enabled - Should secure, accept key server's advice to
-# determine whether to use a secure session or not.
-#
-# macsec_integ_only: IEEE 802.1X/MACsec transmit mode
-# This setting applies only when MACsec is in use, i.e.,
-# - macsec_policy is enabled
-# - the key server has decided to enable MACsec
-# 0: Encrypt traffic (default)
-# 1: Integrity only
-#
-# macsec_replay_protect: IEEE 802.1X/MACsec replay protection
-# This setting applies only when MACsec is in use, i.e.,
-# - macsec_policy is enabled
-# - the key server has decided to enable MACsec
-# 0: Replay protection disabled (default)
-# 1: Replay protection enabled
-#
-# macsec_replay_window: IEEE 802.1X/MACsec replay protection window
-# This determines a window in which replay is tolerated, to allow receipt
-# of frames that have been misordered by the network.
-# This setting applies only when MACsec replay protection active, i.e.,
-# - macsec_replay_protect is enabled
-# - the key server has decided to enable MACsec
-# 0: No replay window, strict check (default)
-# 1..2^32-1: number of packets that could be misordered
-#
-# macsec_port: IEEE 802.1X/MACsec port
-# Port component of the SCI
-# Range: 1-65534 (default: 1)
-#
-# mka_priority (Priority of MKA Actor)
-# Range: 0..255 (default: 255)
-#
-# mka_cak, mka_ckn, and mka_priority: IEEE 802.1X/MACsec pre-shared key mode
-# This allows to configure MACsec with a pre-shared key using a (CAK,CKN) pair.
-# In this mode, instances of hostapd can act as MACsec peers. The peer
-# with lower priority will become the key server and start distributing SAKs.
-# mka_cak (CAK = Secure Connectivity Association Key) takes a 16-byte (128-bit)
-# hex-string (32 hex-digits) or a 32-byte (256-bit) hex-string (64 hex-digits)
-# mka_ckn (CKN = CAK Name) takes a 1..32-bytes (8..256 bit) hex-string
-# (2..64 hex-digits)
-
##### Integrated EAP server ###################################################
# Optionally, hostapd can be configured to use an integrated EAP server
@@ -977,23 +912,6 @@
# Passphrase for private key
#private_key_passwd=secret passphrase
-# An alternative server certificate and private key can be configured with the
-# following parameters (with values just like the parameters above without the
-# '2' suffix). The ca_cert file (in PEM encoding) is used to add the trust roots
-# for both server certificates and/or client certificates).
-#
-# The main use case for this alternative server certificate configuration is to
-# enable both RSA and ECC public keys. The server will pick which one to use
-# based on the client preferences for the cipher suite (in the TLS ClientHello
-# message). It should be noted that number of deployed EAP peer implementations
-# do not filter out the cipher suite list based on their local configuration and
-# as such, configuration of alternative types of certificates on the server may
-# result in interoperability issues.
-#server_cert2=/etc/hostapd.server-ecc.pem
-#private_key2=/etc/hostapd.server-ecc.prv
-#private_key_passwd2=secret passphrase
-
-
# Server identity
# EAP methods that provide mechanism for authenticated server identity delivery
# use this value. If not set, "hostapd" is used as a default.
@@ -1191,16 +1109,6 @@
# (or fewer) of the lifetime remains.
#pac_key_refresh_time=86400
-# EAP-TEAP authentication type
-# 0 = inner EAP (default)
-# 1 = Basic-Password-Auth
-#eap_teap_auth=0
-
-# EAP-TEAP authentication behavior when using PAC
-# 0 = perform inner authentication (default)
-# 1 = skip inner authentication (inner EAP/Basic-Password-Auth)
-#eap_teap_pac_no_inner=0
-
# EAP-SIM and EAP-AKA protected success/failure indication using AT_RESULT_IND
# (default: 0 = disabled).
#eap_sim_aka_result_ind=1
@@ -2584,42 +2492,6 @@
# that allows sending of such data. Default: 0.
#stationary_ap=0
-##### Airtime policy configuration ###########################################
-
-# Set the airtime policy operating mode:
-# 0 = disabled (default)
-# 1 = static config
-# 2 = per-BSS dynamic config
-# 3 = per-BSS limit mode
-#airtime_mode=0
-
-# Interval (in milliseconds) to poll the kernel for updated station activity in
-# dynamic and limit modes
-#airtime_update_interval=200
-
-# Static configuration of station weights (when airtime_mode=1). Kernel default
-# weight is 256; set higher for larger airtime share, lower for smaller share.
-# Each entry is a MAC address followed by a weight.
-#airtime_sta_weight=02:01:02:03:04:05 256
-#airtime_sta_weight=02:01:02:03:04:06 512
-
-# Per-BSS airtime weight. In multi-BSS mode, set for each BSS and hostapd will
-# configure station weights to enforce the correct ratio between BSS weights
-# depending on the number of active stations. The *ratios* between different
-# BSSes is what's important, not the absolute numbers.
-# Must be set for all BSSes if airtime_mode=2 or 3, has no effect otherwise.
-#airtime_bss_weight=1
-
-# Whether the current BSS should be limited (when airtime_mode=3).
-#
-# If set, the BSS weight ratio will be applied in the case where the current BSS
-# would exceed the share defined by the BSS weight ratio. E.g., if two BSSes are
-# set to the same weights, and one is set to limited, the limited BSS will get
-# no more than half the available airtime, but if the non-limited BSS has more
-# stations active, that *will* be allowed to exceed its half of the available
-# airtime.
-#airtime_bss_limit=1
-
##### TESTING OPTIONS #########################################################
#
# The options in this section are only available when the build configuration