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

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

Merge ca9e93d3 on remote branch 

Change-Id: I1f3f27fdc9f0b4c63ebd568a2ea006b9678b93d5
parents 3505bf33 ca9e93d3

Kbuild

+6 −0
Original line number Diff line number Diff line
@@ -1884,6 +1884,12 @@ ifeq ($(CONFIG_ARCH_SDM670), y) 
CDEFINES += -DENABLE_SMMU_S1_TRANSLATION

endif



ifeq ($(CONFIG_ARCH_SDXPOORWILLS), y)

ifeq ($(CONFIG_ROME_IF),pci)

CDEFINES += -DENABLE_SMMU_S1_TRANSLATION

endif

endif



ifeq ($(CONFIG_DYNAMIC_DEBUG),y)

CDEFINES += -DFEATURE_MULTICAST_HOST_FW_MSGS

endif

core/cds/inc/cds_utils.h

+5 −1
Original line number Diff line number Diff line
@@ -103,6 +103,9 @@ enum cds_band_type { 
 *			connection and scan but switch off the async scan

 * ENABLE_DBS_CXN_AND_DISABLE_DBS_SCAN: Enable DBS support for connection and

 *          disable DBS support for scan

 * ENABLE_DBS_CXN_AND_DISABLE_SIMULTANEOUS_SCAN: Enable DBS

 *          support for connection and disable simultaneous scan

 *          from upper layer (DBS scan remains enabled in FW)

 */

enum dbs_support {

	ENABLE_DBS_CXN_AND_SCAN,
@@ -111,6 +114,7 @@ enum dbs_support { 
	DISABLE_DBS_CXN_AND_ENABLE_DBS_SCAN_WITH_ASYNC_SCAN_OFF,

	ENABLE_DBS_CXN_AND_ENABLE_SCAN_WITH_ASYNC_SCAN_OFF,

	ENABLE_DBS_CXN_AND_DISABLE_DBS_SCAN,

	ENABLE_DBS_CXN_AND_DISABLE_SIMULTANEOUS_SCAN,

};



/*-------------------------------------------------------------------------

core/dp/htt/htt_rx.c

+30 −0
Original line number Diff line number Diff line
@@ -2163,6 +2163,9 @@ static int htt_rx_mon_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, 
	uint32_t len;

	uint32_t last_frag;

	qdf_dma_addr_t paddr;

	static uint8_t preamble_type;

	static uint32_t vht_sig_a_1;

	static uint32_t vht_sig_a_2;



	HTT_ASSERT1(htt_rx_in_order_ring_elems(pdev) != 0);
@@ -2237,6 +2240,33 @@ static int htt_rx_mon_amsdu_rx_in_order_pop_ll(htt_pdev_handle pdev, 
		prev = msdu;



		HTT_PKT_DUMP(htt_print_rx_desc(rx_desc));



		/*

		 * Only the first mpdu has valid preamble type, so use it

		 * till the last mpdu is reached

		 */

		if (rx_desc->attention.first_mpdu) {

			preamble_type = rx_desc->ppdu_start.preamble_type;

			if (preamble_type == 8 || preamble_type == 9 ||

			   preamble_type == 0x0c || preamble_type == 0x0d) {

				vht_sig_a_1 = VHT_SIG_A_1(rx_desc);

				vht_sig_a_2 = VHT_SIG_A_2(rx_desc);

			}

		} else {

			rx_desc->ppdu_start.preamble_type = preamble_type;

			if (preamble_type == 8 || preamble_type == 9 ||

			   preamble_type == 0x0c || preamble_type == 0x0d) {

				VHT_SIG_A_1(rx_desc) = vht_sig_a_1;

				VHT_SIG_A_2(rx_desc) = vht_sig_a_2;

			}

		}



		if (rx_desc->attention.last_mpdu) {

			preamble_type = 0;

			vht_sig_a_1 = 0;

			vht_sig_a_2 = 0;

		}



		/*

		 * Make the netbuf's data pointer point to the payload rather

		 * than the descriptor.

core/dp/txrx/ol_txrx_types.h

+3 −2
Original line number Diff line number Diff line
@@ -374,9 +374,10 @@ struct ol_tx_sched_t; 
#ifndef OL_TXRX_NUM_LOCAL_PEER_IDS

/*

 * Each AP will occupy one ID, so it will occupy two IDs for AP-AP mode.

 * And the remainder IDs will be assigned to other 32 clients.

 * Clients will be assigned max 32 IDs.

 * STA(associated)/P2P DEV (self-PEER) will get one ID.

 */

#define OL_TXRX_NUM_LOCAL_PEER_IDS (2 + 32)

#define OL_TXRX_NUM_LOCAL_PEER_IDS (32 + 1 + 1 + 1)

#endif



#ifndef ol_txrx_local_peer_id_t

core/hdd/inc/wlan_hdd_cfg.h

+3 −1
Original line number Diff line number Diff line
@@ -9687,6 +9687,8 @@ enum dot11p_mode { 
 * 4 - enable DBS for connection as well as for scan with async

 *			scan policy disabled.

 * 5 - enable DBS for connection but disable dbs for scan.

 * 6 - enable DBS for connection but disable simultaneous scan

 *			from upper layer (DBS scan remains enabled in FW).

 *

 * Note: INI item value should match 'enum dbs_support'

 *
@@ -9700,7 +9702,7 @@ enum dot11p_mode { 
 */

#define CFG_DUAL_MAC_FEATURE_DISABLE               "gDualMacFeatureDisable"

#define CFG_DUAL_MAC_FEATURE_DISABLE_MIN          (0)

#define CFG_DUAL_MAC_FEATURE_DISABLE_MAX          (5)

#define CFG_DUAL_MAC_FEATURE_DISABLE_MAX          (6)

#define CFG_DUAL_MAC_FEATURE_DISABLE_DEFAULT      (0)



/*