Revert "[wpa_supplicant] Cumulative patch from c4e90da6d"
This reverts commit 39bc25d3a79c1375de430a7918d949c1a86f70c6.
Test: Compilation
Change-Id: Iae7670429466958911b5296cb1359bceecc0b03e
Exempt-From-Owner-Approval: Revert since it's breaking the build
diff --git a/src/rsn_supp/wpa.h b/src/rsn_supp/wpa.h
index 9eee383..21f4b17 100644
--- a/src/rsn_supp/wpa.h
+++ b/src/rsn_supp/wpa.h
@@ -18,7 +18,6 @@
struct eapol_sm;
struct wpa_config_blob;
struct hostapd_freq_params;
-struct wpa_channel_info;
struct wpa_sm_ctx {
void *ctx; /* pointer to arbitrary upper level context */
@@ -83,7 +82,6 @@
int (*key_mgmt_set_pmk)(void *ctx, const u8 *pmk, size_t pmk_len);
void (*fils_hlp_rx)(void *ctx, const u8 *dst, const u8 *src,
const u8 *pkt, size_t pkt_len);
- int (*channel_info)(void *ctx, struct wpa_channel_info *ci);
};
@@ -97,8 +95,7 @@
WPA_PARAM_KEY_MGMT,
WPA_PARAM_MGMT_GROUP,
WPA_PARAM_RSN_ENABLED,
- WPA_PARAM_MFP,
- WPA_PARAM_OCV
+ WPA_PARAM_MFP
};
struct rsn_supp_config {
@@ -144,7 +141,6 @@
int wpa_sm_get_status(struct wpa_sm *sm, char *buf, size_t buflen,
int verbose);
int wpa_sm_pmf_enabled(struct wpa_sm *sm);
-int wpa_sm_ocv_enabled(struct wpa_sm *sm);
void wpa_sm_key_request(struct wpa_sm *sm, int error, int pairwise);
@@ -283,11 +279,6 @@
return 0;
}
-static inline int wpa_sm_ocv_enabled(struct wpa_sm *sm)
-{
- return 0;
-}
-
static inline void wpa_sm_key_request(struct wpa_sm *sm, int error,
int pairwise)
{