mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-12-24 23:19:31 -05:00
102 lines
3.3 KiB
Diff
102 lines
3.3 KiB
Diff
|
From 50ba575e9cd28ab9537f0961bbc051a6a727da74 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Insun Song <insun.song@broadcom.com>
|
||
|
|
Date: Wed, 30 Nov 2016 12:00:17 -0800
|
||
|
|
Subject: [PATCH] net: wireless: bcmdhd: fix hotlist index in
|
||
|
|
wl_cfgvendor_hotlist_cfg
|
||
|
|
|
||
|
|
add bssid count element to exactly refer in NL-TLV parsing.
|
||
|
|
|
||
|
|
This change need to sync with
|
||
|
|
/hardware/broadcom/wlan/bcmdhd/wifi_hal/gscan.cpp
|
||
|
|
where GSCAN_ATTRIBUTE_HOTLIST_BSSID_COUNT supposed to be called.
|
||
|
|
|
||
|
|
Bug: 32474971
|
||
|
|
|
||
|
|
Signed-off-by: Insun Song <insun.song@broadcom.com>
|
||
|
|
Change-Id: Id2b019bb43fb99b3843fe1b32f59e58c7af7cdad
|
||
|
|
---
|
||
|
|
drivers/net/wireless/bcmdhd/wl_cfgvendor.c | 39 ++++++++++++++++++++++++------
|
||
|
|
drivers/net/wireless/bcmdhd/wl_cfgvendor.h | 1 +
|
||
|
|
2 files changed, 32 insertions(+), 8 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/net/wireless/bcmdhd/wl_cfgvendor.c b/drivers/net/wireless/bcmdhd/wl_cfgvendor.c
|
||
|
|
index b156660ed053a..9a73de20f1298 100644
|
||
|
|
--- a/drivers/net/wireless/bcmdhd/wl_cfgvendor.c
|
||
|
|
+++ b/drivers/net/wireless/bcmdhd/wl_cfgvendor.c
|
||
|
|
@@ -705,7 +705,7 @@ static int wl_cfgvendor_hotlist_cfg(struct wiphy *wiphy,
|
||
|
|
GFP_KERNEL);
|
||
|
|
|
||
|
|
if (!hotlist_params) {
|
||
|
|
- WL_ERR(("Cannot Malloc mem to parse config commands size - %d bytes \n", len));
|
||
|
|
+ WL_ERR(("Cannot Malloc mem.\n"));
|
||
|
|
return -ENOMEM;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -714,10 +714,33 @@ static int wl_cfgvendor_hotlist_cfg(struct wiphy *wiphy,
|
||
|
|
nla_for_each_attr(iter, data, len, tmp2) {
|
||
|
|
type = nla_type(iter);
|
||
|
|
switch (type) {
|
||
|
|
+ case GSCAN_ATTRIBUTE_HOTLIST_BSSID_COUNT:
|
||
|
|
+ if (nla_len(iter) != sizeof(uint32)) {
|
||
|
|
+ WL_DBG(("type:%d length:%d not matching.\n",
|
||
|
|
+ type, nla_len(inner)));
|
||
|
|
+ err = -EINVAL;
|
||
|
|
+ goto exit;
|
||
|
|
+ }
|
||
|
|
+ hotlist_params->nbssid = (uint16)nla_get_u32(iter);
|
||
|
|
+ if ((hotlist_params->nbssid == 0) ||
|
||
|
|
+ (hotlist_params->nbssid > PFN_SWC_MAX_NUM_APS)) {
|
||
|
|
+ WL_ERR(("nbssid:%d exceed limit.\n",
|
||
|
|
+ hotlist_params->nbssid));
|
||
|
|
+ err = -EINVAL;
|
||
|
|
+ goto exit;
|
||
|
|
+ }
|
||
|
|
+ break;
|
||
|
|
case GSCAN_ATTRIBUTE_HOTLIST_BSSIDS:
|
||
|
|
+ if (hotlist_params->nbssid == 0) {
|
||
|
|
+ WL_ERR(("nbssid not retrieved.\n"));
|
||
|
|
+ err = -EINVAL;
|
||
|
|
+ goto exit;
|
||
|
|
+ }
|
||
|
|
pbssid = hotlist_params->bssid;
|
||
|
|
nla_for_each_nested(outer, iter, tmp) {
|
||
|
|
nla_for_each_nested(inner, outer, tmp1) {
|
||
|
|
+ if (j >= hotlist_params->nbssid)
|
||
|
|
+ break;
|
||
|
|
type = nla_type(inner);
|
||
|
|
|
||
|
|
switch (type) {
|
||
|
|
@@ -754,13 +777,13 @@ static int wl_cfgvendor_hotlist_cfg(struct wiphy *wiphy,
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
- if (++j > PFN_SWC_MAX_NUM_APS) {
|
||
|
|
- WL_DBG(("nbssid:%d exeed limit.\n",
|
||
|
|
- hotlist_params->nbssid));
|
||
|
|
- err = -EINVAL;
|
||
|
|
- goto exit;
|
||
|
|
- }
|
||
|
|
- hotlist_params->nbssid = j;
|
||
|
|
+ j++;
|
||
|
|
+ }
|
||
|
|
+ if (j != hotlist_params->nbssid) {
|
||
|
|
+ WL_ERR(("bssid_cnt:%d != nbssid:%d.\n", j,
|
||
|
|
+ hotlist_params->nbssid));
|
||
|
|
+ err = -EINVAL;
|
||
|
|
+ goto exit;
|
||
|
|
}
|
||
|
|
break;
|
||
|
|
case GSCAN_ATTRIBUTE_HOTLIST_FLUSH:
|
||
|
|
diff --git a/drivers/net/wireless/bcmdhd/wl_cfgvendor.h b/drivers/net/wireless/bcmdhd/wl_cfgvendor.h
|
||
|
|
index e6cb53a1de087..e15666f720e50 100644
|
||
|
|
--- a/drivers/net/wireless/bcmdhd/wl_cfgvendor.h
|
||
|
|
+++ b/drivers/net/wireless/bcmdhd/wl_cfgvendor.h
|
||
|
|
@@ -203,6 +203,7 @@ enum gscan_attributes {
|
||
|
|
GSCAN_ATTRIBUTE_RSSI_HIGH,
|
||
|
|
GSCAN_ATTRIBUTE_HOSTLIST_BSSID_ELEM,
|
||
|
|
GSCAN_ATTRIBUTE_HOTLIST_FLUSH,
|
||
|
|
+ GSCAN_ATTRIBUTE_HOTLIST_BSSID_COUNT,
|
||
|
|
|
||
|
|
/* remaining reserved for additional attributes */
|
||
|
|
GSCAN_ATTRIBUTE_RSSI_SAMPLE_SIZE = 60,
|