mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-10-01 05:35:54 +00:00
63 lines
2.6 KiB
Diff
63 lines
2.6 KiB
Diff
From 856abd9ad16d9d69e688d06a1f548c2f8df67c02 Mon Sep 17 00:00:00 2001
|
|
From: Srinivas Girigowda <sgirigow@codeaurora.org>
|
|
Date: Fri, 11 Aug 2017 12:58:11 -0700
|
|
Subject: [PATCH] qcacld-2.0: Add an attribute to represent PNO/EPNO Request ID
|
|
|
|
This request ID was wrongly referred from the REQUEST_ID in
|
|
enum qca_wlan_vendor_attr_gscan_config_params which is mapped to
|
|
QCA_WLAN_VENDOR_ATTR_PNO_PASSPOINT_LIST_PARAM_NUM in PNO Config.
|
|
Hence define a different attribute to represent the request ID
|
|
for the PNO Config.
|
|
|
|
CRs-Fixed: 2066628
|
|
Change-Id: I2b5efe78605d07d92db564a987ea0ae4ff0a2cc8
|
|
Bug: 36815952
|
|
Signed-off-by: Srinivas Girigowda <sgirigow@codeaurora.org>
|
|
---
|
|
drivers/staging/qcacld-2.0/CORE/HDD/inc/wlan_hdd_cfg80211.h | 2 ++
|
|
drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_cfg80211.c | 7 +++++--
|
|
2 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/staging/qcacld-2.0/CORE/HDD/inc/wlan_hdd_cfg80211.h b/drivers/staging/qcacld-2.0/CORE/HDD/inc/wlan_hdd_cfg80211.h
|
|
index 23770788afd2a..bf3b4fe65d961 100644
|
|
--- a/drivers/staging/qcacld-2.0/CORE/HDD/inc/wlan_hdd_cfg80211.h
|
|
+++ b/drivers/staging/qcacld-2.0/CORE/HDD/inc/wlan_hdd_cfg80211.h
|
|
@@ -1285,6 +1285,8 @@ enum qca_wlan_vendor_attr_pno_config_params {
|
|
*/
|
|
QCA_WLAN_VENDOR_ATTR_EPNO_BAND5GHZ_BONUS = 22,
|
|
|
|
+ /* Unsigned 32-bit value, representing the PNO Request ID */
|
|
+ QCA_WLAN_VENDOR_ATTR_PNO_CONFIG_REQUEST_ID = 23,
|
|
|
|
/* keep last */
|
|
QCA_WLAN_VENDOR_ATTR_PNO_AFTER_LAST,
|
|
diff --git a/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_cfg80211.c b/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_cfg80211.c
|
|
index 9029ef3b9e4a3..178cf32975efb 100644
|
|
--- a/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_cfg80211.c
|
|
+++ b/drivers/staging/qcacld-2.0/CORE/HDD/src/wlan_hdd_cfg80211.c
|
|
@@ -901,6 +901,9 @@ wlan_hdd_pno_config_policy[QCA_WLAN_VENDOR_ATTR_PNO_MAX + 1] = {
|
|
[QCA_WLAN_VENDOR_ATTR_EPNO_BAND5GHZ_BONUS] = {
|
|
.type = NLA_U32
|
|
},
|
|
+ [QCA_WLAN_VENDOR_ATTR_PNO_CONFIG_REQUEST_ID] = {
|
|
+ .type = NLA_U32
|
|
+ },
|
|
};
|
|
|
|
static const struct nla_policy
|
|
@@ -4607,12 +4610,12 @@ static int __wlan_hdd_cfg80211_set_epno_list(struct wiphy *wiphy,
|
|
req_msg->num_networks = num_networks;
|
|
|
|
/* Parse and fetch request Id */
|
|
- if (!tb[QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_REQUEST_ID]) {
|
|
+ if (!tb[QCA_WLAN_VENDOR_ATTR_PNO_CONFIG_REQUEST_ID]) {
|
|
hddLog(LOGE, FL("attr request id failed"));
|
|
goto fail;
|
|
}
|
|
req_msg->request_id = nla_get_u32(
|
|
- tb[QCA_WLAN_VENDOR_ATTR_EXTSCAN_SUBCMD_CONFIG_PARAM_REQUEST_ID]);
|
|
+ tb[QCA_WLAN_VENDOR_ATTR_PNO_CONFIG_REQUEST_ID]);
|
|
|
|
req_msg->session_id = adapter->sessionId;
|
|
hddLog(LOG1, FL("Req Id %u Session Id %d"),
|