Parcourir la source

qcacld-3.0: Remove DISA fields from tSmeStruct

Change Ia44acd9a3e31bf0d1098f7d423f0c28a2b7fe5fa ("qcacld-3.0: Cleanup
WMA and SME code related to DISA") removed the SME DISA code, but it
left behind the encrypt_decrypt_cb and encrypt_decrypt_context fields
in tSmeStruct. Since these are now obsolete, remove them, along with
their underlying type definitions.

Change-Id: I7bf5d737b89cc9604310b7c18c510f42f73ec971
CRs-Fixed: 2374842
Jeff Johnson il y a 6 ans
Parent
commit
7e6e127ce7
2 fichiers modifiés avec 1 ajouts et 29 suppressions
  1. 0 14
      core/mac/inc/sir_api.h
  2. 1 15
      core/sme/inc/sme_internal.h

+ 0 - 14
core/mac/inc/sir_api.h

@@ -5712,20 +5712,6 @@ struct sme_update_access_policy_vendor_ie {
 	uint8_t access_policy;
 };
 
-/**
- * struct sir_encrypt_decrypt_rsp_params - encrypt/decrypt rsp params
- * @vdev_id: vdev id
- * @status: status
- * @data_length: data length
- * @data: data pointer
- */
-struct sir_encrypt_decrypt_rsp_params {
-	uint32_t vdev_id;
-	int32_t status;
-	uint32_t data_length;
-	uint8_t *data;
-};
-
 /**
  * struct sme_tx_fail_cnt_threshold - tx failure count for disconnect to fw
  * @session_id: Session id

+ 1 - 15
core/sme/inc/sme_internal.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
@@ -172,18 +172,6 @@ typedef void (*apf_read_mem_cb)(void *context,
 typedef void (*rssi_threshold_breached_cb)(hdd_handle_t hdd_handle,
 					   struct rssi_breach_event *event);
 
-/**
- * typedef sme_encrypt_decrypt_callback - encrypt/decrypt callback
- *    signature
- * @context: Opaque context that the client can use to associate the
- *    callback with the request
- * @response: Encrypt/Decrypt response from firmware
- */
-struct sir_encrypt_decrypt_rsp_params;
-typedef void (*sme_encrypt_decrypt_callback)(
-			void *context,
-			struct sir_encrypt_decrypt_rsp_params *response);
-
 /**
  * typedef get_chain_rssi_callback - get chain rssi callback
  * @context: Opaque context that the client can use to associate the
@@ -307,8 +295,6 @@ typedef struct tagSmeStruct {
 #ifdef FEATURE_OEM_DATA_SUPPORT
 	sme_send_oem_data_rsp_msg oem_data_rsp_callback;
 #endif
-	sme_encrypt_decrypt_callback encrypt_decrypt_cb;
-	void *encrypt_decrypt_context;
 	lost_link_info_cb lost_link_info_cb;
 
 	bool (*set_connection_info_cb)(bool);