A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-14 16:46:15 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Remove #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING from HDD

Browse source 
The condition #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING is used to include
some of the roaming code. It has been defined for all the recent driver
builds. Roaming code underneath is permanent part of the driver.

Remove #ifdef WLAN_FEATURE_NEIGHBOR_ROAMING compiler flag from HDD so
that the code will always be compiled in.

CRs-Fixed: 936683
Change-Id: I777d48f26aea36383747281bd4fef2eadc7beefb
This commit is contained in:
Deepak Dhamdhere 2015-10-28 23:58:24 -07:00 • committed by Akash Patel
commit ec64739635
4 changed files with 0 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/hdd/inc/wlan_hdd_cfg.h
View file

@ -884,7 +884,6 @@ typedef enum {
#define CFG_BCN_EARLY_TERM_WAKE_MAX (255)
#define CFG_BCN_EARLY_TERM_WAKE_DEFAULT (3)
#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING
#define CFG_NEIGHBOR_SCAN_TIMER_PERIOD_NAME "gNeighborScanTimerPeriod"
#define CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MIN (3)
#define CFG_NEIGHBOR_SCAN_TIMER_PERIOD_MAX (300)
@ -964,7 +963,6 @@ typedef enum {
#define CFG_ROAM_BEACON_RSSI_WEIGHT_MIN (0)
#define CFG_ROAM_BEACON_RSSI_WEIGHT_MAX (16)
#define CFG_ROAM_BEACON_RSSI_WEIGHT_DEFAULT (14)
#endif /* WLAN_FEATURE_NEIGHBOR_ROAMING */
#define CFG_QOS_WMM_BURST_SIZE_DEFN_NAME "burstSizeDefinition"
#define CFG_QOS_WMM_BURST_SIZE_DEFN_MIN (0)
@ -2907,7 +2905,6 @@ struct hdd_config {
bool fFTResourceReqSupported;
#endif
#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING
uint16_t nNeighborScanPeriod;
uint8_t nNeighborLookupRssiThreshold;
uint8_t delay_before_vdev_stop;
@ -2926,7 +2923,6 @@ struct hdd_config {
uint32_t nhi_rssi_scan_rssi_delta;
uint32_t nhi_rssi_scan_delay;
int32_t nhi_rssi_scan_rssi_ub;
#endif
/* Additional Handoff params */
uint32_t nRoamingTime;

10
core/hdd/src/wlan_hdd_cfg.c
View file

@ -149,7 +149,6 @@ cb_notify_set_fw_rssi_monitoring(hdd_context_t *pHddCtx, unsigned long notifyId)
fEnableFwRssiMonitoring);
}
#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING
static void cb_notify_set_opportunistic_scan_threshold_diff(hdd_context_t *pHddCtx,
unsigned long notifyId)
{
@ -275,8 +274,6 @@ cb_notify_set_dfs_scan_mode(hdd_context_t *pHddCtx, unsigned long notifyId)
pHddCtx->config->allowDFSChannelRoam);
}
#endif
static void cb_notify_set_enable_ssr(hdd_context_t *pHddCtx,
unsigned long notifyId)
{
@ -1350,7 +1347,6 @@ REG_TABLE_ENTRY g_registry_table[] = {
CFG_FT_RESOURCE_REQ_MAX),
#endif
#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING
REG_DYNAMIC_VARIABLE(CFG_NEIGHBOR_SCAN_TIMER_PERIOD_NAME,
WLAN_PARAM_Integer,
struct hdd_config, nNeighborScanPeriod,
@ -1539,8 +1535,6 @@ REG_TABLE_ENTRY g_registry_table[] = {
cb_notify_set_roam_scan_hi_rssi_scan_params,
eCSR_HI_RSSI_SCAN_RSSI_UB_ID),
#endif /* WLAN_FEATURE_NEIGHBOR_ROAMING */
REG_VARIABLE(CFG_QOS_WMM_BURST_SIZE_DEFN_NAME, WLAN_PARAM_Integer,
struct hdd_config, burstSizeDefinition,
VAR_FLAGS_OPTIONAL | VAR_FLAGS_RANGE_CHECK_ASSUME_DEFAULT,
@ -4755,7 +4749,6 @@ void hdd_cfg_print(hdd_context_t *pHddCtx)
pHddCtx->config->fFTResourceReqSupported);
#endif
#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING
CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nNeighborLookupRssiThreshold] Value = [%u] ",
pHddCtx->config->nNeighborLookupRssiThreshold);
@ -4810,7 +4803,6 @@ void hdd_cfg_print(hdd_context_t *pHddCtx)
CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [nhi_rssi_scan_rssi_ub] Value = [%u] ",
pHddCtx->config->nhi_rssi_scan_rssi_ub);
#endif
CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [burstSizeDefinition] Value = [0x%x] ",
pHddCtx->config->burstSizeDefinition);
@ -6525,7 +6517,6 @@ CDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx)
/* Disable roaming in concurrency if roam scan offload is disabled */
smeConfig->csrConfig.bFastRoamInConIniFeatureEnabled = 0;
}
#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING
smeConfig->csrConfig.neighborRoamConfig.nNeighborLookupRssiThreshold =
pConfig->nNeighborLookupRssiThreshold;
smeConfig->csrConfig.neighborRoamConfig.delay_before_vdev_stop =
@ -6566,7 +6557,6 @@ CDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx)
pConfig->nhi_rssi_scan_delay;
smeConfig->csrConfig.neighborRoamConfig.nhi_rssi_scan_rssi_ub =
pConfig->nhi_rssi_scan_rssi_ub;
#endif
smeConfig->csrConfig.addTSWhenACMIsOff = pConfig->AddTSWhenACMIsOff;
smeConfig->csrConfig.fValidateList = pConfig->fValidateScanList;
smeConfig->csrConfig.allowDFSChannelRoam = pConfig->allowDFSChannelRoam;

2
core/hdd/src/wlan_hdd_ioctl.c
View file

@ -5969,7 +5969,6 @@ static const hdd_drv_cmd_t hdd_drv_cmds[] = {
{"SET_AP_WPS_P2P_IE", drv_cmd_dummy},
{"BTCOEXSCAN", drv_cmd_dummy},
{"RXFILTER", drv_cmd_dummy},
#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING
{"SETROAMTRIGGER", drv_cmd_set_roam_trigger},
{"GETROAMTRIGGER", drv_cmd_get_roam_trigger},
{"SETROAMSCANPERIOD", drv_cmd_set_roam_scan_period},
@ -5980,7 +5979,6 @@ static const hdd_drv_cmd_t hdd_drv_cmds[] = {
{"SETROAMMODE", drv_cmd_set_roam_mode},
{"GETROAMMODE", drv_cmd_get_roam_mode},
#endif
#endif
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
{"SETROAMDELTA", drv_cmd_set_roam_delta},
{"GETROAMDELTA", drv_cmd_get_roam_delta},

2
core/sme/inc/csr_api.h
View file

@ -814,7 +814,6 @@ typedef enum {
eCSR_HDD
} eCsrStatsRequesterType;
#ifdef WLAN_FEATURE_NEIGHBOR_ROAMING
/**
* enum csr_hi_rssi_scan_id - Parameter ids for hi rssi scan feature
*
@ -829,7 +828,6 @@ enum csr_hi_rssi_scan_id {
eCSR_HI_RSSI_SCAN_DELAY_ID,
eCSR_HI_RSSI_SCAN_RSSI_UB_ID
};
#endif
typedef struct tagPmkidCandidateInfo {
struct cdf_mac_addr BSSID;