From bbc972659d06f72c60382d3ea77522124dffa9fa Mon Sep 17 00:00:00 2001 From: Dustin Brown Date: Tue, 15 Aug 2017 12:31:27 -0700 Subject: [PATCH] qcacmn: 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: I0548259beb59f0a3cb27fe6fee1dd9626cc624cc CRs-Fixed: 2098795 --- os_if/linux/p2p/src/wlan_cfg80211_p2p.c | 4 ++-- os_if/linux/scan/src/wlan_cfg80211_scan.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/os_if/linux/p2p/src/wlan_cfg80211_p2p.c b/os_if/linux/p2p/src/wlan_cfg80211_p2p.c index 57429a1db88a..17d5178c3486 100644 --- a/os_if/linux/p2p/src/wlan_cfg80211_p2p.c +++ b/os_if/linux/p2p/src/wlan_cfg80211_p2p.c @@ -284,8 +284,8 @@ static void wlan_p2p_event_callback(void *user_data, goto fail; } - chan = __ieee80211_get_channel(wdev->wiphy, - wlan_chan_to_freq(p2p_event->chan)); + chan = ieee80211_get_channel(wdev->wiphy, + wlan_chan_to_freq(p2p_event->chan)); if (p2p_event->roc_event == ROC_EVENT_READY_ON_CHAN) { cfg80211_ready_on_channel(wdev, p2p_event->cookie, chan, diff --git a/os_if/linux/scan/src/wlan_cfg80211_scan.c b/os_if/linux/scan/src/wlan_cfg80211_scan.c index 276a2f2a039b..59286e8d82e9 100644 --- a/os_if/linux/scan/src/wlan_cfg80211_scan.c +++ b/os_if/linux/scan/src/wlan_cfg80211_scan.c @@ -1513,7 +1513,7 @@ wlan_get_ieee80211_channel(struct wiphy *wiphy, int chan_no) return NULL; } - chan = __ieee80211_get_channel(wiphy, freq); + chan = ieee80211_get_channel(wiphy, freq); if (!chan) cfg80211_err("chan is NULL, chan_no: %d freq: %d",