From 535d16a34f65f9939ebee38b27232ab7e05d6062 Mon Sep 17 00:00:00 2001 From: Ryan Hsu Date: Mon, 18 Jan 2016 16:45:12 -0800 Subject: [PATCH] qcacld-3.0: Update bss_type and privacy params for cfg80211_get_bss Commmit: 6eb1813 ("cfg80211: add bss_type and privacy arguments in cfg80211_get_bss()") This commit update the new bss_type and privacy argument and is merged in Kernel 4.1, so adding the Kernel version check accordingly. Change-Id: I2bda71fc3cb2e126a1059a963f72f7a194bf9580 CRs-fixed: 963677 --- core/hdd/src/wlan_hdd_assoc.c | 4 ++++ core/hdd/src/wlan_hdd_cfg80211.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c index 7e211981946f..95b94d22d892 100644 --- a/core/hdd/src/wlan_hdd_assoc.c +++ b/core/hdd/src/wlan_hdd_assoc.c @@ -1433,7 +1433,11 @@ static void hdd_send_re_assoc_event(struct net_device *dev, bss = cfg80211_get_bss(pAdapter->wdev.wiphy, chan, pCsrRoamInfo->bssid.bytes, &roam_profile.SSID.ssId[0], roam_profile.SSID.length, +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)) && !defined(WITH_BACKPORTS) WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS); +#else + IEEE80211_BSS_TYPE_ESS, IEEE80211_PRIVACY_ANY); +#endif if (bss == NULL) hddLog(LOGE, FL("Get BSS returned NULL")); diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 4f1c1be971c1..2acbd95d7212 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -7253,7 +7253,11 @@ struct cfg80211_bss *wlan_hdd_cfg80211_update_bss_list(hdd_adapter_t *pAdapter, &pRoamInfo->pProfile->SSIDs.SSIDList->SSID. ssId[0], pRoamInfo->pProfile->SSIDs.SSIDList->SSID.length, +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)) && !defined(WITH_BACKPORTS) WLAN_CAPABILITY_ESS, WLAN_CAPABILITY_ESS); +#else + IEEE80211_BSS_TYPE_ESS, IEEE80211_PRIVACY_ANY); +#endif if (bss == NULL) { hddLog(LOGE, FL("BSS not present")); } else {