diff options
| author | Hsu, Ryan <ryanhsu@qca.qualcomm.com> | 2016-03-03 15:36:44 +0200 |
|---|---|---|
| committer | Anjaneedevi Kapparapu <akappa@codeaurora.org> | 2016-03-14 16:41:13 +0530 |
| commit | 06c725f1b11c2bafa71a97da8e70a9db87955474 (patch) | |
| tree | b93c849d3d1883c290ad208a39135145190e3b89 | |
| parent | bbbde80816402c0a1c25628bc000e573385b0e44 (diff) | |
qcacld-2.0: Update bss_type and privacy params for cfg80211_get_bss
Commit "cfg80211: add bss_type and privacy arguments in
cfg80211_get_bss()" was backported to kernel-3.18.
This commit updates the new bss_type and privacy argument, so adding
the Kernel version check accordingly.
cfg80211_get_bss new signature is:
struct cfg80211_bss *cfg80211_get_bss(struct wiphy *wiphy,
struct ieee80211_channel *channel, const u8 *bssid,
const u8 *ssid, size_t ssid_len, enum ieee80211_bss_type bss_type,
enum ieee80211_privacy);
Since this needs a backport change from Kernel 4.1, the Kernel
version check and the feature macro - IEEE80211_PRIVACY check is used
to enclose the new changes.
Change-Id: I2eee1d7297b3dbd8ee5b5c89677e76bacbb47e03
CRs-Fixed: 984939
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_assoc.c | 5 | ||||
| -rw-r--r-- | CORE/HDD/src/wlan_hdd_cfg80211.c | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c index 5011a13cdd8f..95694d88a2d8 100644 --- a/CORE/HDD/src/wlan_hdd_assoc.c +++ b/CORE/HDD/src/wlan_hdd_assoc.c @@ -1443,7 +1443,12 @@ static void hdd_SendReAssocEvent(struct net_device *dev, sme_RoamGetConnectProfile(hal_handle, pAdapter->sessionId, &roam_profile); bss = cfg80211_get_bss(pAdapter->wdev.wiphy, chan, pCsrRoamInfo->bssid, &roam_profile.SSID.ssId[0], roam_profile.SSID.length, +#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 1, 0)) && !defined(WITH_BACKPORTS) \ + && !defined(IEEE80211_PRIVACY) 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 525e304df132..ca4a056b3641 100644 --- a/CORE/HDD/src/wlan_hdd_cfg80211.c +++ b/CORE/HDD/src/wlan_hdd_cfg80211.c @@ -15534,7 +15534,12 @@ struct cfg80211_bss* wlan_hdd_cfg80211_update_bss_list( bss = cfg80211_get_bss(wiphy, chan, pBssDesc->bssId, &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) \ + && !defined(IEEE80211_PRIVACY) 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 { |