From 1feb8a62af9784f2c3c3cbc8c61536e6a1f7b5cc Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Wed, 14 Nov 2018 13:18:41 -0800 Subject: [PATCH] qcacld-3.0: Refactor QPOWER configuration 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_QPOWER Change-Id: Ic10dd8ef706cb73028fe8523dbb6e0cc0a15ac4a CRs-Fixed: 2371565 --- core/hdd/src/wlan_hdd_cfg80211.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index fd7c6d33004c..68b3f2d42572 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -5235,6 +5235,7 @@ wlan_hdd_wifi_config_policy[QCA_WLAN_VENDOR_ATTR_CONFIG_MAX + 1] = { [RX_BLOCKSIZE_WINLIMIT] = {.type = NLA_U32}, [QCA_WLAN_VENDOR_ATTR_CONFIG_LISTEN_INTERVAL] = {.type = NLA_U32 }, [QCA_WLAN_VENDOR_ATTR_CONFIG_LRO] = {.type = NLA_U8 }, + [QCA_WLAN_VENDOR_ATTR_CONFIG_QPOWER] = {.type = NLA_U8 }, [QCA_WLAN_VENDOR_ATTR_CONFIG_ANT_DIV_ENA] = {.type = NLA_U32 }, [QCA_WLAN_VENDOR_ATTR_CONFIG_ANT_DIV_CHAIN] = {.type = NLA_U32 }, [QCA_WLAN_VENDOR_ATTR_CONFIG_ANT_DIV_SELFTEST] = {.type = NLA_U32 }, @@ -5676,6 +5677,17 @@ static int hdd_config_scan_enable(struct hdd_adapter *adapter, return 0; } +static int hdd_config_qpower(struct hdd_adapter *adapter, + const struct nlattr *attr) +{ + struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter); + uint8_t qpower; + + qpower = nla_get_u8(attr); + + return hdd_set_qpower_config(hdd_ctx, adapter, qpower); +} + static int hdd_config_scan_default_ies(struct hdd_adapter *adapter, const struct nlattr *attr) { @@ -5761,6 +5773,8 @@ static const struct independent_setters independent_setters[] = { hdd_config_lro}, {QCA_WLAN_VENDOR_ATTR_CONFIG_SCAN_ENABLE, hdd_config_scan_enable}, + {QCA_WLAN_VENDOR_ATTR_CONFIG_QPOWER, + hdd_config_qpower}, }; /** @@ -5877,7 +5891,6 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, u16 stats_avg_factor; u32 guard_time; uint8_t set_value; - u8 qpower; QDF_STATUS status; int attr_len; int access_policy = 0; @@ -5929,13 +5942,6 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, mac_handle = hdd_ctx->mac_handle; - if (tb[QCA_WLAN_VENDOR_ATTR_CONFIG_QPOWER]) { - qpower = nla_get_u8( - tb[QCA_WLAN_VENDOR_ATTR_CONFIG_QPOWER]); - if (hdd_set_qpower_config(hdd_ctx, adapter, qpower) != 0) - ret_val = -EINVAL; - } - if (tb[QCA_WLAN_VENDOR_ATTR_CONFIG_STATS_AVG_FACTOR]) { stats_avg_factor = nla_get_u16( tb[QCA_WLAN_VENDOR_ATTR_CONFIG_STATS_AVG_FACTOR]);