From 2eb1e458638ee070da95b5f46674e3c52be78866 Mon Sep 17 00:00:00 2001 From: Dustin Brown Date: Tue, 15 Aug 2017 12:40:34 -0700 Subject: [PATCH] qcacld-3.0: Remove name indirection for ieee80211_get_channel() Versions 4.11+ of the Linux kernel removed '__' from the beginning of ieee80211_get_channel(). Migrate all calls from __ieee80211_get_channel to ieee80211_get_channel instead. Change-Id: I255367d1e1d815e7ebbda43dc06d6d854e1534f4 CRs-Fixed: 2093213 --- core/hdd/src/wlan_hdd_cfg80211.c | 8 ++++---- core/hdd/src/wlan_hdd_hostapd.c | 2 +- core/hdd/src/wlan_hdd_scan.c | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 27f1eb37c27a..33d4e91ebca0 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -8760,7 +8760,7 @@ int wlan_hdd_request_pre_cac(uint8_t channel) } freq = cds_chan_to_freq(pre_cac_chan); - chan = __ieee80211_get_channel(wiphy, freq); + chan = ieee80211_get_channel(wiphy, freq); if (!chan) { hdd_err("channel converion failed"); goto stop_close_pre_cac_adapter; @@ -14003,7 +14003,7 @@ struct cfg80211_bss *wlan_hdd_cfg80211_inform_bss_frame(hdd_adapter_t *pAdapter, return NULL; } - chan = __ieee80211_get_channel(wiphy, freq); + chan = ieee80211_get_channel(wiphy, freq); /* When the band is changed on the fly using the GUI, three things are done * 1. scan abort * 2. flush scan results from cache @@ -14019,7 +14019,7 @@ struct cfg80211_bss *wlan_hdd_cfg80211_inform_bss_frame(hdd_adapter_t *pAdapter, * callback is very small then band change will not reflect in SME and SME * reports to HDD all the channels correponding to previous band.this is due * to race condition.but those channels are invalid to the new band and so - * this function __ieee80211_get_channel will return NULL.Each time we + * this function ieee80211_get_channel will return NULL.Each time we * report scan result with this pointer null warning kernel trace is printed. * if the scan results contain large number of APs continuosly kernel * warning trace is printed and it will lead to apps watch dog bark. @@ -15883,7 +15883,7 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy, */ if (!ok) { struct ieee80211_channel *chan = - __ieee80211_get_channel(wiphy, + ieee80211_get_channel(wiphy, wlan_chan_to_freq(req->channel->hw_value)); struct cfg80211_bss *bss; diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 580e0598e69f..dd2ad810a82f 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -664,7 +664,7 @@ QDF_STATUS hdd_chan_change_notify(hdd_adapter_t *adapter, freq = cds_chan_to_freq(chan_change.chan); - chan = __ieee80211_get_channel(adapter->wdev.wiphy, freq); + chan = ieee80211_get_channel(adapter->wdev.wiphy, freq); if (!chan) { hdd_err("Invalid input frequency for channel conversion"); diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c index 25ab9e18a6eb..879373315f94 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -1556,8 +1556,7 @@ static int __wlan_hdd_cfg80211_vendor_scan(struct wiphy *wiphy, count); goto error; } - chan = __ieee80211_get_channel(wiphy, - nla_get_u32(attr)); + chan = ieee80211_get_channel(wiphy, nla_get_u32(attr)); if (!chan) goto error; if (chan->flags & IEEE80211_CHAN_DISABLED)