A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-11 07:03:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "qcacld-3.0: Fix max dwell time for passive scan beacon report"

Browse source 
This reverts Change-Id Idc0b4f15f2b7464507aacfaefb99e1ba48ad1eca.

"qcacld-3.0: Fix max dwell time for passive scan beacon report"
introduced a change to allow some of the RRM parameters to be
controlled by the existing gRrmOperChanMax & gRrmNonOperChanMax INI
items.  However those INI items are obsolete, having been replaced
with rm_capability.  So revert the change, and a subsequent change
will update the default value of rm_capability to correctly solve the
original issue.

Change-Id: Ie67f9f95ea6832a5aec706a8ec0a42ee49b4844c
CRs-Fixed: 1060775
This commit is contained in:
Jeff Johnson 2016-09-08 14:35:36 -07:00
commit 1c17173df3
4 changed files with 7 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
core/hdd/inc/wlan_hdd_cfg.h
View file

@ -827,13 +827,13 @@ typedef enum {
#define CFG_RRM_OPERATING_CHAN_MAX_DURATION_NAME "gRrmOperChanMax" /* section 11.10.3 IEEE std. 802.11k-2008 */
#define CFG_RRM_OPERATING_CHAN_MAX_DURATION_MIN (0) /* Maxduration = 2^(maxDuration - 4) * bcnIntvl. */
#define CFG_RRM_OPERATING_CHAN_MAX_DURATION_MAX (7)
#define CFG_RRM_OPERATING_CHAN_MAX_DURATION_DEFAULT (4) /* max duration = 2^0 * bcnIntvl (100% of bcn intvl) */
#define CFG_RRM_OPERATING_CHAN_MAX_DURATION_MAX (8)
#define CFG_RRM_OPERATING_CHAN_MAX_DURATION_DEFAULT (3) /* max duration = 2^-1 * bcnIntvl (50% of bcn intvl) */
#define CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_NAME "gRrmNonOperChanMax" /* Same as above. */
#define CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_MIN (0)
#define CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_MAX (7)
#define CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_DEFAULT (4)
#define CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_MAX (8)
#define CFG_RRM_NON_OPERATING_CHAN_MAX_DURATION_DEFAULT (3)
#define CFG_RRM_MEAS_RANDOMIZATION_INTVL_NAME "gRrmRandnIntvl"
#define CFG_RRM_MEAS_RANDOMIZATION_INTVL_MIN (10)
@ -850,7 +850,7 @@ typedef enum {
* Comma is used as a separator for each byte.
*/
#define CFG_RM_CAPABILITY_NAME "rm_capability"
#define CFG_RM_CAPABILITY_DEFAULT "73,10,91,00,04"
#define CFG_RM_CAPABILITY_DEFAULT "73,10,6D,00,04"
#define CFG_QOS_IMPLICIT_SETUP_ENABLED_NAME "ImplicitQosIsEnabled"
#define CFG_QOS_IMPLICIT_SETUP_ENABLED_MIN (0)

12
core/hdd/src/wlan_hdd_cfg.c
View file

@ -6937,18 +6937,6 @@ QDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx)
hdd_hex_string_to_u8_array(pConfig->rm_capability,
smeConfig->rrmConfig.rm_capability, &rrm_capab_len,
DOT11F_IE_RRMENABLEDCAP_MAX_LEN);
/*
* Update the INI values gRrmOperChanMax and gRrmNonOperChanMax
* appropriately
*/
smeConfig->rrmConfig.rm_capability[2] =
((pConfig->nOutChanMeasMaxDuration <<
CAP_NONOPER_CHAN_MAX_DURATION_OFFSET) |
(pConfig->nOutChanMeasMaxDuration <<
CAP_OPER_CHAN_MAX_DURATION_OFFSET) |
(smeConfig->rrmConfig.rm_capability[2] &
(RM_CAP_RM_MIB | RM_CAP_AP_CHAN_REPORT)));
/* Remaining config params not obtained from registry
* On RF EVB beacon using channel 1.
*/

2
core/mac/src/pe/include/rrm_global.h
View file

@ -225,8 +225,6 @@ typedef struct sRrmPEContext {
#define RCPI_MAX_VALUE (220)
#define CALCULATE_RCPI(rssi) (((rssi) + 110) * 2)
#define CAP_OPER_CHAN_MAX_DURATION_OFFSET 2
#define CAP_NONOPER_CHAN_MAX_DURATION_OFFSET 5
/* Bit mask are defined as per Draft P802.11REVmc_D4.2 */
/**

4
core/mac/src/pe/rrm/rrm_api.c
View file

@ -1301,8 +1301,8 @@ tSirRetStatus rrm_initialize(tpAniSirGlobal pMac)
pRRMCaps->fine_time_meas_rpt = 1;
pRRMCaps->lci_capability = 1;
pRRMCaps->operatingChanMax = 4;
pRRMCaps->nonOperatingChanMax = 4;
pRRMCaps->operatingChanMax = 3;
pRRMCaps->nonOperatingChanMax = 3;
return eSIR_SUCCESS;
}