samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Refactor LATENCY_LEVEL configuration

Browse Source 
One of the HDD functions with the highest cyclomatic complexity is
__wlan_hdd_cfg80211_wifi_configuration_set(). In order to reduce the
complexity there is a plan to replace the inline attribute handling
with a vtable-based approach.

As part of that goal refactor the following independent attribute
handling into a separate function and add that function to the vtable:
- QCA_WLAN_VENDOR_ATTR_CONFIG_LATENCY_LEVEL

Change-Id: I84ea1d02a91a08ac3c2bd8d020ecdc05176d1668
CRs-Fixed: 2371584
This commit is contained in:
Jeff Johnson
2018-11-16 10:59:30 -08:00
parent 320feebf04
commit 2502ddd2a3
1 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
core/hdd/src/wlan_hdd_cfg80211.c
View File

@@ -6107,6 +6107,39 @@ static int hdd_config_total_beacon_miss_count(struct hdd_adapter *adapter,
return qdf_status_to_os_return(status); return qdf_status_to_os_return(status);
} }
static int hdd_config_latency_level(struct hdd_adapter *adapter,
const struct nlattr *attr)
{
struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
uint16_t latency_level;
QDF_STATUS status;
latency_level = nla_get_u16(attr);
switch (latency_level) {
case QCA_WLAN_VENDOR_ATTR_CONFIG_LATENCY_LEVEL_NORMAL:
case QCA_WLAN_VENDOR_ATTR_CONFIG_LATENCY_LEVEL_MODERATE:
case QCA_WLAN_VENDOR_ATTR_CONFIG_LATENCY_LEVEL_LOW:
case QCA_WLAN_VENDOR_ATTR_CONFIG_LATENCY_LEVEL_ULTRALOW:
/* valid values */
break;
default:
hdd_err("Invalid value %u", latency_level);
return -EINVAL;
}
/* Map the latency value to the level which fw expected
* 0 - normal, 1 - moderate, 2 - low, 3 - ultralow
*/
latency_level = latency_level - 1;
status = sme_set_wlm_latency_level(hdd_ctx->mac_handle,
adapter->session_id,
latency_level);
if (QDF_IS_STATUS_ERROR(status))
hdd_err("set latency level failed, %u", status);
return qdf_status_to_os_return(status);
}
/** /**
* typedef independent_setter_fn - independent attribute handler * typedef independent_setter_fn - independent attribute handler
* @adapter: The adapter being configured * @adapter: The adapter being configured
@@ -6183,6 +6216,8 @@ static const struct independent_setters independent_setters[] = {
hdd_config_restrict_offchannel}, hdd_config_restrict_offchannel},
{QCA_WLAN_VENDOR_ATTR_CONFIG_TOTAL_BEACON_MISS_COUNT, {QCA_WLAN_VENDOR_ATTR_CONFIG_TOTAL_BEACON_MISS_COUNT,
hdd_config_total_beacon_miss_count}, hdd_config_total_beacon_miss_count},
{QCA_WLAN_VENDOR_ATTR_CONFIG_LATENCY_LEVEL,
hdd_config_latency_level},
}; };
/** /**
@@ -6304,7 +6339,6 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy,
struct sir_set_tx_rx_aggregation_size request; struct sir_set_tx_rx_aggregation_size request;
QDF_STATUS qdf_status; QDF_STATUS qdf_status;
uint32_t ant_div_usrcfg; uint32_t ant_div_usrcfg;
uint16_t latency_level;
mac_handle_t mac_handle; mac_handle_t mac_handle;
bool b_value; bool b_value;
@@ -6480,31 +6514,6 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy,
if (ret_val != 0) if (ret_val != 0)
return ret_val; return ret_val;
if (tb[QCA_WLAN_VENDOR_ATTR_CONFIG_LATENCY_LEVEL]) {
latency_level = nla_get_u16(
tb[QCA_WLAN_VENDOR_ATTR_CONFIG_LATENCY_LEVEL]);
if ((latency_level >
QCA_WLAN_VENDOR_ATTR_CONFIG_LATENCY_LEVEL_MAX) ||
(latency_level ==
QCA_WLAN_VENDOR_ATTR_CONFIG_LATENCY_LEVEL_INVALID)) {
hdd_err("Invalid Wlan latency level value");
return -EINVAL;
}
/* Mapping the latency value to the level which fw expected
* 0 - normal, 1 - moderate, 2 - low, 3 - ultralow
*/
latency_level = latency_level - 1;
qdf_status = sme_set_wlm_latency_level(mac_handle,
adapter->session_id,
latency_level);
if (qdf_status != QDF_STATUS_SUCCESS) {
hdd_err("set Wlan latency level failed");
ret_val = -EINVAL;
}
}
if (adapter->device_mode == QDF_STA_MODE && if (adapter->device_mode == QDF_STA_MODE &&
tb[QCA_WLAN_VENDOR_ATTR_CONFIG_DISABLE_FILS]) { tb[QCA_WLAN_VENDOR_ATTR_CONFIG_DISABLE_FILS]) {
uint8_t disable_fils; uint8_t disable_fils;