From 6b48a2f04aa848ad439f7b88e98578408f1d2edd Mon Sep 17 00:00:00 2001 From: Jeff Johnson Date: Thu, 15 Nov 2018 19:48:47 -0800 Subject: [PATCH] qcacld-3.0: Refactor CTRL_RETRY 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_CTRL_RETRY Change-Id: Id54483ced3505e28a5db3d05fb3afc4c0c7a1ff9 CRs-Fixed: 2371571 --- core/hdd/src/wlan_hdd_cfg80211.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index f64871f0d712..e37203ed165b 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -5752,6 +5752,21 @@ static int hdd_config_mgmt_retry(struct hdd_adapter *adapter, retry, PDEV_CMD); } +static int hdd_config_ctrl_retry(struct hdd_adapter *adapter, + const struct nlattr *attr) +{ + uint8_t retry; + int param_id; + + retry = nla_get_u8(attr); + retry = retry > CFG_CTRL_RETRY_MAX ? + CFG_CTRL_RETRY_MAX : retry; + param_id = WMI_PDEV_PARAM_CTRL_RETRY_LIMIT; + + return wma_cli_set_command(adapter->session_id, param_id, + retry, PDEV_CMD); +} + static int hdd_config_guard_time(struct hdd_adapter *adapter, const struct nlattr *attr) { @@ -5864,6 +5879,8 @@ static const struct independent_setters independent_setters[] = { hdd_config_agg_retry}, {QCA_WLAN_VENDOR_ATTR_CONFIG_MGMT_RETRY, hdd_config_mgmt_retry}, + {QCA_WLAN_VENDOR_ATTR_CONFIG_CTRL_RETRY, + hdd_config_ctrl_retry}, }; /** @@ -5985,7 +6002,7 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, bool vendor_ie_present = false, access_policy_present = false; struct sir_set_tx_rx_aggregation_size request; QDF_STATUS qdf_status; - uint8_t retry, delay; + uint8_t delay; uint32_t abs_delay; int param_id; uint32_t tx_fail_count; @@ -6062,15 +6079,6 @@ __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, access_policy); } - if (tb[QCA_WLAN_VENDOR_ATTR_CONFIG_CTRL_RETRY]) { - retry = nla_get_u8(tb[QCA_WLAN_VENDOR_ATTR_CONFIG_CTRL_RETRY]); - retry = retry > CFG_CTRL_RETRY_MAX ? - CFG_CTRL_RETRY_MAX : retry; - param_id = WMI_PDEV_PARAM_CTRL_RETRY_LIMIT; - ret_val = wma_cli_set_command(adapter->session_id, param_id, - retry, PDEV_CMD); - } - if (tb[QCA_WLAN_VENDOR_ATTR_CONFIG_PROPAGATION_DELAY]) { delay = nla_get_u8(tb[ QCA_WLAN_VENDOR_ATTR_CONFIG_PROPAGATION_DELAY]);