summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbhinav Kumar <abhikuma@codeaurora.org>2019-01-07 13:54:31 +0530
committerAbhinav Kumar <abhikuma@codeaurora.org>2019-01-07 14:44:26 +0530
commit6c4d875656a1752f645bc82ae7ddbb44660cf735 (patch)
tree4ca8d0791b616ece91a54fe2cc18442fec932e19
parent6f4b8b16230855ece02ba34b77fd57ced3d0a191 (diff)
qcacld-3.0: Remove obsolete WEP configuration
Remove wepType field from struct tSetStaKeyParams, as it is an obsolete WEP configuration. Change-Id: I895541bef0cc08a75ba7c54e792ad15002ff0b0c CRs-Fixed: 2373003
-rw-r--r--core/mac/inc/ani_system_defs.h7
-rw-r--r--core/mac/src/pe/lim/lim_security_utils.c3
-rw-r--r--core/wma/inc/wma_if.h4
3 files changed, 3 insertions, 11 deletions
diff --git a/core/mac/inc/ani_system_defs.h b/core/mac/inc/ani_system_defs.h
index 5e0b2b77ba12..9cf44ca3f203 100644
--- a/core/mac/inc/ani_system_defs.h
+++ b/core/mac/inc/ani_system_defs.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-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
@@ -92,11 +92,6 @@ typedef enum eAniEdType {
eSIR_ED_NOT_IMPLEMENTED = SIR_MAX_ENUM_SIZE
} tAniEdType;
-typedef enum eAniWepType {
- eSIR_WEP_STATIC,
- eSIR_WEP_DYNAMIC,
-} tAniWepType;
-
/* / Enum to specify whether key is used */
/* / for TX only, RX only or both */
typedef enum eAniKeyDirection {
diff --git a/core/mac/src/pe/lim/lim_security_utils.c b/core/mac/src/pe/lim/lim_security_utils.c
index 0dfea1845473..d23ccb3751c8 100644
--- a/core/mac/src/pe/lim/lim_security_utils.c
+++ b/core/mac/src/pe/lim/lim_security_utils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-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
@@ -967,7 +967,6 @@ void lim_send_set_sta_key_req(tpAniSirGlobal pMac,
(uint8_t *) &pMlmSetKeysReq->
key[i], sizeof(tSirKeys));
}
- pSetStaKeyParams->wepType = eSIR_WEP_STATIC;
sessionEntry->limMlmState =
eLIM_MLM_WT_SET_STA_KEY_STATE;
MTRACE(mac_trace
diff --git a/core/wma/inc/wma_if.h b/core/wma/inc/wma_if.h
index 81b75f0e59d9..845dd93785e8 100644
--- a/core/wma/inc/wma_if.h
+++ b/core/wma/inc/wma_if.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-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
@@ -348,7 +348,6 @@ typedef struct {
* struct tSetStaKeyParams - set key params
* @staIdx: station id
* @encType: encryption type
- * @wepType: WEP type
* @defWEPIdx: Default WEP key, valid only for static WEP, must between 0 and 3
* @key: valid only for non-static WEP encyrptions
* @singleTidRc: 1=Single TID based Replay Count, 0=Per TID based RC
@@ -366,7 +365,6 @@ typedef struct {
typedef struct {
uint16_t staIdx;
tAniEdType encType;
- tAniWepType wepType;
uint8_t defWEPIdx;
tSirKeys key[SIR_MAC_MAX_NUM_OF_DEFAULT_KEYS];
uint8_t singleTidRc;