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_nl80211.h b/src/drivers/driver_nl80211.h
index 7498269..1e7fe7a 100644
--- a/src/drivers/driver_nl80211.h
+++ b/src/drivers/driver_nl80211.h
@@ -83,12 +83,6 @@
u8 rand_addr[ETH_ALEN];
};
-struct drv_nl80211_if_info {
- int ifindex;
- /* the AP/AP_VLAN iface that is in this bridge */
- int reason;
-};
-
struct wpa_driver_nl80211_data {
struct nl80211_global *global;
struct dl_list list;
@@ -169,6 +163,7 @@
unsigned int scan_vendor_cmd_avail:1;
unsigned int connect_reassoc:1;
unsigned int set_wifi_conf_vendor_cmd_avail:1;
+ unsigned int he_capab_vendor_cmd_avail:1;
unsigned int fetch_bss_trans_status:1;
unsigned int roam_vendor_cmd_avail:1;
unsigned int get_supported_akm_suites_avail:1;
@@ -193,8 +188,11 @@
struct nl_handle *rtnl_sk; /* nl_sock for NETLINK_ROUTE */
- struct drv_nl80211_if_info default_if_indices[16];
- struct drv_nl80211_if_info *if_indices;
+ int default_if_indices[16];
+ /* the AP/AP_VLAN iface that is in this bridge */
+ int default_if_indices_reason[16];
+ int *if_indices;
+ int *if_indices_reason;
int num_if_indices;
/* From failed authentication command */
@@ -217,6 +215,8 @@
* (NL80211_CMD_VENDOR). 0 if no pending scan request.
*/
int last_scan_cmd;
+
+ struct he_capabilities he_capab;
};
struct nl_msg;