Procházet zdrojové kódy

qcacld-3.0: Remove encPolicy from tDphHashNode

The encPolicy member of tDphHashNode is initialized but is otherwise
never modified or read. Since it is obsolete, remove it, along with
the macros that define the values that it formerly used.

Change-Id: If6698217b6c7d10840f0776c77678861be026c2b
CRs-Fixed: 2414653
Jeff Johnson před 6 roky
rodič
revize
223169db3f

+ 0 - 1
core/mac/src/dph/dph_hash_table.c

@@ -248,7 +248,6 @@ tpDphHashNode dph_init_sta_state(struct mac_context *mac, tSirMacAddr staAddr,
 		sta->fragSize = (uint16_t) val;
 
 	sta->added = 1;
-	sta->encPolicy = ENC_POLICY_NULL;
 	sta->is_disassoc_deauth_in_progress = 0;
 	sta->last_assoc_received_time = 0;
 	sta->last_disassoc_deauth_received_time = 0;

+ 0 - 1
core/mac/src/include/dph_global.h

@@ -95,7 +95,6 @@ typedef struct sDphHashNode {
 	 * This STA valid or not
 	 */
 	uint8_t valid:1;
-	uint8_t encPolicy:3;
 	uint8_t qosMode:1;
 	uint8_t erpEnabled:1;
 	/* This has been added to the dph hash table */

+ 0 - 16
core/wma/inc/wma_if.h

@@ -66,22 +66,6 @@
 /* invalid channel id. */
 #define INVALID_CHANNEL_ID 0
 
-/*
- * From NOVA Mac Arch document
- *  Encryp. mode    The encryption mode
- *  000: Encryption functionality is not enabled
- *  001: Encryption is set to WEP
- *  010: Encryption is set to WEP 104
- *  011: Encryption is set to TKIP
- *  100: Encryption is set to AES
- *  101 - 111: Reserved for future
- */
-#define ENC_POLICY_NULL        0
-#define ENC_POLICY_WEP40       1
-#define ENC_POLICY_WEP104      2
-#define ENC_POLICY_TKIP        3
-#define ENC_POLICY_AES_CCM     4
-
 /**
  * enum eFrameType - frame types
  * @TXRX_FRM_RAW: raw frame