diff options
| author | Ravi Joshi <ravij@qca.qualcomm.com> | 2014-05-07 13:14:57 -0700 |
|---|---|---|
| committer | Pitani Venkata Rajesh Kumar <c_vpitan@qti.qualcomm.com> | 2014-05-13 11:55:40 +0530 |
| commit | 3eddd6f4f7b50ce14bf461efeac46760baafde74 (patch) | |
| tree | bac526426f1acdd44c5c361d9dcd3c076ae6c1e3 | |
| parent | 761cc418aeaadabb18c26845b69092844c5e5d0e (diff) | |
wlan: Removing unused IBSS flag (gIsAutoIbssBssid)
This flag is not being used in IBSS anymore. This is a precursor
change to remove unused CFG variable references in the host.
Change-Id: Ie6074ce114288dc7a4042b22d9303fabe36bdad7
CRs-Fixed: 660400
| -rw-r--r-- | CORE/HDD/inc/wlan_hdd_cfg.h | 6 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg.c | 37 |
2 files changed, 0 insertions, 43 deletions
diff --git a/CORE/HDD/inc/wlan_hdd_cfg.h b/CORE/HDD/inc/wlan_hdd_cfg.h index d76e509b555d..f3523c585372 100644 --- a/CORE/HDD/inc/wlan_hdd_cfg.h +++ b/CORE/HDD/inc/wlan_hdd_cfg.h @@ -397,11 +397,6 @@ typedef enum #define CFG_SHORT_PREAMBLE_MAX WNI_CFG_SHORT_PREAMBLE_STAMAX #define CFG_SHORT_PREAMBLE_DEFAULT WNI_CFG_SHORT_PREAMBLE_STADEF -#define CFG_IBSS_AUTO_BSSID_NAME "gAutoIbssBssid" -#define CFG_IBSS_AUTO_BSSID_MIN WNI_CFG_IBSS_AUTO_BSSID_STAMIN -#define CFG_IBSS_AUTO_BSSID_MAX WNI_CFG_IBSS_AUTO_BSSID_STAMAX -#define CFG_IBSS_AUTO_BSSID_DEFAULT WNI_CFG_IBSS_AUTO_BSSID_STADEF - #define CFG_IBSS_BSSID_NAME "gIbssBssid" #define CFG_IBSS_BSSID_MIN "000000000000" #define CFG_IBSS_BSSID_MAX "ffffffffffff" @@ -2586,7 +2581,6 @@ typedef struct v_U32_t nScanAgeTimeCPS; v_U8_t nRssiCatGap; v_BOOL_t fIsShortPreamble; - v_BOOL_t fIsAutoIbssBssid; v_MACADDR_t IbssBssid; v_U32_t AdHocChannel5G; v_U32_t AdHocChannel24G; diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c index 6932b4ef24b2..49c1b1353632 100644 --- a/CORE/HDD/src/wlan_hdd_cfg.c +++ b/CORE/HDD/src/wlan_hdd_cfg.c @@ -603,13 +603,6 @@ REG_TABLE_ENTRY g_registry_table[] = CFG_SHORT_PREAMBLE_MIN, CFG_SHORT_PREAMBLE_MAX ), - REG_VARIABLE( CFG_IBSS_AUTO_BSSID_NAME, WLAN_PARAM_Integer, - hdd_config_t, fIsAutoIbssBssid, - VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT, - CFG_IBSS_AUTO_BSSID_DEFAULT, - CFG_IBSS_AUTO_BSSID_MIN, - CFG_IBSS_AUTO_BSSID_MAX ), - REG_VARIABLE_STRING( CFG_IBSS_BSSID_NAME, WLAN_PARAM_MacAddr, hdd_config_t, IbssBssid, VAR_FLAGS_OPTIONAL, @@ -4723,36 +4716,6 @@ v_BOOL_t hdd_update_config_dat( hdd_context_t *pHddCtx ) hddLog(LOGE,"Could not pass on WNI_CFG_SHORT_PREAMBLE to CCM"); } - if (pConfig->fIsAutoIbssBssid) - { - if (ccmCfgSetStr(pHddCtx->hHal, WNI_CFG_BSSID, (v_U8_t *)"000000000000", - sizeof(v_BYTE_t) * VOS_MAC_ADDR_SIZE, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) - { - fStatus = FALSE; - hddLog(LOGE,"Could not pass on WNI_CFG_BSSID to CCM"); - } - } - else - { - if ( VOS_FALSE == vos_is_macaddr_group( &pConfig->IbssBssid )) - { - VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_INFO_MED, - "MAC Addr (IBSS BSSID) read from Registry is: " MAC_ADDRESS_STR, - MAC_ADDR_ARRAY(pConfig->IbssBssid.bytes)); - if (ccmCfgSetStr(pHddCtx->hHal, WNI_CFG_BSSID, pConfig->IbssBssid.bytes, - sizeof(v_BYTE_t) * VOS_MAC_ADDR_SIZE, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) - { - fStatus = FALSE; - hddLog(LOGE,"Could not pass on WNI_CFG_BSSID to CCM"); - } - } - else - { - fStatus = FALSE; - hddLog(LOGE,"Could not pass on WNI_CFG_BSSID to CCM"); - } - } - if (ccmCfgSetInt(pHddCtx->hHal, WNI_CFG_PASSIVE_MINIMUM_CHANNEL_TIME, pConfig->nPassiveMinChnTime, NULL, eANI_BOOLEAN_FALSE)==eHAL_STATUS_FAILURE) |