Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8aaf956f authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge de4c9c27 on remote branch

Change-Id: I982302c29f3aeaf45366acad6f550de4aff29437
parents 64bc95c7 de4c9c27
Loading
Loading
Loading
Loading
+4 −0
Original line number Original line Diff line number Diff line
@@ -106,7 +106,11 @@ do { \
 * (Exception frames and TQM bypass frames)
 * (Exception frames and TQM bypass frames)
 */
 */
#define HAL_TX_COMP_HTT_STATUS_OFFSET 8
#define HAL_TX_COMP_HTT_STATUS_OFFSET 8
#ifdef CONFIG_BERYLLIUM
#define HAL_TX_COMP_HTT_STATUS_LEN 20
#else
#define HAL_TX_COMP_HTT_STATUS_LEN 16
#define HAL_TX_COMP_HTT_STATUS_LEN 16
#endif


#define HAL_TX_BUF_TYPE_BUFFER 0
#define HAL_TX_BUF_TYPE_BUFFER 0
#define HAL_TX_BUF_TYPE_EXT_DESC 1
#define HAL_TX_BUF_TYPE_EXT_DESC 1
+10 −0
Original line number Original line Diff line number Diff line
@@ -1023,6 +1023,11 @@ static QDF_STATUS target_if_dbr_replenish_ring(struct wlan_objmgr_pdev *pdev,
		return QDF_STATUS_E_FAILURE;
		return QDF_STATUS_E_FAILURE;
	}
	}


	if (cookie >= mod_param->dbr_ring_cfg->num_ptr) {
		direct_buf_rx_err("invalid cookie %d", cookie);
		return QDF_STATUS_E_INVAL;
	}

	dbr_psoc_obj = wlan_objmgr_psoc_get_comp_private_obj(psoc,
	dbr_psoc_obj = wlan_objmgr_psoc_get_comp_private_obj(psoc,
				WLAN_TARGET_IF_COMP_DIRECT_BUF_RX);
				WLAN_TARGET_IF_COMP_DIRECT_BUF_RX);


@@ -1504,6 +1509,11 @@ static void *target_if_dbr_vaddr_lookup(


	dbr_buf_pool = mod_param->dbr_buf_pool;
	dbr_buf_pool = mod_param->dbr_buf_pool;


	if (cookie >= mod_param->dbr_ring_cfg->num_ptr) {
		direct_buf_rx_err("invalid cookie %d", cookie);
		return NULL;
	}

	if (dbr_buf_pool[cookie].paddr == paddr) {
	if (dbr_buf_pool[cookie].paddr == paddr) {
		return dbr_buf_pool[cookie].vaddr +
		return dbr_buf_pool[cookie].vaddr +
				dbr_buf_pool[cookie].offset;
				dbr_buf_pool[cookie].offset;