Explorar o código

qcacld-3.0: Remove WMA_TDLS_SET_OFFCHAN_MODE handling

As part of TDLS componentization the handling of TDLS off-channel was
relocated to the TDLS component. Subsequently change
I983851d8cc0d3605c3d6bd0d8975c72844f71740 ("qcacld-3.0: TDLS: remove
remaining legacy code") removed the logic which previously sent the
WMA_TDLS_SET_OFFCHAN_MODE message. Unfortuntely it left behind the
legacy logic which processed this message. Since this legacy logic is
obsolete, remove it.

Change-Id: Idb5c1af9a06ce744bb8a689fc40700f3837ad0fc
CRs-Fixed: 2396062
Jeff Johnson %!s(int64=6) %!d(string=hai) anos
pai
achega
b13a559dfb

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

@@ -527,9 +527,7 @@ struct sir_cfg_action_frm_tb_ppdu {
 #define SIR_HAL_ROAM_INVOKE                  (SIR_HAL_ITC_MSG_TYPES_BEGIN + 227)
 #endif
 
-#ifdef FEATURE_WLAN_TDLS
-#define SIR_HAL_TDLS_SET_OFFCHAN_MODE        (SIR_HAL_ITC_MSG_TYPES_BEGIN + 228)
-#endif
+/* (SIR_HAL_ITC_MSG_TYPES_BEGIN + 228) is unused */
 
 #define SIR_HAL_SET_MAS                    (SIR_HAL_ITC_MSG_TYPES_BEGIN + 229)
 #define SIR_HAL_SET_MIRACAST               (SIR_HAL_ITC_MSG_TYPES_BEGIN + 230)

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

@@ -595,7 +595,6 @@ uint8_t *mac_trace_get_wma_msg_string(uint16_t wma_msg)
 		CASE_RETURN_STRING(WMA_TDLS_SHOULD_DISCOVER_CMD);
 		CASE_RETURN_STRING(WMA_TDLS_SHOULD_TEARDOWN_CMD);
 		CASE_RETURN_STRING(WMA_TDLS_PEER_DISCONNECTED_CMD);
-		CASE_RETURN_STRING(WMA_TDLS_SET_OFFCHAN_MODE);
 #endif
 		CASE_RETURN_STRING(WMA_DFS_BEACON_TX_SUCCESS_IND);
 		CASE_RETURN_STRING(WMA_DISASSOC_TX_COMP);

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

@@ -1022,25 +1022,6 @@ typedef struct sTdlsPeerStateParams {
 	bool resp_reqd;
 } tTdlsPeerStateParams;
 
-/**
- * struct tdls_chan_switch_params - channel switch parameter structure
- * @vdev_id: vdev ID
- * @peer_mac_addr: Peer mac address
- * @tdls_off_ch_bw_offset: Target off-channel bandwitdh offset
- * @tdls_off_ch: Target Off Channel
- * @oper_class: Operating class for target channel
- * @is_responder: Responder or initiator
- */
-typedef struct tdls_chan_switch_params_struct {
-	uint32_t    vdev_id;
-	tSirMacAddr peer_mac_addr;
-	uint16_t    tdls_off_ch_bw_offset;
-	uint8_t     tdls_off_ch;
-	uint8_t     tdls_sw_mode;
-	uint8_t     oper_class;
-	uint8_t     is_responder;
-} tdls_chan_switch_params;
-
 #endif /* FEATURE_WLAN_TDLS */
 
 /**

+ 0 - 11
core/wma/inc/wma_internal.h

@@ -1256,17 +1256,6 @@ QDF_STATUS wma_process_ch_avoid_update_req(tp_wma_handle wma_handle,
 
 int wma_update_tdls_peer_state(WMA_HANDLE handle,
 			       tTdlsPeerStateParams *peerStateParams);
-/**
- * wma_set_tdls_offchan_mode() - set tdls off channel mode
- * @handle: wma handle
- * @chan_switch_params: Pointer to tdls channel switch parameter structure
- *
- * This function sets tdls off channel mode
- *
- * Return: 0 on success; negative errno otherwise
- */
-QDF_STATUS wma_set_tdls_offchan_mode(WMA_HANDLE wma_handle,
-			      tdls_chan_switch_params *chan_switch_params);
 #endif
 
 void wma_set_vdev_mgmt_rate(tp_wma_handle wma, uint8_t vdev_id);

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

@@ -336,7 +336,6 @@
 #define WMA_TDLS_SHOULD_DISCOVER_CMD      SIR_HAL_TDLS_SHOULD_DISCOVER
 #define WMA_TDLS_SHOULD_TEARDOWN_CMD      SIR_HAL_TDLS_SHOULD_TEARDOWN
 #define WMA_TDLS_PEER_DISCONNECTED_CMD    SIR_HAL_TDLS_PEER_DISCONNECTED
-#define WMA_TDLS_SET_OFFCHAN_MODE         SIR_HAL_TDLS_SET_OFFCHAN_MODE
 #endif
 #define WMA_SET_SAP_INTRABSS_DIS          SIR_HAL_SET_SAP_INTRABSS_DIS
 

+ 0 - 51
core/wma/src/wma_features.c

@@ -4045,57 +4045,6 @@ int wma_tdls_event_handler(void *handle, uint8_t *event, uint32_t len)
 	return 0;
 }
 
-/**
- * wma_set_tdls_offchan_mode() - set tdls off channel mode
- * @handle: wma handle
- * @chan_switch_params: Pointer to tdls channel switch parameter structure
- *
- * This function sets tdls off channel mode
- *
- * Return: 0 on success; Negative errno otherwise
- */
-QDF_STATUS wma_set_tdls_offchan_mode(WMA_HANDLE handle,
-			      tdls_chan_switch_params *chan_switch_params)
-{
-	tp_wma_handle wma_handle = (tp_wma_handle) handle;
-	struct tdls_channel_switch_params params = {0};
-	QDF_STATUS ret = QDF_STATUS_SUCCESS;
-
-	if (!wma_handle || !wma_handle->wmi_handle) {
-		WMA_LOGE(FL(
-			    "WMA is closed, can not issue tdls off channel cmd"
-			 ));
-		ret = -EINVAL;
-		goto end;
-	}
-
-	if (wma_is_roam_synch_in_progress(wma_handle,
-					  chan_switch_params->vdev_id)) {
-		WMA_LOGE("%s: roaming in progress, reject offchan mode cmd!",
-			 __func__);
-		ret = -EPERM;
-		goto end;
-	}
-
-	params.vdev_id = chan_switch_params->vdev_id;
-	params.tdls_off_ch_bw_offset =
-			chan_switch_params->tdls_off_ch_bw_offset;
-	params.tdls_off_ch = chan_switch_params->tdls_off_ch;
-	params.tdls_sw_mode = chan_switch_params->tdls_sw_mode;
-	params.oper_class = chan_switch_params->oper_class;
-	params.is_responder = chan_switch_params->is_responder;
-	qdf_mem_copy(params.peer_mac_addr, chan_switch_params->peer_mac_addr,
-		     IEEE80211_ADDR_LEN);
-
-	ret = wmi_unified_set_tdls_offchan_mode_cmd(wma_handle->wmi_handle,
-							&params);
-
-end:
-	if (chan_switch_params)
-		qdf_mem_free(chan_switch_params);
-	return ret;
-}
-
 /**
  * wma_update_tdls_peer_state() - update TDLS peer state
  * @handle: wma handle

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

@@ -8504,10 +8504,6 @@ static QDF_STATUS wma_mc_process_msg(struct scheduler_msg *msg)
 		wma_update_tdls_peer_state(wma_handle,
 				(tTdlsPeerStateParams *) msg->bodyptr);
 		break;
-	case WMA_TDLS_SET_OFFCHAN_MODE:
-		wma_set_tdls_offchan_mode(wma_handle,
-			(tdls_chan_switch_params *)msg->bodyptr);
-		break;
 #endif /* FEATURE_WLAN_TDLS */
 	case WMA_ADD_PERIODIC_TX_PTRN_IND:
 		wma_process_add_periodic_tx_ptrn_ind(wma_handle,