diff --git a/drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg80211.c b/drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg80211.c index 25b9f1a802e36b7c7a9acf2735b43e61ffd15388..6fb9842e08044c05c1b6243cd4b6204d259beafa 100755 --- a/drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/drivers/staging/prima/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -469,6 +469,14 @@ typedef enum DATA_RATE_11AC_MAX_MCS_NA } eDataRate11ACMaxMcs; +/* SSID broadcast type */ +typedef enum eSSIDBcastType +{ + eBCAST_UNKNOWN = 0, + eBCAST_NORMAL = 1, + eBCAST_HIDDEN = 2, +} tSSIDBcastType; + /* MCS Based VHT rate table */ static struct index_vht_data_rate_type supported_vht_mcs_rate[] = { @@ -7132,7 +7140,7 @@ static int wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, tpSirPNOScanReq pPnoRequest = NULL; hdd_context_t *pHddCtx; tHalHandle hHal; - v_U32_t i, indx, num_ch; + v_U32_t i, indx, num_ch, j; u8 valid_ch[WNI_CFG_VALID_CHANNEL_LIST_LEN]; u8 channels_allowed[WNI_CFG_VALID_CHANNEL_LIST_LEN]; v_U32_t num_channels_allowed = WNI_CFG_VALID_CHANNEL_LIST_LEN; @@ -7237,7 +7245,7 @@ static int wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, request->match_sets[i].ssid.ssid_len); pPnoRequest->aNetworks[i].authentication = 0; /*eAUTH_TYPE_ANY*/ pPnoRequest->aNetworks[i].encryption = 0; /*eED_ANY*/ - pPnoRequest->aNetworks[i].bcastNetwType = 0; /*eBCAST_UNKNOWN*/ + pPnoRequest->aNetworks[i].bcastNetwType = eBCAST_NORMAL; /*eBCAST_NORMAL*/ /*Copying list of valid channel into request */ memcpy(pPnoRequest->aNetworks[i].aChannels, valid_ch, num_ch); @@ -7246,6 +7254,26 @@ static int wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy, pPnoRequest->aNetworks[i].rssiThreshold = 0; //Default value } + for (i = 0; i < request->n_ssids; i++) + { + j = 0; + while (j < pPnoRequest->ucNetworksCount) + { + if ((pPnoRequest->aNetworks[j].ssId.length == + request->ssids[i].ssid_len) && + (0 == memcmp(pPnoRequest->aNetworks[j].ssId.ssId, + request->ssids[i].ssid, + pPnoRequest->aNetworks[j].ssId.length))) + { + pPnoRequest->aNetworks[j].bcastNetwType = eBCAST_HIDDEN; + break; + } + j++; + } + } + VOS_TRACE(VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO, + "Number of hidden networks being Configured = %d", + request->n_ssids); /* framework provides interval in ms */ pPnoRequest->scanTimers.ucScanTimersCount = 1; pPnoRequest->scanTimers.aTimerValues[0].uTimerValue = diff --git a/drivers/staging/prima/CORE/MAC/inc/qwlan_version.h b/drivers/staging/prima/CORE/MAC/inc/qwlan_version.h index 740194f2bf7074354cc89bb0e8b2fb636fbae930..2c8fdff9d36a667ddd21fe3e582440e3db40a728 100644 --- a/drivers/staging/prima/CORE/MAC/inc/qwlan_version.h +++ b/drivers/staging/prima/CORE/MAC/inc/qwlan_version.h @@ -60,9 +60,9 @@ BRIEF DESCRIPTION: #define QWLAN_VERSION_MINOR 2 #define QWLAN_VERSION_PATCH 3 #define QWLAN_VERSION_EXTRA "" -#define QWLAN_VERSION_BUILD 19 +#define QWLAN_VERSION_BUILD 22 -#define QWLAN_VERSIONSTR "3.2.3.19" +#define QWLAN_VERSIONSTR "3.2.3.22" #endif /* QWLAN_VERSION_H */