Pārlūkot izejas kodu

qcacld-3.0: Remove obsolete collectedAuthType

The struct hdd_wext_state_s currently contains the field
collectedAuthType. This field is currently written, but is
never read, and hence it is useless, so remove all traces of it.

Change-Id: Ica2fc7a54cc92c8d4394cdcdd9470f624f705848
CRs-Fixed: 2004184
Jeff Johnson 8 gadi atpakaļ
vecāks
revīzija
34746020bb
2 mainītis faili ar 1 papildinājumiem un 14 dzēšanām
  1. 0 1
      core/hdd/inc/wlan_hdd_wext.h
  2. 1 13
      core/hdd/src/wlan_hdd_assoc.c

+ 0 - 1
core/hdd/inc/wlan_hdd_wext.h

@@ -265,7 +265,6 @@ typedef struct hdd_wext_state_s {
 #ifdef FEATURE_WLAN_ESE
 	/* ESE state variables */
 	bool isESEConnection;
-	eCsrAuthType collectedAuthType; /* Collected from ALL SIOCSIWAUTH Ioctls. Will be negotiatedAuthType - in tCsrProfile */
 #endif
 } hdd_wext_state_t;
 

+ 1 - 13
core/hdd/src/wlan_hdd_assoc.c

@@ -5954,28 +5954,16 @@ static int __iw_set_auth(struct net_device *dev, struct iw_request_info *info,
 			/* Set the key management to 802.1X */
 			/* pWextState->authKeyMgmt = IW_AUTH_KEY_MGMT_802_1X; */
 			pWextState->isESEConnection = true;
-			/*
-			 * This is test code. I need to actually KNOW whether
-			 * this is an RSN Assoc or WPA.
-			 */
-			pWextState->collectedAuthType =
-				eCSR_AUTH_TYPE_CCKM_RSN;
 		} else if (wrqu->param.value & IW_AUTH_KEY_MGMT_PSK) {
 			/* Save the key management */
 			pWextState->authKeyMgmt |= IW_AUTH_KEY_MGMT_PSK;
-			pWextState->collectedAuthType =
-				eCSR_AUTH_TYPE_RSN;
-		} else
-		if (!(wrqu->param.value & IW_AUTH_KEY_MGMT_802_1X)) {
-			pWextState->collectedAuthType = eCSR_AUTH_TYPE_NONE;
+		} else if (!(wrqu->param.value & IW_AUTH_KEY_MGMT_802_1X)) {
 			/* Save the key management anyway */
 			pWextState->authKeyMgmt = wrqu->param.value;
 		} else {                /* It must be IW_AUTH_KEY_MGMT_802_1X */
 			/* Save the key management */
 			pWextState->authKeyMgmt |=
 				IW_AUTH_KEY_MGMT_802_1X;
-			pWextState->collectedAuthType =
-				eCSR_AUTH_TYPE_RSN;
 		}
 #else
 		/* Save the key management */