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

Commit e34582fc authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "qcacld-3.0: Fix No AMSDU/MPDU aggregation issue"" into... 

Merge "Revert "qcacld-3.0: Fix No AMSDU/MPDU aggregation issue"" into wlan-cld3.driver.lnx.2.0.8.r3-rel
parents 20489725 d5873c19

core/wma/src/wma_features.c

+4 −6
Original line number Diff line number Diff line
@@ -4029,12 +4029,9 @@ QDF_STATUS wma_set_tx_rx_aggr_size(uint8_t vdev_id, 
	/* bit 2 (aggr_type): TX Aggregation Type (0=A-MPDU, 1=A-MSDU) */

	if (aggr_type == WMI_VDEV_CUSTOM_AGGR_TYPE_AMSDU)

		cmd->enable_bitmap |= 0x04;

	/* Set bit3(tx_aggr_size_disable) if tx_aggr_size is invalid */

	if (tx_size == 0)

		cmd->enable_bitmap |= (0x1 << 3);

	/* Set bit4(rx_aggr_size_disable) if rx_aggr_size is invalid */

	/* bit 3 (tx_aggr_size_disable):  If set tx_aggr_size is invalid */

	if (rx_size == 0)

		cmd->enable_bitmap |= (0x1 << 4);

		cmd->enable_bitmap |= (0x1 << 3);



	cmd->enable_bitmap |= (0x1 << 6);
@@ -4098,6 +4095,7 @@ QDF_STATUS wma_set_tx_rx_aggr_size_per_ac(WMA_HANDLE handle, 
		cmd->rx_aggr_size = qos_aggr->rx_aggregation_size;

		cmd->tx_aggr_size = tx_aggr_size[queue_num];

		/* bit 5: tx_ac_enable, if set, ac bitmap is valid. */

		if (cmd->rx_aggr_size != 0)

			cmd->enable_bitmap = 0x20 | queue_num;

		/* bit 2 (aggr_type): TX Aggregation Type (0=A-MPDU, 1=A-MSDU) */

		if (aggr_type == WMI_VDEV_CUSTOM_AGGR_TYPE_AMSDU)