Browse Source

qcacld-3.0: Removed WEP_DEFAULT_KEY

Removed WEP default key with the corresponding functions

Change-Id: I721b60969e6aea7f0abf58edcd4028dad5b03a25
CRs-Fixed: 2687348
Utkarsh Bhatnagar 4 years ago
parent
commit
3c5918e041

+ 0 - 7
core/hdd/src/wlan_hdd_hostapd.c

@@ -1968,13 +1968,6 @@ QDF_STATUS hdd_hostapd_sap_event_cb(struct sap_event *sap_event,
 		hostapd_state->bss_state = BSS_START;
 		hdd_start_tsf_sync(adapter);
 
-		/* Set default key index */
-		hdd_debug("default key index %hu", ap_ctx->wep_def_key_idx);
-
-		sme_roam_set_default_key_index(mac_handle,
-					       adapter->vdev_id,
-					       ap_ctx->wep_def_key_idx);
-
 		hdd_hostapd_set_sap_key(adapter);
 
 		/* Fill the params for sending IWEVCUSTOM Event

+ 2 - 3
core/mac/src/include/sir_params.h

@@ -559,10 +559,9 @@ struct sir_cfg_action_frm_tb_ppdu {
 #define SIR_HAL_SET_PDEV_IE_REQ             (SIR_HAL_ITC_MSG_TYPES_BEGIN + 345)
 
 /*
- * (SIR_HAL_ITC_MSG_TYPES_BEGIN + 346) thru
- * (SIR_HAL_ITC_MSG_TYPES_BEGIN + 357) are unused
+ * (SIR_HAL_ITC_MSG_TYPES_BEGIN + 346) to
+ * (SIR_HAL_ITC_MSG_TYPES_BEGIN + 359) are unused
  */
-#define SIR_HAL_UPDATE_WEP_DEFAULT_KEY      (SIR_HAL_ITC_MSG_TYPES_BEGIN + 358)
 
 #define SIR_HAL_SEND_FREQ_RANGE_CONTROL_IND (SIR_HAL_ITC_MSG_TYPES_BEGIN + 360)
 #define SIR_HAL_POWER_DBG_CMD               (SIR_HAL_ITC_MSG_TYPES_BEGIN + 362)

+ 0 - 1
core/mac/src/sys/legacy/src/utils/src/mac_trace.c

@@ -520,7 +520,6 @@ uint8_t *mac_trace_get_wma_msg_string(uint16_t wma_msg)
 		CASE_RETURN_STRING(WDA_APF_GET_CAPABILITIES_REQ);
 		CASE_RETURN_STRING(WMA_ROAM_SYNC_TIMEOUT);
 		CASE_RETURN_STRING(WMA_SET_PDEV_IE_REQ);
-		CASE_RETURN_STRING(WMA_UPDATE_WEP_DEFAULT_KEY);
 		CASE_RETURN_STRING(WMA_SEND_FREQ_RANGE_CONTROL_IND);
 		CASE_RETURN_STRING(WMA_POWER_DEBUG_STATS_REQ);
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD

+ 0 - 13
core/sme/inc/csr_api.h

@@ -1211,19 +1211,6 @@ struct csr_del_sta_params {
 	uint8_t subtype;
 };
 
-/**
- * struct wep_update_default_key_idx: wep default key index structure
- * @session_id: session ID for the connection session
- * @default_idx: default key index for wep
- *
- * structure includes sesssion id for connection and default key
- * index used for wep
- */
-struct wep_update_default_key_idx {
-	uint8_t session_id;
-	uint8_t default_idx;
-};
-
 typedef QDF_STATUS (*csr_roam_complete_cb)(struct wlan_objmgr_psoc *psoc,
 					   uint8_t session_id,
 					   struct csr_roam_info *param,

+ 0 - 3
core/sme/inc/sme_api.h

@@ -2118,9 +2118,6 @@ QDF_STATUS sme_process_mac_pwr_dbg_cmd(mac_handle_t mac_handle,
 
 void sme_get_vdev_type_nss(enum QDF_OPMODE dev_mode,
 			   uint8_t *nss_2g, uint8_t *nss_5g);
-QDF_STATUS sme_roam_set_default_key_index(mac_handle_t mac_handle,
-					  uint8_t session_id,
-					  uint8_t default_idx);
 void sme_send_disassoc_req_frame(mac_handle_t mac_handle,
 				 uint8_t session_id, uint8_t *peer_mac,
 				 uint16_t reason, uint8_t wait_for_ack);

+ 0 - 40
core/sme/src/common/sme_api.c

@@ -3352,46 +3352,6 @@ QDF_STATUS sme_oem_get_capability(mac_handle_t mac_handle,
 }
 #endif
 
-/**
- * sme_roam_set_default_key_index - To set default wep key idx
- * @mac_handle: Opaque handle to the global MAC context
- * @session_id: session id
- * @default_idx: default wep key index
- *
- * This function prepares a message and post to WMA to set wep default
- * key index
- *
- * Return: Success:QDF_STATUS_SUCCESS Failure: Error value
- */
-QDF_STATUS sme_roam_set_default_key_index(mac_handle_t mac_handle,
-					  uint8_t session_id,
-					  uint8_t default_idx)
-{
-	struct scheduler_msg msg = {0};
-	struct wep_update_default_key_idx *update_key;
-
-	update_key = qdf_mem_malloc(sizeof(*update_key));
-	if (!update_key)
-		return QDF_STATUS_E_NOMEM;
-
-	update_key->session_id = session_id;
-	update_key->default_idx = default_idx;
-
-	msg.type = WMA_UPDATE_WEP_DEFAULT_KEY;
-	msg.reserved = 0;
-	msg.bodyptr = (void *)update_key;
-
-	if (QDF_STATUS_SUCCESS !=
-	    scheduler_post_message(QDF_MODULE_ID_SME,
-				   QDF_MODULE_ID_WMA,
-				   QDF_MODULE_ID_WMA, &msg)) {
-		qdf_mem_free(update_key);
-		return QDF_STATUS_E_FAILURE;
-	}
-
-	return QDF_STATUS_SUCCESS;
-}
-
 /*
  * sme_get_snr() -
  * A wrapper function that client calls to register a callback to get SNR

+ 0 - 2
core/wma/inc/wma.h

@@ -689,7 +689,6 @@ struct wma_invalid_peer_params {
  * @delay_before_vdev_stop: delay
  * @tx_streams: number of tx streams can be used by the vdev
  * @mac_id: the mac on which vdev is on
- * @wep_default_key_idx: wep default index for group key
  * @arp_offload_req: cached arp offload request
  * @ns_offload_req: cached ns offload request
  * @rcpi_req: rcpi request
@@ -743,7 +742,6 @@ struct wma_txrx_node {
 	uint32_t mac_id;
 	bool roaming_in_progress;
 	int32_t roam_synch_delay;
-	uint8_t wep_default_key_idx;
 	struct sme_rcpi_req *rcpi_req;
 	bool in_bmps;
 	struct beacon_filter_param beacon_filter;

+ 0 - 1
core/wma/inc/wma_types.h

@@ -388,7 +388,6 @@
 #define WMA_ROAM_SYNC_TIMEOUT                SIR_HAL_WMA_ROAM_SYNC_TIMEOUT
 
 #define WMA_SET_PDEV_IE_REQ                  SIR_HAL_SET_PDEV_IE_REQ
-#define WMA_UPDATE_WEP_DEFAULT_KEY           SIR_HAL_UPDATE_WEP_DEFAULT_KEY
 #define WMA_SEND_FREQ_RANGE_CONTROL_IND      SIR_HAL_SEND_FREQ_RANGE_CONTROL_IND
 #define WMA_POWER_DEBUG_STATS_REQ            SIR_HAL_POWER_DEBUG_STATS_REQ
 #define WMA_BEACON_DEBUG_STATS_REQ           SIR_HAL_BEACON_DEBUG_STATS_REQ

+ 0 - 24
core/wma/src/wma_main.c

@@ -7196,25 +7196,6 @@ void wma_send_flush_logs_to_fw(tp_wma_handle wma_handle)
 		WMA_LOGE("Failed to start the log completion timer");
 }
 
-/**
- * wma_update_wep_default_key - To update default key id
- * @wma: pointer to wma handler
- * @update_def_key: pointer to wep_update_default_key_idx
- *
- * This function makes a copy of default key index to txrx node
- *
- * Return: Success
- */
-static QDF_STATUS wma_update_wep_default_key(tp_wma_handle wma,
-			struct wep_update_default_key_idx *update_def_key)
-{
-	struct wma_txrx_node *iface =
-		&wma->interfaces[update_def_key->session_id];
-	iface->wep_default_key_idx = update_def_key->default_idx;
-
-	return QDF_STATUS_SUCCESS;
-}
-
 /**
  * wma_update_tx_fail_cnt_th() - Set threshold for TX pkt fail
  * @wma_handle: WMA handle
@@ -8789,11 +8770,6 @@ static QDF_STATUS wma_mc_process_msg(struct scheduler_msg *msg)
 					    msg->bodyptr);
 		qdf_mem_free(msg->bodyptr);
 		break;
-	case WMA_UPDATE_WEP_DEFAULT_KEY:
-		wma_update_wep_default_key(wma_handle,
-			(struct wep_update_default_key_idx *)msg->bodyptr);
-		qdf_mem_free(msg->bodyptr);
-		break;
 	case WMA_SEND_FREQ_RANGE_CONTROL_IND:
 		wma_enable_disable_caevent_ind(wma_handle, msg->bodyval);
 		break;