mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-15 01:01:56 -04:00
Merge 1e1fac45ea on remote branch
Change-Id: I1ba2d96493d77a4d5c6c3e5254d54f36021f64bf
This commit is contained in:
commit
7aba5ed6c5
4 changed files with 15 additions and 4 deletions
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2022 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
|
||||
|
|
@ -261,7 +262,7 @@
|
|||
* gSoftApMaxPeers - Set Max peers connected for SAP
|
||||
* @Min: 1
|
||||
* @Max: 64
|
||||
* @Default: 32
|
||||
* @Default: 10
|
||||
*
|
||||
* This ini is used to set Max peers connected for SAP
|
||||
*
|
||||
|
|
@ -277,7 +278,7 @@
|
|||
"gSoftApMaxPeers", \
|
||||
1, \
|
||||
64, \
|
||||
32, \
|
||||
10, \
|
||||
CFG_VALUE_OR_DEFAULT, \
|
||||
"max no of peers")
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
/*
|
||||
* Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
|
||||
* Copyright (c) 2022 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
|
||||
|
|
@ -1347,6 +1348,10 @@ static int calcuate_max_phy_rate(int mode, int nss, int ch_width,
|
|||
if (mode == SIR_SME_PHY_MODE_HT) {
|
||||
/* check for HT Mode */
|
||||
maxidx = ht_mcs_idx;
|
||||
if (maxidx > 7) {
|
||||
hdd_err("ht_mcs_idx %d is incorrect", ht_mcs_idx);
|
||||
return maxrate;
|
||||
}
|
||||
if (nss == 1) {
|
||||
supported_mcs_rate = supported_mcs_rate_nss1;
|
||||
} else if (nss == 2) {
|
||||
|
|
|
|||
|
|
@ -18090,6 +18090,11 @@ static int con_mode_handler_ftm(const char *kmessage,
|
|||
|
||||
ret = param_set_int(kmessage, kp);
|
||||
|
||||
if (cds_is_driver_loaded() || cds_is_load_or_unload_in_progress()) {
|
||||
pr_err("Driver already loaded or load/unload in progress");
|
||||
return -ENOTSUPP;
|
||||
}
|
||||
|
||||
if (con_mode_ftm != QDF_GLOBAL_FTM_MODE) {
|
||||
pr_err("Only FTM mode supported!");
|
||||
return -ENOTSUPP;
|
||||
|
|
|
|||
|
|
@ -32,9 +32,9 @@
|
|||
#define QWLAN_VERSION_MAJOR 2
|
||||
#define QWLAN_VERSION_MINOR 0
|
||||
#define QWLAN_VERSION_PATCH 8
|
||||
#define QWLAN_VERSION_EXTRA "V"
|
||||
#define QWLAN_VERSION_EXTRA "Z"
|
||||
#define QWLAN_VERSION_BUILD 31
|
||||
|
||||
#define QWLAN_VERSIONSTR "2.0.8.31V"
|
||||
#define QWLAN_VERSIONSTR "2.0.8.31Z"
|
||||
|
||||
#endif /* QWLAN_VERSION_H */
|
||||
|
|
|
|||
Loading…
Reference in a new issue