diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2017-02-13 06:19:59 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-02-13 06:19:59 -0800 |
| commit | e5ef2ac935b5abd3db796554633476f287d568a7 (patch) | |
| tree | 2e77c6f68c563b83e68f7c2efed6c999ca90f5ec | |
| parent | 288b37832588b5ae2e9b8bbc3d8587118aedc979 (diff) | |
| parent | 3de9e51436daac5bf4759b83a8be130f8d48ecb8 (diff) | |
Merge "qcacld-2.0: Fix an inconsistent conditional macro usage" into wlan-cld2.driver.lnx.1.0-dev
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg80211.c | 3 |
1 files changed, 2 insertions, 1 deletions
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 |