diff options
| author | Dustin Brown <dustinb@codeaurora.org> | 2017-08-24 17:03:09 -0700 |
|---|---|---|
| committer | snandini <snandini@codeaurora.org> | 2017-08-29 15:46:32 -0700 |
| commit | 29c8649ef93e5c56daf7c854565ff4860b832829 (patch) | |
| tree | 0798edfc3778cf204e9ec62fec9373e16b85eee6 | |
| parent | 0dbcb628e7f6decbe0ce0b2b8c6a64e859ee07b8 (diff) | |
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
| -rw-r--r-- | core/hdd/src/wlan_hdd_cfg80211.c | 6 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_hostapd.c | 2 | ||||
| -rw-r--r-- | core/hdd/src/wlan_hdd_scan.c | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c index 817861bcfba6..4359d4a96888 100644 --- a/core/hdd/src/wlan_hdd_cfg80211.c +++ b/core/hdd/src/wlan_hdd_cfg80211.c @@ -8381,7 +8381,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; @@ -14093,7 +14093,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 @@ -14109,7 +14109,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. diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c index 396827478113..c4b3ff6bbbb1 100644 --- a/core/hdd/src/wlan_hdd_hostapd.c +++ b/core/hdd/src/wlan_hdd_hostapd.c @@ -790,7 +790,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 0857bf430336..653dee9ed9cd 100644 --- a/core/hdd/src/wlan_hdd_scan.c +++ b/core/hdd/src/wlan_hdd_scan.c @@ -2672,8 +2672,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) |