From 3de9e51436daac5bf4759b83a8be130f8d48ecb8 Mon Sep 17 00:00:00 2001 From: wadesong Date: Thu, 9 Feb 2017 14:42:17 +0800 Subject: qcacld-2.0: Fix an inconsistent conditional macro usage WLAN beacon tx rate customization has been enabled in the Linux OS kernel with macro CFG80211_BEACON_TX_RATE_CUSTOM_BACKPORT, but the WLAN host driver uses a different macro(BEACON_RATE_BACKPORTS) for the same feature. Change the WLAN host driver's code to make it using the same conditional macro Change-Id: Ic6e44b7f1cdef2c2912d8baf5aba579929d5400a CRs-Fixed: 2004373 --- CORE/HDD/src/wlan_hdd_cfg80211.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c index 52eb27d1ad43..71fe89b9bd01 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -16858,7 +16858,8 @@ static int wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, } #endif -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)) || defined(BEACON_RATE_BACKPORTS) +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) || \ + defined(CFG80211_BEACON_TX_RATE_CUSTOM_BACKPORT) /** * hdd_get_data_rate_from_rate_mask() - convert mask to rate * @wiphy: Pointer to wiphy -- cgit v1.2.3