diff options
| author | CNSS_WLAN Service <cnssbldsw@qualcomm.com> | 2017-04-06 06:04:47 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-04-06 06:04:47 -0700 |
| commit | 415fddaa633f7c386d70eafa37dd89d83f126d52 (patch) | |
| tree | 32c779055134206d344e9638b1bfb6b533f2d603 | |
| parent | 2866a3cd3812eb30250368737439b5120157ddbc (diff) | |
| parent | eab6fe6d51355717d6b467df734e14fa6463f048 (diff) | |
Merge "Revert "qcacld-2.0: Expand propagation delay value range to U32"" into wlan-cld2.driver.lnx.1.0-dev
| -rw-r--r-- | CORE/HDD/inc/wlan_hdd_cfg80211.h | 2 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg80211.c | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/CORE/HDD/inc/wlan_hdd_cfg80211.h b/CORE/HDD/inc/wlan_hdd_cfg80211.h index 6d8cd10b1565..c16be3359719 100644 --- a/CORE/HDD/inc/wlan_hdd_cfg80211.h +++ b/CORE/HDD/inc/wlan_hdd_cfg80211.h @@ -1595,7 +1595,7 @@ enum qca_wlan_vendor_acs_hw_mode { #define CFG_AGG_RETRY_MAX (31) #define CFG_MGMT_RETRY_MAX (31) #define CFG_CTRL_RETRY_MAX (31) -#define CFG_PROPAGATION_DELAY_MAX (16383) +#define CFG_PROPAGATION_DELAY_MAX (63) #define CFG_AGG_RETRY_MIN (5) /** diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index 00ab4d24e97f..fc0694fe9393 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -9564,7 +9564,7 @@ wlan_hdd_wifi_config_policy[QCA_WLAN_VENDOR_ATTR_CONFIG_MAX [QCA_WLAN_VENDOR_ATTR_CONFIG_AGG_RETRY] = {.type = NLA_U8}, [QCA_WLAN_VENDOR_ATTR_CONFIG_MGMT_RETRY] = {.type = NLA_U8}, [QCA_WLAN_VENDOR_ATTR_CONFIG_CTRL_RETRY] = {.type = NLA_U8}, - [QCA_WLAN_VENDOR_ATTR_CONFIG_PROPAGATION_DELAY] = {.type = NLA_U32}, + [QCA_WLAN_VENDOR_ATTR_CONFIG_PROPAGATION_DELAY] = {.type = NLA_U8}, [QCA_WLAN_VENDOR_ATTR_CONFIG_TX_FAIL_COUNT] = {.type = NLA_U32 }, [QCA_WLAN_VENDOR_ATTR_CONFIG_ANT_DIV_ENA] = {.type = NLA_U32 }, [QCA_WLAN_VENDOR_ATTR_CONFIG_ANT_DIV_CHAIN] = {.type = NLA_U32 }, @@ -9714,8 +9714,7 @@ static int __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, int ret_val = 0; u32 modulated_dtim; uint16_t stats_avg_factor, tx_rate; - uint8_t set_value, retry, qpower; - uint32_t delay; + uint8_t set_value, retry, delay, qpower; u32 guard_time; u32 ftm_capab; eHalStatus status; @@ -9938,7 +9937,7 @@ static int __wlan_hdd_cfg80211_wifi_configuration_set(struct wiphy *wiphy, } if (tb[QCA_WLAN_VENDOR_ATTR_CONFIG_PROPAGATION_DELAY]) { - delay = nla_get_u32( + delay = nla_get_u8( tb[QCA_WLAN_VENDOR_ATTR_CONFIG_PROPAGATION_DELAY]); delay = delay > CFG_PROPAGATION_DELAY_MAX ? CFG_PROPAGATION_DELAY_MAX : delay; |