From d084adb90ff403fb84846794bb7cafef474fec94 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Wed, 16 Aug 2017 11:19:52 -0700 Subject: [PATCH] qcacld-3.0: Remove isESEConnection from hdd_wext_state_t Currently hdd_wext_state_t defines field isESEConnection, but this field is only written in one place and never read, hence it is obsolete, so remove it. Change-Id: Ia110a11ae968b28b2c74e5b77b4bcca21f69a78f CRs-Fixed: 2094516 --- core/hdd/inc/wlan_hdd_wext.h | 4 ---- core/hdd/src/wlan_hdd_assoc.c | 6 +----- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/core/hdd/inc/wlan_hdd_wext.h b/core/hdd/inc/wlan_hdd_wext.h index 1fab6545951a..feda08156d0e 100644 --- a/core/hdd/inc/wlan_hdd_wext.h +++ b/core/hdd/inc/wlan_hdd_wext.h @@ -272,10 +272,6 @@ typedef struct hdd_wext_state_s { /**Counter measure state, Started/Stopped*/ bool mTKIPCounterMeasures; -#ifdef FEATURE_WLAN_ESE - /* ESE state variables */ - bool isESEConnection; -#endif } hdd_wext_state_t; struct ccp_freq_chan_map { diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 5f2654c10aab..4c0236a0ab8e 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -6218,11 +6218,7 @@ static int __iw_set_auth(struct net_device *dev, struct iw_request_info *info, * Right now, this breaks all ref to authKeyMgmt because * our code doesn't realize it is a "bitfield" */ - pWextState->authKeyMgmt |= - IW_AUTH_KEY_MGMT_CCKM; - /* Set the key management to 802.1X */ - /* pWextState->authKeyMgmt = IW_AUTH_KEY_MGMT_802_1X; */ - pWextState->isESEConnection = true; + pWextState->authKeyMgmt |= IW_AUTH_KEY_MGMT_CCKM; } else if (wrqu->param.value & IW_AUTH_KEY_MGMT_PSK) { /* Save the key management */ pWextState->authKeyMgmt |= IW_AUTH_KEY_MGMT_PSK;