Bladeren bron

qcacld-3.0: Remove INIT_TX_RX_SUCCESS adapter flag

Remove the INIT_TX_RX_SUCCESS adapter flag as its
functionality is insignificant after DP componentization.

Change-Id: Ief86ab81c42b767113bde46252246fa8677588ce
CRs-Fixed: 3399329
Vinod Kumar Pirla 2 jaren geleden
bovenliggende
commit
812d01784f

+ 0 - 16
components/dp/dispatcher/inc/wlan_dp_ucfg_api.h

@@ -304,22 +304,6 @@ bool ucfg_dp_is_rx_threads_enabled(struct wlan_objmgr_psoc *psoc);
 QDF_STATUS ucfg_dp_rx_ol_init(struct wlan_objmgr_psoc *psoc,
 			      bool is_wifi3_0_target);
 
-/**
- * ucfg_dp_init_txrx() - Initialize STA DP init TX/RX
- * @vdev: vdev mapped to STA DP interface
- *
- * Return: 0 on success and non zero on failure.
- */
-QDF_STATUS ucfg_dp_init_txrx(struct wlan_objmgr_vdev *vdev);
-
-/**
- * ucfg_dp_deinit_txrx() - Deinitialize STA DP init TX/RX
- * @vdev: vdev mapped to STA DP interface
- *
- * Return: 0 on success and non zero on failure.
- */
-QDF_STATUS ucfg_dp_deinit_txrx(struct wlan_objmgr_vdev *vdev);
-
 /**
  * ucfg_dp_start_xmit() - Transmit packet on STA interface
  * @nbuf: n/w buffer to transmitted

+ 0 - 27
components/dp/dispatcher/src/wlan_dp_ucfg_api.c

@@ -1185,33 +1185,6 @@ QDF_STATUS ucfg_dp_register_pkt_capture_callbacks(struct wlan_objmgr_vdev *vdev)
 						   dp_intf);
 }
 
-QDF_STATUS ucfg_dp_init_txrx(struct wlan_objmgr_vdev *vdev)
-{
-	struct wlan_dp_intf *dp_intf;
-
-	dp_intf = dp_get_vdev_priv_obj(vdev);
-	if (unlikely(!dp_intf)) {
-		dp_err("DP interface not found");
-		return QDF_STATUS_E_INVAL;
-	}
-
-	return QDF_STATUS_SUCCESS;
-}
-
-QDF_STATUS ucfg_dp_deinit_txrx(struct wlan_objmgr_vdev *vdev)
-{
-	struct wlan_dp_intf *dp_intf;
-
-	dp_intf = dp_get_vdev_priv_obj(vdev);
-	if (unlikely(!dp_intf)) {
-		dp_err("DP interface not found");
-		return QDF_STATUS_E_INVAL;
-	}
-
-	dp_intf->tx_fn = NULL;
-	return QDF_STATUS_SUCCESS;
-}
-
 QDF_STATUS ucfg_dp_start_xmit(qdf_nbuf_t nbuf, struct wlan_objmgr_vdev *vdev)
 {
 	struct wlan_dp_intf *dp_intf;

+ 0 - 2
core/hdd/inc/wlan_hdd_main.h

@@ -258,7 +258,6 @@ static inline bool in_compat_syscall(void) { return is_compat_task(); }
  * enum hdd_adapter_flags - event bitmap flags registered net device
  * @NET_DEVICE_REGISTERED: Adapter is registered with the kernel
  * @SME_SESSION_OPENED: Firmware vdev has been created
- * @INIT_TX_RX_SUCCESS: Adapter datapath is initialized
  * @WMM_INIT_DONE: Adapter is initialized
  * @SOFTAP_BSS_STARTED: Software Access Point (SAP) is running
  * @DEVICE_IFACE_OPENED: Adapter has been "opened" via the kernel
@@ -269,7 +268,6 @@ static inline bool in_compat_syscall(void) { return is_compat_task(); }
 enum hdd_adapter_flags {
 	NET_DEVICE_REGISTERED,
 	SME_SESSION_OPENED,
-	INIT_TX_RX_SUCCESS,
 	WMM_INIT_DONE,
 	SOFTAP_BSS_STARTED,
 	DEVICE_IFACE_OPENED,

+ 6 - 17
core/hdd/src/wlan_hdd_main.c

@@ -6730,21 +6730,15 @@ QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter)
 	mac_handle = hdd_ctx->mac_handle;
 
 	vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_INIT_DEINIT_ID);
-	if (!vdev)
-		return QDF_STATUS_E_NULL_VALUE;
+	if (!vdev) {
+		status = QDF_STATUS_E_NULL_VALUE;
+		goto wext_unregister;
+	}
 
 	hdd_vdev_set_ht_vht_ies(mac_handle, vdev);
 	hdd_init_station_context(adapter);
 	hdd_register_wext(adapter->dev);
 
-	status = ucfg_dp_init_txrx(vdev);
-	if (QDF_STATUS_SUCCESS != status) {
-		hdd_err("ucfg_dp_init_txrx() failed, status code %d", status);
-		goto error_init_txrx;
-	}
-
-	set_bit(INIT_TX_RX_SUCCESS, &adapter->event_flags);
-
 	status = hdd_wmm_adapter_init(adapter);
 	if (QDF_STATUS_SUCCESS != status) {
 		hdd_err("hdd_wmm_adapter_init() failed, status code %08d [x%08x]",
@@ -6773,10 +6767,9 @@ QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter)
 	return QDF_STATUS_SUCCESS;
 
 error_wmm_init:
-	clear_bit(INIT_TX_RX_SUCCESS, &adapter->event_flags);
-	ucfg_dp_deinit_txrx(vdev);
-error_init_txrx:
 	hdd_objmgr_put_vdev_by_user(vdev, WLAN_INIT_DEINIT_ID);
+
+wext_unregister:
 	hdd_unregister_wext(adapter->dev);
 	QDF_BUG(!hdd_vdev_destroy(adapter));
 
@@ -6899,10 +6892,6 @@ static void hdd_deinit_station_mode(struct hdd_context *hdd_ctx,
 {
 	hdd_enter_dev(adapter->dev);
 
-	if (test_bit(INIT_TX_RX_SUCCESS, &adapter->event_flags)) {
-		clear_bit(INIT_TX_RX_SUCCESS, &adapter->event_flags);
-	}
-
 	if (test_bit(WMM_INIT_DONE, &adapter->event_flags)) {
 		hdd_wmm_adapter_close(adapter);
 		clear_bit(WMM_INIT_DONE, &adapter->event_flags);

+ 2 - 15
core/hdd/src/wlan_hdd_nan_datapath.c

@@ -597,19 +597,9 @@ int hdd_init_nan_data_mode(struct hdd_adapter *adapter)
 	vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_DP_ID);
 	if (!vdev) {
 		ret_val = -EAGAIN;
-		goto error_init_txrx;
+		goto wext_unregister;
 	}
 
-	status = ucfg_dp_init_txrx(vdev);
-	if (QDF_STATUS_SUCCESS != status) {
-		hdd_objmgr_put_vdev_by_user(vdev, WLAN_DP_ID);
-		hdd_err("ucfg_dp_init_tx_rx() init failed, status %d", status);
-		ret_val = -EAGAIN;
-		goto error_init_txrx;
-	}
-
-	set_bit(INIT_TX_RX_SUCCESS, &adapter->event_flags);
-
 	status = hdd_wmm_adapter_init(adapter);
 	if (QDF_STATUS_SUCCESS != status) {
 		hdd_err("hdd_wmm_adapter_init() failed, status %d", status);
@@ -649,13 +639,10 @@ int hdd_init_nan_data_mode(struct hdd_adapter *adapter)
 	return ret_val;
 
 error_wmm_init:
-	clear_bit(INIT_TX_RX_SUCCESS, &adapter->event_flags);
-	ucfg_dp_deinit_txrx(vdev);
 	hdd_objmgr_put_vdev_by_user(vdev, WLAN_DP_ID);
 
-error_init_txrx:
+wext_unregister:
 	hdd_wext_unregister(wlan_dev, true);
-
 	QDF_BUG(!hdd_vdev_destroy(adapter));
 
 	return ret_val;