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/drivers/driver_common.c b/src/drivers/driver_common.c
index e55e6cd..ac0916e 100644
--- a/src/drivers/driver_common.c
+++ b/src/drivers/driver_common.c
@@ -115,25 +115,6 @@
}
-int channel_width_to_int(enum chan_width width)
-{
- switch (width) {
- case CHAN_WIDTH_20_NOHT:
- case CHAN_WIDTH_20:
- return 20;
- case CHAN_WIDTH_40:
- return 40;
- case CHAN_WIDTH_80:
- return 80;
- case CHAN_WIDTH_80P80:
- case CHAN_WIDTH_160:
- return 160;
- default:
- return 0;
- }
-}
-
-
int ht_supported(const struct hostapd_hw_modes *mode)
{
if (!(mode->flags & HOSTAPD_MODE_FLAG_HT_INFO_KNOWN)) {
@@ -253,8 +234,7 @@
DF2S(DRIVER_IE);
DF2S(SET_KEYS_AFTER_ASSOC);
DF2S(DFS_OFFLOAD);
- DF2S(4WAY_HANDSHAKE_PSK);
- DF2S(4WAY_HANDSHAKE_8021X);
+ DF2S(4WAY_HANDSHAKE);
DF2S(WIRED);
DF2S(SME);
DF2S(AP);