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

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

Merge "qcacld-3.0: revert Disable TX_AGGREGATION_SIZE ini for HSP" into... 

Merge "qcacld-3.0: revert Disable TX_AGGREGATION_SIZE ini for HSP" into wlan-cld3.driver.lnx.2.0.8.r3-rel
parents b6cacddd c8e1fdd8

configs/default_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ ifeq ($(CONFIG_CNSS_QCA6490), y) 
	CONFIG_GENERIC_SHADOW_REGISTER_ACCESS_ENABLE :=y

	CONFIG_WLAN_TWT_SAP_STA_COUNT := y

	CONFIG_WLAN_TWT_SAP_PDEV_COUNT := y

	CONFIG_TX_AGGREGATION_SIZE_ENABLE := n

	CONFIG_DUMP_REO_QUEUE_INFO_IN_DDR :=y

endif

core/wma/src/wma_features.c

+0 −7
Original line number Diff line number Diff line
@@ -4049,11 +4049,6 @@ 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;

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

	if (rx_size == 0)

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



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



	wma_debug("tx aggr: %d rx aggr: %d vdev: %d enable_bitmap %d",

		 cmd->tx_aggr_size, cmd->rx_aggr_size, cmd->vdev_id,
@@ -4130,8 +4125,6 @@ QDF_STATUS wma_set_tx_rx_aggr_size_per_ac(WMA_HANDLE handle, 
		}



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

		if (cmd->rx_aggr_size != 0)

			cmd->enable_bitmap = 0x20 | queue_num;

		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)