qcacld-3.0: Enable compile time enable/disable for roaming
Enable compile time featurization support for both LFR2.0
and LFR3.0 using WLAN_FEATURE_HOST_ROAM and
WLAN_FEATURE_ROAM_OFFLOAD respectively
CRs-Fixed: 978905
Change-Id: Ib5976cd0cd5a6e117a1334bfc73a043e36e25f77
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 1ce82c2..cdf0e41 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -2184,7 +2184,7 @@
return -EPERM;
}
- if (hdd_ctx_ptr->config->isRoamOffloadEnabled) {
+ if (is_roaming_offload_enabled(hdd_ctx_ptr)) {
hddLog(LOG1, FL("Key Mgmt Offload is supported"));
wlan_hdd_cfg80211_set_feature(feature_flags,
QCA_WLAN_VENDOR_FEATURE_KEY_MGMT_OFFLOAD);
@@ -2889,6 +2889,7 @@
return ret;
}
+#endif
static const struct nla_policy qca_wlan_vendor_get_wifi_info_policy[
QCA_WLAN_VENDOR_ATTR_WIFI_INFO_GET_MAX + 1] = {
@@ -3086,6 +3087,7 @@
return ret;
}
+#ifdef WLAN_FEATURE_ROAM_OFFLOAD
/**
* wlan_hdd_send_roam_auth_event() - Send the roamed and authorized event
* @hdd_ctx_ptr: pointer to HDD Context.
@@ -3126,7 +3128,7 @@
return -EINVAL;
}
- if (!hdd_ctx_ptr->config->isRoamOffloadEnabled ||
+ if (!is_roaming_offload_enabled(hdd_ctx_ptr) ||
!roam_info_ptr->roamSynchInProgress)
return 0;
@@ -3221,7 +3223,7 @@
kfree_skb(skb);
return -EINVAL;
}
-#endif /* WLAN_FEATURE_ROAM_OFFLOAD */
+#endif
static const struct nla_policy
wlan_hdd_wifi_config_policy[QCA_WLAN_VENDOR_ATTR_CONFIG_MAX + 1] = {
diff --git a/core/hdd/src/wlan_hdd_ioctl.c b/core/hdd/src/wlan_hdd_ioctl.c
index eb2622b..9723486 100644
--- a/core/hdd/src/wlan_hdd_ioctl.c
+++ b/core/hdd/src/wlan_hdd_ioctl.c
@@ -4640,6 +4640,10 @@
FL("Not able to post ROAM_INVOKE_CMD message to WMA"));
}
}
+#else
+static inline void hdd_wma_send_fastreassoc_cmd(int sessionId,
+ tSirMacAddr bssid, int channel)
+{}
#endif
static int drv_cmd_fast_reassoc(hdd_adapter_t *adapter,
hdd_context_t *hdd_ctx,
@@ -4713,13 +4717,11 @@
hddLog(LOGE, FL("Invalid Channel [%d]"), channel);
return -EINVAL;
}
-#ifdef WLAN_FEATURE_ROAM_OFFLOAD
- if (hdd_ctx->config->isRoamOffloadEnabled) {
+ if (is_roaming_offload_enabled(hdd_ctx)) {
hdd_wma_send_fastreassoc_cmd((int)adapter->sessionId,
targetApBssid, (int)channel);
goto exit;
}
-#endif
/* Proceed with reassoc */
handoffInfo.channel = channel;
handoffInfo.src = FASTREASSOC;