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

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

Merge b278abc3 on remote branch 

Change-Id: I8ab56cc4ad98a284d7b75b83d865e85a93200914
parents 730ee60f b278abc3

dp/wifi3.0/dp_main.c

+2 −1
Original line number Diff line number Diff line
@@ -5456,7 +5456,8 @@ static QDF_STATUS dp_vdev_attach_wifi3(struct cdp_soc_t *cdp_soc, 
	qdf_spin_unlock_bh(&pdev->vdev_list_lock);

	pdev->vdev_count++;



	if (wlan_op_mode_sta != vdev->opmode)

	if (wlan_op_mode_sta != vdev->opmode &&

	    wlan_op_mode_ndi != vdev->opmode)

		vdev->ap_bridge_enabled = true;

	else

		vdev->ap_bridge_enabled = false;

target_if/spectral/target_if_spectral.h

+4 −0
Original line number Diff line number Diff line
@@ -1546,6 +1546,10 @@ void target_if_spectral_process_phyerr( 
	}



	p_sops = GET_TARGET_IF_SPECTRAL_OPS(spectral);

	if (!p_sops->spectral_process_phyerr) {

		spectral_err("null spectral_process_phyerr");

		return;

	}

	p_sops->spectral_process_phyerr(spectral, data, datalen,

					p_rfqual, p_chaninfo,

					tsf64, acs_stats);

umac/scan/core/src/wlan_scan_bss_score.c

+4 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017-2020 The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -117,10 +118,10 @@ void scm_validate_scoring_config(struct scoring_config *score_cfg) 
		       score_cfg->weight_cfg.channel_congestion_weightage +

		       score_cfg->weight_cfg.oce_wan_weightage;



	if (total_weight > BEST_CANDIDATE_MAX_WEIGHT) {

	if (total_weight > MAX_BSS_SCORE) {



		scm_err("total weight is greater than %d fallback to default values",

			BEST_CANDIDATE_MAX_WEIGHT);

			MAX_BSS_SCORE);



		score_cfg->weight_cfg.rssi_weightage = RSSI_WEIGHTAGE;

		score_cfg->weight_cfg.ht_caps_weightage =

umac/scan/core/src/wlan_scan_cache_db.h

+2 −3
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017-2020 The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -34,8 +35,6 @@ 
	(((const uint8_t *)(addr))[QDF_MAC_ADDR_SIZE - 1] % SCAN_HASH_SIZE)



#define SCM_PCL_RSSI_THRESHOLD -75

#define BEST_CANDIDATE_MAX_BSS_SCORE 10000



#define ADJACENT_CHANNEL_RSSI_THRESHOLD -80



/**

umac/scan/dispatcher/inc/wlan_scan_public_structs.h

+5 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2017-2020 The Linux Foundation. All rights reserved.

 * Copyright (c) 2017-2021 The Linux Foundation. All rights reserved.

 * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for

 * any purpose with or without fee is hereby granted, provided that the
@@ -70,10 +71,13 @@ typedef uint32_t wlan_scan_id; 
#define CHANNEL_CONGESTION_WEIGHTAGE 5

#define OCE_WAN_WEIGHTAGE 0

#define BEST_CANDIDATE_MAX_WEIGHT 100

#define MAX_BSS_SCORE 200

#define MAX_INDEX_SCORE 100

#define MAX_INDEX_PER_INI 4

#define SAE_PK_AP_WEIGHTAGE 3



#define BEST_CANDIDATE_MAX_BSS_SCORE (MAX_BSS_SCORE * 100)



#define WLAN_GET_BITS(_val, _index, _num_bits) \

	(((_val) >> (_index)) & ((1 << (_num_bits)) - 1))