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/ap/hostapd.h b/src/ap/hostapd.h
index 44ef753..607bb95 100644
--- a/src/ap/hostapd.h
+++ b/src/ap/hostapd.h
@@ -232,10 +232,6 @@
struct wps_stat wps_stats;
#endif /* CONFIG_WPS */
-#ifdef CONFIG_MACSEC
- struct ieee802_1x_kay *kay;
-#endif /* CONFIG_MACSEC */
-
struct hostapd_probereq_cb *probereq_cb;
size_t num_probereq_cb;
@@ -383,13 +379,6 @@
unsigned int dpp_ignore_netaccesskey_mismatch:1;
#endif /* CONFIG_TESTING_OPTIONS */
#endif /* CONFIG_DPP */
-
-#ifdef CONFIG_AIRTIME_POLICY
- unsigned int num_backlogged_sta;
- unsigned int airtime_weight;
-#endif /* CONFIG_AIRTIME_POLICY */
-
- u8 last_1x_eapol_key_replay_counter[8];
};
@@ -553,12 +542,6 @@
unsigned int num_sta_seen;
u8 dfs_domain;
-#ifdef CONFIG_AIRTIME_POLICY
- unsigned int airtime_quantum;
-#endif /* CONFIG_AIRTIME_POLICY */
-
- /* Previous WMM element information */
- struct hostapd_wmm_ac_params prev_wmm[WMM_AC_NUM];
};
/* hostapd.c */
@@ -625,8 +608,7 @@
const u8 *bssid, const u8 *ie, size_t ie_len,
int ssi_signal);
void hostapd_event_ch_switch(struct hostapd_data *hapd, int freq, int ht,
- int offset, int width, int cf1, int cf2,
- int finished);
+ int offset, int width, int cf1, int cf2);
struct survey_results;
void hostapd_event_get_survey(struct hostapd_iface *iface,
struct survey_results *survey_results);