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/src/drivers/driver.h b/src/drivers/driver.h
index 8a5cdb8..e7c8f31 100644
--- a/src/drivers/driver.h
+++ b/src/drivers/driver.h
@@ -102,20 +102,6 @@
};
/**
- * struct hostapd_wmm_rule - WMM regulatory rule
- * @min_cwmin: Lower bound of CW_min value
- * @min_cwmax: Lower bound of CW_max value
- * @min_aifs: Lower bound of AIFS value
- * @max_txop: Upper bound of TXOP, value in units of 32 usec
- */
-struct hostapd_wmm_rule {
- int min_cwmin;
- int min_cwmax;
- int min_aifs;
- int max_txop;
-};
-
-/**
* struct hostapd_channel_data - Channel information
*/
struct hostapd_channel_data {
@@ -170,48 +156,34 @@
* dfs_cac_ms - DFS CAC time in milliseconds
*/
unsigned int dfs_cac_ms;
-
- /**
- * wmm_rules_valid - Indicates wmm_rules state
- */
- int wmm_rules_valid;
-
- /**
- * wmm_rules - WMM regulatory rules
- */
- struct hostapd_wmm_rule wmm_rules[WMM_AC_NUM];
};
-#define HE_MAX_MAC_CAPAB_SIZE 6
-#define HE_MAX_PHY_CAPAB_SIZE 11
-#define HE_MAX_MCS_CAPAB_SIZE 12
-#define HE_MAX_PPET_CAPAB_SIZE 25
+#define HE_MAX_NUM_SS 8
+#define HE_MAX_PHY_CAPAB_SIZE 3
+
+/**
+ * struct he_ppe_threshold - IEEE 802.11ax HE PPE Threshold
+ */
+struct he_ppe_threshold {
+ u32 numss_m1;
+ u32 ru_count;
+ u32 ppet16_ppet8_ru3_ru0[HE_MAX_NUM_SS];
+};
/**
* struct he_capabilities - IEEE 802.11ax HE capabilities
*/
struct he_capabilities {
u8 he_supported;
- u8 phy_cap[HE_MAX_PHY_CAPAB_SIZE];
- u8 mac_cap[HE_MAX_MAC_CAPAB_SIZE];
- u8 mcs[HE_MAX_MCS_CAPAB_SIZE];
- u8 ppet[HE_MAX_PPET_CAPAB_SIZE];
+ u32 phy_cap[HE_MAX_PHY_CAPAB_SIZE];
+ u32 mac_cap;
+ u32 mcs;
+ struct he_ppe_threshold ppet;
};
#define HOSTAPD_MODE_FLAG_HT_INFO_KNOWN BIT(0)
#define HOSTAPD_MODE_FLAG_VHT_INFO_KNOWN BIT(1)
-
-enum ieee80211_op_mode {
- IEEE80211_MODE_INFRA = 0,
- IEEE80211_MODE_IBSS = 1,
- IEEE80211_MODE_AP = 2,
- IEEE80211_MODE_MESH = 5,
-
- /* only add new entries before IEEE80211_MODE_NUM */
- IEEE80211_MODE_NUM
-};
-
/**
* struct hostapd_hw_modes - Supported hardware mode information
*/
@@ -271,10 +243,15 @@
/**
* he_capab - HE (IEEE 802.11ax) capabilities
*/
- struct he_capabilities he_capab[IEEE80211_MODE_NUM];
+ struct he_capabilities he_capab;
};
+#define IEEE80211_MODE_INFRA 0
+#define IEEE80211_MODE_IBSS 1
+#define IEEE80211_MODE_AP 2
+#define IEEE80211_MODE_MESH 5
+
#define IEEE80211_CAP_ESS 0x0001
#define IEEE80211_CAP_IBSS 0x0002
#define IEEE80211_CAP_PRIVACY 0x0010
@@ -722,11 +699,6 @@
int vht_enabled;
/**
- * he_enabled - Whether HE is enabled
- */
- int he_enabled;
-
- /**
* center_freq1 - Segment 0 center frequency in MHz
*
* Valid for both HT and VHT.
@@ -1150,11 +1122,6 @@
HIDDEN_SSID_ZERO_CONTENTS
};
-enum ch_switch_state {
- CH_SW_STARTED,
- CH_SW_FINISHED
-};
-
struct wowlan_triggers {
u8 any;
u8 disconnect;
@@ -1785,7 +1752,6 @@
struct hostap_sta_driver_data {
unsigned long rx_packets, tx_packets;
unsigned long long rx_bytes, tx_bytes;
- unsigned long long rx_airtime, tx_airtime;
int bytes_64bit; /* whether 64-bit byte counters are supported */
unsigned long current_tx_rate;
unsigned long current_rx_rate;
@@ -1795,8 +1761,6 @@
unsigned long tx_retry_failed;
unsigned long tx_retry_count;
s8 last_ack_rssi;
- unsigned long backlog_packets;
- unsigned long backlog_bytes;
s8 signal;
u8 rx_vhtmcs;
u8 tx_vhtmcs;
@@ -1817,8 +1781,6 @@
const struct ieee80211_vht_capabilities *vht_capabilities;
int vht_opmode_enabled;
u8 vht_opmode;
- const struct ieee80211_he_capabilities *he_capab;
- size_t he_capab_len;
u32 flags; /* bitmask of WPA_STA_* flags */
u32 flags_mask; /* unset bits in flags */
#ifdef CONFIG_MESH
@@ -2375,7 +2337,7 @@
*
* Returns: 0 on success, -1 on failure
*/
- int (*deauthenticate)(void *priv, const u8 *addr, u16 reason_code);
+ int (*deauthenticate)(void *priv, const u8 *addr, int reason_code);
/**
* associate - Request driver to associate
@@ -2844,7 +2806,7 @@
* a Deauthentication frame to be sent to it.
*/
int (*sta_deauth)(void *priv, const u8 *own_addr, const u8 *addr,
- u16 reason);
+ int reason);
/**
* sta_disassoc - Disassociate a station (AP only)
@@ -2858,7 +2820,7 @@
* a Disassociation frame to be sent to it.
*/
int (*sta_disassoc)(void *priv, const u8 *own_addr, const u8 *addr,
- u16 reason);
+ int reason);
/**
* sta_remove - Remove a station entry (AP only)
@@ -2976,16 +2938,6 @@
unsigned int flags_and);
/**
- * sta_set_airtime_weight - Set station airtime weight (AP only)
- * @priv: Private driver interface data
- * @addr: Station address
- * @weight: New weight for station airtime assignment
- * Returns: 0 on success, -1 on failure
- */
- int (*sta_set_airtime_weight)(void *priv, const u8 *addr,
- unsigned int weight);
-
- /**
* set_tx_queue_params - Set TX queue parameters
* @priv: Private driver interface data
* @queue: Queue number (0 = VO, 1 = VI, 2 = BE, 3 = BK)
@@ -4023,18 +3975,6 @@
int (*leave_mesh)(void *priv);
/**
- * probe_mesh_link - Inject a frame over direct mesh link to a given
- * peer skipping the next_hop lookup from mpath table.
- * @priv: Private driver interface data
- * @addr: Peer MAC address
- * @eth: Ethernet frame to be sent
- * @len: Ethernet frame lengtn in bytes
- * Returns 0 on success, -1 on failure
- */
- int (*probe_mesh_link)(void *priv, const u8 *addr, const u8 *eth,
- size_t len);
-
- /**
* do_acs - Automatically select channel
* @priv: Private driver interface data
* @params: Parameters for ACS
@@ -4227,21 +4167,6 @@
* Returns: 0 on success, < 0 on failure
*/
int (*set_4addr_mode)(void *priv, const char *bridge_ifname, int val);
-
- /**
- * update_dh_ie - Update DH IE
- * @priv: Private driver interface data
- * @peer_mac: Peer MAC address
- * @reason_code: Reacon code
- * @ie: DH IE
- * @ie_len: DH IE length in bytes
- * Returns: 0 on success, -1 on failure
- *
- * This callback is used to let the driver know the DH processing result
- * and DH IE for a pending association.
- */
- int (*update_dh_ie)(void *priv, const u8 *peer_mac, u16 reason_code,
- const u8 *ie, size_t ie_len);
};
/**
@@ -4616,15 +4541,6 @@
EVENT_CH_SWITCH,
/**
- * EVENT_CH_SWITCH_STARTED - AP or GO started to switch channels
- *
- * This is a pre-switch event indicating the shortly following switch
- * of operating channels.
- *
- * Described in wpa_event_data.ch_switch
- */
- EVENT_CH_SWITCH_STARTED,
- /**
* EVENT_WNM - Request WNM operation
*
* This event can be used to request a WNM operation to be performed.
@@ -4787,11 +4703,6 @@
* This event is emitted when an interface is added/removed for WDS STA.
*/
EVENT_WDS_STA_INTERFACE_STATUS,
-
- /**
- * EVENT_UPDATE_DH - Notification of updated DH information
- */
- EVENT_UPDATE_DH,
};
@@ -5625,15 +5536,6 @@
INTERFACE_REMOVED
} istatus;
} wds_sta_interface;
-
- /**
- * struct update_dh - Data for EVENT_UPDATE_DH
- */
- struct update_dh {
- const u8 *peer;
- const u8 *ie;
- size_t ie_len;
- } update_dh;
};
/**