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-10 22:40:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

qcacld-3.0: Remove #ifdef FEATURE_WLAN_LFR from HDD

Browse source 
The condition #ifdef WLAN_FEATURE_LFR 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 FEATURE_WLAN_LFR compiler flag from HDD so that the code
will always be compiled in.

CRs-Fixed: 936683
Change-Id: If5010bc1470a35b2f1516a5c5d10461352fd87fc
This commit is contained in:
Deepak Dhamdhere 2015-10-29 15:11:06 -07:00 • committed by Akash Patel
commit a2df6bb544
8 changed files with 37 additions and 181 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -245,7 +245,6 @@ typedef enum {
#define CFG_RSSI_CATEGORY_GAP_MAX (100)
#define CFG_RSSI_CATEGORY_GAP_DEFAULT (5)
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
#define CFG_ROAM_PREFER_5GHZ "gRoamPrefer5GHz"
#define CFG_ROAM_PREFER_5GHZ_MIN (0)
#define CFG_ROAM_PREFER_5GHZ_MAX (1)
@ -259,7 +258,6 @@ typedef enum {
#define CFG_ROAM_INTRA_BAND_MIN (0)
#define CFG_ROAM_INTRA_BAND_MAX (1)
#define CFG_ROAM_INTRA_BAND_DEFAULT (0)
#endif
#define CFG_SHORT_PREAMBLE_NAME "gShortPreamble"
#define CFG_SHORT_PREAMBLE_MIN WNI_CFG_SHORT_PREAMBLE_STAMIN
@ -633,7 +631,6 @@ typedef enum {
#define CFG_ESE_FEATURE_ENABLED_DEFAULT (0) /* disabled */
#endif /* FEATURE_WLAN_ESE */
#ifdef FEATURE_WLAN_LFR
#define CFG_LFR_FEATURE_ENABLED_NAME "FastRoamEnabled"
#define CFG_LFR_FEATURE_ENABLED_MIN (0)
#define CFG_LFR_FEATURE_ENABLED_MAX (1)
@ -643,9 +640,7 @@ typedef enum {
#define CFG_LFR_MAWC_FEATURE_ENABLED_MIN (0)
#define CFG_LFR_MAWC_FEATURE_ENABLED_MAX (1)
#define CFG_LFR_MAWC_FEATURE_ENABLED_DEFAULT (0) /* disabled */
#endif /* FEATURE_WLAN_LFR */
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
/* This flag will control fasttransition in case of 11r and ese. */
/* Basically with this the whole neighbor roam, pre-auth, reassoc */
/* can be turned ON/OFF. */
@ -685,8 +680,6 @@ typedef enum {
#define CFG_ROAM_SCAN_HOME_AWAY_TIME_DEFAULT (CFG_ROAM_SCAN_HOME_AWAY_TIME_MIN)
/* disabled by default */
#endif /* (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR) */
#ifdef FEATURE_WLAN_OKC
#define CFG_OKC_FEATURE_ENABLED_NAME "OkcEnabled"
#define CFG_OKC_FEATURE_ENABLED_MIN (0)
@ -3027,19 +3020,15 @@ struct hdd_config {
uint32_t InfraUapsdBeSuspIntv;
uint32_t InfraUapsdBkSrvIntv;
uint32_t InfraUapsdBkSuspIntv;
#ifdef FEATURE_WLAN_LFR
bool isFastRoamIniFeatureEnabled;
bool MAWCEnabled;
#endif
#ifdef FEATURE_WLAN_ESE
uint32_t InfraInactivityInterval;
bool isEseIniFeatureEnabled;
#endif
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
bool isFastTransitionEnabled;
uint8_t RoamRssiDiff;
bool isWESModeEnabled;
#endif
#ifdef FEATURE_WLAN_OKC
bool isOkcIniFeatureEnabled;
#endif
@ -3148,12 +3137,10 @@ struct hdd_config {
int32_t linkSpeedRssiHigh;
int32_t linkSpeedRssiMid;
int32_t linkSpeedRssiLow;
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
bool nRoamPrefer5GHz;
bool nRoamIntraBand;
uint8_t nProbes;
uint16_t nRoamScanHomeAwayTime;
#endif
uint8_t enableMCC;
uint8_t allowMCCGODiffBI;
bool isP2pDeviceAddrAdministrated;

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

@ -646,9 +646,7 @@ struct hdd_station_ctx {
roaming_info_t roam_info;
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
int ft_carrier_on;
#endif
#ifdef WLAN_FEATURE_GTK_OFFLOAD
tSirGtkOffloadParams gtkOffloadReqParams;
@ -1483,10 +1481,8 @@ static inline bool hdd_is_memdump_supported(void)
void hdd_update_macaddr(struct hdd_config *config,
struct cdf_mac_addr hw_macaddr);
#if defined(FEATURE_WLAN_LFR)
void wlan_hdd_disable_roaming(hdd_adapter_t *pAdapter);
void wlan_hdd_enable_roaming(hdd_adapter_t *pAdapter);
#endif
CDF_STATUS hdd_post_cds_enable_config(hdd_context_t *pHddCtx);

134
core/hdd/src/wlan_hdd_assoc.c
View file

@ -828,9 +828,7 @@ static void hdd_send_association_event(struct net_device *dev,
cds_decr_session_set_pcl(
pAdapter->device_mode,
pAdapter->sessionId);
#if defined(FEATURE_WLAN_LFR)
wlan_hdd_enable_roaming(pAdapter);
#endif
#ifdef FEATURE_WLAN_AUTO_SHUTDOWN
wlan_hdd_auto_shutdown_enable(pHddCtx, true);
@ -1715,10 +1713,7 @@ static CDF_STATUS hdd_association_completion_handler(hdd_adapter_t *pAdapter,
CDF_STATUS cdf_status = CDF_STATUS_E_FAILURE;
uint8_t reqRsnIe[DOT11F_IE_RSN_MAX_LEN];
uint32_t reqRsnLength = DOT11F_IE_RSN_MAX_LEN;
#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR) || \
defined(WLAN_FEATURE_VOWIFI_11R)
int ft_carrier_on = false;
#endif
bool hddDisconInProgress = false;
unsigned long rc;
@ -1781,49 +1776,38 @@ defined(WLAN_FEATURE_VOWIFI_11R)
* will come to know that the device is getting
* activated properly.
*/
#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || \
defined(FEATURE_WLAN_LFR)
if (pHddStaCtx->ft_carrier_on == false) {
#endif
/*
* Enable Linkup Event Servicing which allows the net device
* notifier to set the linkup event variable.
*/
pAdapter->isLinkUpSvcNeeded = true;
/*
* Enable Linkup Event Servicing which allows the net
* device notifier to set the linkup event variable.
*/
pAdapter->isLinkUpSvcNeeded = true;
/*
* Enable Linkup Event Servicing which allows the net device
* notifier to set the linkup event variable.
*/
pAdapter->isLinkUpSvcNeeded = true;
/* Switch on the Carrier to activate the device */
wlan_hdd_netif_queue_control(pAdapter,
WLAN_NETIF_CARRIER_ON,
WLAN_CONTROL_PATH);
/* Switch on the Carrier to activate the device */
wlan_hdd_netif_queue_control(pAdapter, WLAN_NETIF_CARRIER_ON,
WLAN_CONTROL_PATH);
/*
* Wait for the Link to up to ensure all the queues
* are set properly by the kernel.
*/
rc = wait_for_completion_timeout(
&pAdapter->linkup_event_var,
msecs_to_jiffies(ASSOC_LINKUP_TIMEOUT)
);
if (!rc)
hdd_warn("Warning:ASSOC_LINKUP_TIMEOUT");
/*
* Wait for the Link to up to ensure all the queues are set
* properly by the kernel.
*/
rc = wait_for_completion_timeout(&pAdapter->
linkup_event_var,
msecs_to_jiffies
(ASSOC_LINKUP_TIMEOUT));
if (!rc)
hddLog(LOGW, FL("Warning:ASSOC_LINKUP_TIMEOUT"));
/*
* Disable Linkup Event Servicing - no more service required
* from the net device notifier call.
*/
pAdapter->isLinkUpSvcNeeded = false;
#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || \
defined(FEATURE_WLAN_LFR)
} else {
pHddStaCtx->ft_carrier_on = false;
ft_carrier_on = true;
}
#endif
/*
* Disable Linkup Event Servicing - no more service
* required from the net device notifier call.
*/
pAdapter->isLinkUpSvcNeeded = false;
} else {
pHddStaCtx->ft_carrier_on = false;
ft_carrier_on = true;
}
if ((WLAN_MAX_STA_COUNT + 3) > pRoamInfo->staId)
pHddCtx->sta_to_adapter[pRoamInfo->staId] = pAdapter;
else
@ -2059,17 +2043,13 @@ defined(FEATURE_WLAN_LFR)
&rspRsnLength,
rspRsnIe);
if (!hddDisconInProgress) {
#if defined(FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
if (ft_carrier_on)
hdd_send_re_assoc_event(dev,
pAdapter,
pRoamInfo,
reqRsnIe,
reqRsnLength);
else
#endif /* FEATURE_WLAN_ESE */
{
else {
hddLog(LOG1,
FL("sending connect indication to nl80211:for bssid "
MAC_ADDRESS_STR
@ -3883,8 +3863,6 @@ hdd_sme_roam_callback(void *pContext, tCsrRoamInfo *pRoamInfo, uint32_t roamId,
complete(&pAdapter->session_open_comp_var);
break;
#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || \
defined(FEATURE_WLAN_LFR)
/*
* We did pre-auth,then we attempted a 11r or ese reassoc.
* reassoc failed due to failure, timeout, reject from ap
@ -3925,72 +3903,32 @@ defined(FEATURE_WLAN_LFR)
* doing disassoc at this time. This saves 30-60 msec
* after reassoc.
*/
{
hddLog(LOG1, FL("Disabling queues"));
wlan_hdd_netif_queue_control(pAdapter, WLAN_NETIF_TX_DISABLE,
WLAN_CONTROL_PATH);
status =
hdd_roam_deregister_sta(pAdapter,
pHddStaCtx->conn_info.
staId[0]);
if (!CDF_IS_STATUS_SUCCESS(status)) {
hddLog(LOGW,
FL
("hdd_roam_deregister_sta() failed to for staID %d. Status=%d [0x%x]"),
pHddStaCtx->conn_info.staId[0],
status, status);
wlan_hdd_netif_queue_control(pAdapter,
WLAN_NETIF_TX_DISABLE,
WLAN_CONTROL_PATH);
status = hdd_roam_deregister_sta(pAdapter,
pHddStaCtx->conn_info.staId[0]);
if (!CDF_IS_STATUS_SUCCESS(status))
cdf_ret_status = CDF_STATUS_E_FAILURE;
}
}
pHddStaCtx->ft_carrier_on = true;
pHddStaCtx->hdd_ReassocScenario = true;
hddLog(LOG1,
FL("hdd_ReassocScenario set to: %d, due to eCSR_ROAM_FT_START, session: %d"),
pHddStaCtx->hdd_ReassocScenario, pAdapter->sessionId);
break;
#endif
case eCSR_ROAM_SHOULD_ROAM:
/* Dont need to do anything */
{
hdd_station_ctx_t *pHddStaCtx =
WLAN_HDD_GET_STATION_CTX_PTR(pAdapter);
/* notify apps that we can't pass traffic anymore */
hddLog(LOG1, FL("Disabling queues"));
wlan_hdd_netif_queue_control(pAdapter,
WLAN_NETIF_TX_DISABLE,
WLAN_CONTROL_PATH);
#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || \
defined(FEATURE_WLAN_LFR)
if (pHddStaCtx->ft_carrier_on == false) {
#endif
wlan_hdd_netif_queue_control(pAdapter,
WLAN_NETIF_CARRIER_OFF,
WLAN_CONTROL_PATH);
#if defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || \
defined(FEATURE_WLAN_LFR)
}
#endif
#if !(defined(WLAN_FEATURE_VOWIFI_11R) || defined(FEATURE_WLAN_ESE) || \
defined(FEATURE_WLAN_LFR))
/*
* We should clear all sta register with TL, for now, only one.
*/
status =
hdd_roam_deregister_sta(pAdapter,
pHddStaCtx->conn_info.
staId[0]);
if (!CDF_IS_STATUS_SUCCESS(status)) {
hddLog(LOGW,
FL
("hdd_roam_deregister_sta() failed to for staID %d. Status=%d [0x%x]"),
pHddStaCtx->conn_info.staId[0],
status, status);
cdf_ret_status = CDF_STATUS_E_FAILURE;
}
#endif
}
break;
case eCSR_ROAM_LOSTLINK:
if (roamResult == eCSR_ROAM_RESULT_LOSTLINK) {
@ -4117,7 +4055,6 @@ defined(FEATURE_WLAN_LFR))
hdd_send_ft_event(pAdapter);
break;
#endif
#ifdef FEATURE_WLAN_LFR
case eCSR_ROAM_PMK_NOTIFY:
if (eCSR_AUTH_TYPE_RSN == pHddStaCtx->conn_info.authType ||
eCSR_AUTH_TYPE_RSN_8021X_SHA256 ==
@ -4128,7 +4065,6 @@ defined(FEATURE_WLAN_LFR))
pAdapter, pRoamInfo, 1, false);
}
break;
#endif
#ifdef FEATURE_WLAN_LFR_METRICS
case eCSR_ROAM_PREAUTH_INIT_NOTIFY:

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

@ -45,7 +45,6 @@
#include <wlan_hdd_misc.h>
#include <wlan_hdd_napi.h>
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
static void
cb_notify_set_roam_prefer5_g_hz(hdd_context_t *pHddCtx, unsigned long notifyId)
{
@ -95,7 +94,6 @@ cb_notify_set_roam_scan_home_away_time(hdd_context_t *pHddCtx, unsigned long not
pHddCtx->config->nRoamScanHomeAwayTime,
true);
}
#endif
#ifdef FEATURE_WLAN_OKC
static void
@ -106,7 +104,6 @@ cb_notify_set_okc_feature_enabled(hdd_context_t *pHddCtx, unsigned long notifyId
}
#endif
#ifdef FEATURE_WLAN_LFR
static void
notify_is_fast_roam_ini_feature_enabled(hdd_context_t *pHddCtx,
unsigned long notifyId)
@ -126,7 +123,6 @@ notify_is_mawc_ini_feature_enabled(hdd_context_t *pHddCtx, unsigned long notifyI
sme_update_is_mawc_ini_feature_enabled(pHddCtx->hHal,
pHddCtx->config->MAWCEnabled);
}
#endif
#ifdef FEATURE_WLAN_ESE
static void
@ -1018,7 +1014,6 @@ REG_TABLE_ENTRY g_registry_table[] = {
cb_notify_set_ese_feature_enabled, 0),
#endif /* FEATURE_WLAN_ESE */
#ifdef FEATURE_WLAN_LFR
/* flag to turn ON/OFF Legacy Fast Roaming */
REG_DYNAMIC_VARIABLE(CFG_LFR_FEATURE_ENABLED_NAME, WLAN_PARAM_Integer,
struct hdd_config, isFastRoamIniFeatureEnabled,
@ -1040,9 +1035,6 @@ REG_TABLE_ENTRY g_registry_table[] = {
CFG_LFR_MAWC_FEATURE_ENABLED_MAX,
notify_is_mawc_ini_feature_enabled, 0),
#endif /* FEATURE_WLAN_LFR */
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
/* flag to turn ON/OFF 11r and ESE FastTransition */
REG_DYNAMIC_VARIABLE(CFG_FAST_TRANSITION_ENABLED_NAME,
WLAN_PARAM_Integer,
@ -1073,7 +1065,6 @@ REG_TABLE_ENTRY g_registry_table[] = {
CFG_ENABLE_WES_MODE_NAME_MIN,
CFG_ENABLE_WES_MODE_NAME_MAX,
cb_notify_set_wes_mode, 0),
#endif
#ifdef FEATURE_WLAN_OKC
REG_DYNAMIC_VARIABLE(CFG_OKC_FEATURE_ENABLED_NAME, WLAN_PARAM_Integer,
struct hdd_config, isOkcIniFeatureEnabled,
@ -1920,7 +1911,6 @@ REG_TABLE_ENTRY g_registry_table[] = {
CFG_LINK_SPEED_RSSI_LOW_MAX,
NULL, 0),
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
REG_DYNAMIC_VARIABLE(CFG_ROAM_PREFER_5GHZ, WLAN_PARAM_Integer,
struct hdd_config, nRoamPrefer5GHz,
VAR_FLAGS_OPTIONAL |
@ -1957,8 +1947,6 @@ REG_TABLE_ENTRY g_registry_table[] = {
CFG_ROAM_SCAN_HOME_AWAY_TIME_MAX,
cb_notify_set_roam_scan_home_away_time, 0),
#endif
REG_VARIABLE(CFG_P2P_DEVICE_ADDRESS_ADMINISTRATED_NAME,
WLAN_PARAM_Integer,
struct hdd_config, isP2pDeviceAddrAdministrated,
@ -4646,22 +4634,18 @@ void hdd_cfg_print(hdd_context_t *pHddCtx)
"Name = [gTxPowerCap] Value = [%u] dBm ",
pHddCtx->config->nTxPowerCap);
#endif
#ifdef FEATURE_WLAN_LFR
CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [FastRoamEnabled] Value = [%u] ",
pHddCtx->config->isFastRoamIniFeatureEnabled);
CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [MAWCEnabled] Value = [%u] ",
pHddCtx->config->MAWCEnabled);
#endif
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [RoamRssiDiff] Value = [%u] ",
pHddCtx->config->RoamRssiDiff);
CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [isWESModeEnabled] Value = [%u] ",
pHddCtx->config->isWESModeEnabled);
#endif
#ifdef FEATURE_WLAN_OKC
CDF_TRACE(CDF_MODULE_ID_HDD, CDF_TRACE_LEVEL_INFO_HIGH,
"Name = [OkcEnabled] Value = [%u] ",
@ -6520,14 +6504,12 @@ CDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx)
smeConfig->csrConfig.nTxPowerCap = pConfig->nTxPowerCap;
smeConfig->csrConfig.fEnableBypass11d = pConfig->enableBypass11d;
smeConfig->csrConfig.fEnableDFSChnlScan = pConfig->enableDFSChnlScan;
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
smeConfig->csrConfig.nRoamPrefer5GHz = pConfig->nRoamPrefer5GHz;
smeConfig->csrConfig.nRoamIntraBand = pConfig->nRoamIntraBand;
smeConfig->csrConfig.nProbes = pConfig->nProbes;
smeConfig->csrConfig.nRoamScanHomeAwayTime =
pConfig->nRoamScanHomeAwayTime;
#endif
smeConfig->csrConfig.fFirstScanOnly2GChnl =
pConfig->enableFirstScan2GOnly;
@ -6539,11 +6521,9 @@ CDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx)
smeConfig->csrConfig.csr11rConfig.IsFTResourceReqSupported =
pConfig->fFTResourceReqSupported;
#endif
#ifdef FEATURE_WLAN_LFR
smeConfig->csrConfig.isFastRoamIniFeatureEnabled =
pConfig->isFastRoamIniFeatureEnabled;
smeConfig->csrConfig.MAWCEnabled = pConfig->MAWCEnabled;
#endif
#ifdef FEATURE_WLAN_ESE
smeConfig->csrConfig.isEseIniFeatureEnabled =
pConfig->isEseIniFeatureEnabled;
@ -6551,12 +6531,10 @@ CDF_STATUS hdd_set_sme_config(hdd_context_t *pHddCtx)
pConfig->isFastTransitionEnabled = true;
}
#endif
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
smeConfig->csrConfig.isFastTransitionEnabled =
pConfig->isFastTransitionEnabled;
smeConfig->csrConfig.RoamRssiDiff = pConfig->RoamRssiDiff;
smeConfig->csrConfig.isWESModeEnabled = pConfig->isWESModeEnabled;
#endif
smeConfig->csrConfig.isRoamOffloadScanEnabled =
pConfig->isRoamOffloadScanEnabled;
smeConfig->csrConfig.bFastRoamInConIniFeatureEnabled =

15
core/hdd/src/wlan_hdd_cfg80211.c
View file

@ -5346,18 +5346,13 @@ int wlan_hdd_cfg80211_init(struct device *dev,
wiphy->wowlan.pattern_max_len = WOWL_PTRN_MAX_SIZE;
#endif
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
if (pCfg->isFastTransitionEnabled
#ifdef FEATURE_WLAN_LFR
|| pCfg->isFastRoamIniFeatureEnabled
#endif
if (pCfg->isFastTransitionEnabled || pCfg->isFastRoamIniFeatureEnabled
#ifdef FEATURE_WLAN_ESE
|| pCfg->isEseIniFeatureEnabled
#endif
) {
wiphy->flags |= WIPHY_FLAG_SUPPORTS_FW_ROAM;
}
#endif
#ifdef FEATURE_WLAN_TDLS
wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS
| WIPHY_FLAG_TDLS_EXTERNAL_SETUP;
@ -7571,7 +7566,6 @@ int wlan_hdd_cfg80211_update_bss(struct wiphy *wiphy,
return 0;
}
#ifdef FEATURE_WLAN_LFR
/**
* wlan_hdd_cfg80211_pmksa_candidate_notify() - notify a new PMSKA candidate
* @pAdapter: Pointer to adapter
@ -7609,7 +7603,6 @@ int wlan_hdd_cfg80211_pmksa_candidate_notify(hdd_adapter_t *pAdapter,
#endif /* FEATURE_WLAN_OKC */
return 0;
}
#endif /* FEATURE_WLAN_LFR */
#ifdef FEATURE_WLAN_LFR_METRICS
/**
@ -8862,9 +8855,7 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy,
return -ECONNREFUSED;
}
}
#if defined(FEATURE_WLAN_LFR)
wlan_hdd_disable_roaming(pAdapter);
#endif
/*Try disconnecting if already in connected state */
status = wlan_hdd_try_disconnect(pAdapter);
@ -10119,7 +10110,6 @@ static int wlan_hdd_cfg80211_add_station(struct wiphy *wiphy,
return ret;
}
#ifdef FEATURE_WLAN_LFR
/**
* __wlan_hdd_cfg80211_set_pmksa() - set pmksa
* @wiphy: Pointer to wiphy
@ -10347,7 +10337,6 @@ static int wlan_hdd_cfg80211_flush_pmksa(struct wiphy *wiphy,
return ret;
}
#endif
#if defined(WLAN_FEATURE_VOWIFI_11R) && defined(KERNEL_SUPPORT_11R_CFG80211)
/**
@ -11291,11 +11280,9 @@ static struct cfg80211_ops wlan_hdd_cfg80211_ops = {
.set_power_mgmt = wlan_hdd_cfg80211_set_power_mgmt,
.del_station = wlan_hdd_cfg80211_del_station,
.add_station = wlan_hdd_cfg80211_add_station,
#ifdef FEATURE_WLAN_LFR
.set_pmksa = wlan_hdd_cfg80211_set_pmksa,
.del_pmksa = wlan_hdd_cfg80211_del_pmksa,
.flush_pmksa = wlan_hdd_cfg80211_flush_pmksa,
#endif
#if defined(WLAN_FEATURE_VOWIFI_11R) && defined(KERNEL_SUPPORT_11R_CFG80211)
.update_ft_ies = wlan_hdd_cfg80211_update_ft_ies,
#endif

4
core/hdd/src/wlan_hdd_cfg80211.h
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2012-2015 The Linux Foundation. All rights reserved.
* Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
*
* Previously licensed under the ISC license by Qualcomm Atheros, Inc.
*
@ -2261,11 +2261,9 @@ enum qca_vendor_attr_txpower_scale_decr_db {
struct cfg80211_bss *wlan_hdd_cfg80211_update_bss_db(hdd_adapter_t *pAdapter,
tCsrRoamInfo *pRoamInfo);
#ifdef FEATURE_WLAN_LFR
int wlan_hdd_cfg80211_pmksa_candidate_notify(hdd_adapter_t *pAdapter,
tCsrRoamInfo *pRoamInfo,
int index, bool preauth);
#endif
#ifdef FEATURE_WLAN_LFR_METRICS
CDF_STATUS wlan_hdd_cfg80211_roam_metrics_preauth(hdd_adapter_t *pAdapter,

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

@ -261,7 +261,6 @@ CDF_STATUS hdd_get_tsm_stats(hdd_adapter_t *adapter,
}
#endif /*FEATURE_WLAN_ESE && FEATURE_WLAN_ESE_UPLOAD */
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
static void hdd_get_band_helper(hdd_context_t *hdd_ctx, int *pBand)
{
eCsrBand band = -1;
@ -521,9 +520,6 @@ static int hdd_parse_reassoc_command_v1_data(const uint8_t *pValue,
return 0;
}
#endif /* WLAN_FEATURE_VOWIFI_11R || FEATURE_WLAN_ESE || FEATURE_WLAN_ESE FEATURE_WLAN_LFR */
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
/**
* hdd_reassoc() - perform a userspace-directed reassoc
* @adapter: Adapter upon which the command was received
@ -696,9 +692,6 @@ static int hdd_parse_reassoc(hdd_adapter_t *adapter, const char *command)
return ret;
}
#endif /* WLAN_FEATURE_VOWIFI_11R || FEATURE_WLAN_ESE || FEATURE_WLAN_ESE FEATURE_WLAN_LFR */
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
/**
* hdd_sendactionframe() - send a userspace-supplied action frame
* @adapter: Adapter upon which the command was received
@ -974,9 +967,6 @@ hdd_parse_sendactionframe(hdd_adapter_t *adapter, const char *command)
return ret;
}
#endif /* WLAN_FEATURE_VOWIFI_11R || FEATURE_WLAN_ESE || FEATURE_WLAN_ESE FEATURE_WLAN_LFR */
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
/**
* hdd_parse_channellist() - HDD Parse channel list
* @pValue: Pointer to input channel list
@ -1272,7 +1262,6 @@ hdd_parse_set_roam_scan_channels(hdd_adapter_t *adapter, const char *command)
return ret;
}
#endif /* WLAN_FEATURE_VOWIFI_11R || FEATURE_WLAN_ESE || FEATURE_WLAN_LFR */
#if defined(FEATURE_WLAN_ESE) && defined(FEATURE_WLAN_ESE_UPLOAD)
/**
@ -6093,15 +6082,10 @@ static const hdd_drv_cmd_t hdd_drv_cmds[] = {
{"GETROAMSCANPERIOD", drv_cmd_get_roam_scan_period},
{"SETROAMSCANREFRESHPERIOD", drv_cmd_set_roam_scan_refresh_period},
{"GETROAMSCANREFRESHPERIOD", drv_cmd_get_roam_scan_refresh_period},
#ifdef FEATURE_WLAN_LFR
{"SETROAMMODE", drv_cmd_set_roam_mode},
{"GETROAMMODE", drv_cmd_get_roam_mode},
#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},
#endif
#if defined (WLAN_FEATURE_VOWIFI_11R) || defined (FEATURE_WLAN_ESE) || defined(FEATURE_WLAN_LFR)
{"GETBAND", drv_cmd_get_band},
{"SETROAMSCANCHANNELS", drv_cmd_set_roam_scan_channels},
{"GETROAMSCANCHANNELS", drv_cmd_get_roam_scan_channels},
@ -6129,10 +6113,7 @@ static const hdd_drv_cmd_t hdd_drv_cmds[] = {
{"GETOPPORTUNISTICRSSIDIFF", drv_cmd_get_opportunistic_rssi_diff},
{"SETROAMRESCANRSSIDIFF", drv_cmd_set_roam_rescan_rssi_diff},
{"GETROAMRESCANRSSIDIFF", drv_cmd_get_roam_rescan_rssi_diff},
#endif /* WLAN_FEATURE_VOWIFI_11R || FEATURE_WLAN_ESE || FEATURE_WLAN_LFR */
#ifdef FEATURE_WLAN_LFR
{"SETFASTROAM", drv_cmd_set_fast_roam},
#endif
#ifdef WLAN_FEATURE_VOWIFI_11R
{"SETFASTTRANSITION", drv_cmd_set_fast_transition},
{"FASTREASSOC", drv_cmd_fast_reassoc},

7
core/hdd/src/wlan_hdd_main.c
View file

@ -723,10 +723,6 @@ CDF_STATUS hdd_set_ibss_power_save_params(hdd_adapter_t *adapter)
return CDF_STATUS_SUCCESS;
}
#if defined(WLAN_FEATURE_VOWIFI_11R) ||\
defined(FEATURE_WLAN_ESE) ||\
defined(FEATURE_WLAN_LFR)
#define INTF_MACADDR_MASK 0x7
/**
@ -1390,7 +1386,6 @@ bool hdd_dfs_indicate_radar(void *context, void *param)
return true;
}
#endif
/**
* hdd_is_valid_mac_address() - validate MAC address
@ -6032,7 +6027,6 @@ int wlan_hdd_gen_wlan_version_pack(struct wlan_version_data *data,
}
#endif
#if defined(FEATURE_WLAN_LFR)
/**
* wlan_hdd_disable_roaming() - disable roaming on all STAs except the input one
* @adapter: HDD adapter pointer
@ -6138,7 +6132,6 @@ void wlan_hdd_enable_roaming(hdd_adapter_t *adapter)
}
}
}
#endif
void wlan_hdd_send_svc_nlink_msg(int type, void *data, int len)
{