From 94b3303ffd120fa3cfb0a930428eea3a7f69e987 Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Wed, 26 Dec 2018 19:51:42 -0800 Subject: [PATCH] qcacld-3.0: Remove ucSecEnabled from struct sap_context Field ucSecEnabled in struct sap_context is initialized, but is otherwise unused, so remove it. Change-Id: I4b947be54d86e0e7e272b97427efd7acb4658fe6 CRs-Fixed: 2374275 --- core/sap/src/sap_internal.h | 5 ----- core/sap/src/sap_module.c | 11 ++--------- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/core/sap/src/sap_internal.h b/core/sap/src/sap_internal.h index 0904bafcdc4e..0f8f30d97003 100644 --- a/core/sap/src/sap_internal.h +++ b/core/sap/src/sap_internal.h @@ -50,8 +50,6 @@ extern "C" { #define SAP_DFS_NON_OCCUPANCY_PERIOD (30 * 60 * 1000 * 1000) #define SAP_DEBUG -/* Used to enable or disable security on the BT-AMP link */ -#define WLANSAP_SECURITY_ENABLED_STATE true /* MAC Address length */ #define ANI_EAPOL_KEY_RSN_NONCE_SIZE 32 @@ -142,9 +140,6 @@ struct sap_context { /* Include the associations MAC addresses */ uint8_t self_mac_addr[CDS_MAC_ADDRESS_LEN]; - /* Flag for signaling if security is enabled */ - uint8_t ucSecEnabled; - /* Include the SME(CSR) context here */ struct csr_roam_profile csr_roamProfile; uint32_t csr_roamId; diff --git a/core/sap/src/sap_module.c b/core/sap/src/sap_module.c index f2f1c40069d5..d7c1f5a7decb 100644 --- a/core/sap/src/sap_module.c +++ b/core/sap/src/sap_module.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -289,14 +289,7 @@ QDF_STATUS sap_init_ctx(struct sap_context *sap_ctx, return QDF_STATUS_E_FAULT; } - /*------------------------------------------------------------------------ - For now, presume security is not enabled. - -----------------------------------------------------------------------*/ - sap_ctx->ucSecEnabled = WLANSAP_SECURITY_ENABLED_STATE; - - /*------------------------------------------------------------------------ - Now configure the roaming profile links. To SSID and bssid. - ------------------------------------------------------------------------*/ + /* Now configure the roaming profile links. To SSID and bssid.*/ /* We have room for two SSIDs. */ sap_ctx->csr_roamProfile.SSIDs.numOfSSIDs = 1; /* This is true for now. */ sap_ctx->csr_roamProfile.SSIDs.SSIDList = sap_ctx->SSIDList; /* Array of two */