[9610] wlbt: Change function name from __ieee80211_get_channel to ieee80211_get_chann...
authorTarun Karela <t.karela@samsung.com>
Wed, 30 May 2018 17:45:41 +0000 (18:45 +0100)
committerYoungsoo Kim <youngss.kim@samsung.com>
Fri, 15 Jun 2018 22:49:16 +0000 (07:49 +0900)
Fixes following compilation errors. Looks like it is simple case of function name change in api

drivers/net/wireless/scsc/mgt.c: In function 'slsi_select_wifi_sharing_ap_channel':
drivers/net/wireless/scsc/mgt.c:4033:4: error: implicit declaration of function '__ieee80211_get_channel' [-Werror=implicit-function-declaration]
    settings->chandef.chan = __ieee80211_get_channel(wiphy, settings->chandef.chan->center_freq);
    ^
drivers/net/wireless/scsc/mgt.c:4033:27: warning: assignment makes pointer from integer without a cast
    settings->chandef.chan = __ieee80211_get_channel(wiphy, settings->chandef.chan->center_freq);
                           ^
drivers/net/wireless/scsc/mgt.c:4038:28: warning: assignment makes pointer from integer without a cast
     settings->chandef.chan = __ieee80211_get_channel(wiphy, sta_frequency);
                            ^
drivers/net/wireless/scsc/mgt.c:4062:29: warning: assignment makes pointer from integer without a cast
      settings->chandef.chan = __ieee80211_get_channel(wiphy, sta_frequency);
                             ^
drivers/net/wireless/scsc/mgt.c:4066:28: warning: assignment makes pointer from integer without a cast
     settings->chandef.chan = __ieee80211_get_channel(wiphy, SLSI_2G_CHANNEL_ONE);

Change-Id: Ia1d3792d014495f6a09a53d3569d84b75d0a9575
SCSC-Bug-Id: SSB-40175
Signed-off-by: Tarun Karela <t.karela@samsung.com>
drivers/net/wireless/scsc/mgt.c

index 48b523eb952ec274af8cf812331f4b1af1f1f465..9f01140d98b3e9bed6f5bbebebffd5d8ea981ce7 100755 (executable)
@@ -4020,7 +4020,7 @@ void slsi_select_wifi_sharing_ap_channel(struct wiphy *wiphy, struct net_device
 #ifdef CONFIG_SCSC_WLAN_SINGLE_ANTENNA
                if ((settings->chandef.chan->center_freq) != (sta_frequency)) {
                        *channel_switched_flag = 1;
-                       settings->chandef.chan = __ieee80211_get_channel(wiphy, sta_frequency);
+                       settings->chandef.chan = ieee80211_get_channel(wiphy, sta_frequency);
                        settings->chandef.center_freq1 = sta_frequency;
                }
 #else
@@ -4029,12 +4029,12 @@ void slsi_select_wifi_sharing_ap_channel(struct wiphy *wiphy, struct net_device
                    !(slsi_check_if_channel_restricted_already(sdev,
                    ieee80211_frequency_to_channel(settings->chandef.chan->center_freq))) &&
                    slsi_if_valid_wifi_sharing_channel(sdev, settings->chandef.chan->center_freq)) {
-                       settings->chandef.chan = __ieee80211_get_channel(wiphy, settings->chandef.chan->center_freq);
+                       settings->chandef.chan = ieee80211_get_channel(wiphy, settings->chandef.chan->center_freq);
                        settings->chandef.center_freq1 = settings->chandef.chan->center_freq;
                } else {
                        if ((settings->chandef.chan->center_freq) != (sta_frequency)) {
                                *channel_switched_flag = 1;
-                               settings->chandef.chan = __ieee80211_get_channel(wiphy, sta_frequency);
+                               settings->chandef.chan = ieee80211_get_channel(wiphy, sta_frequency);
                                settings->chandef.center_freq1 = sta_frequency;
                        }
                }
@@ -4046,7 +4046,7 @@ void slsi_select_wifi_sharing_ap_channel(struct wiphy *wiphy, struct net_device
 #ifdef CONFIG_SCSC_WLAN_SINGLE_ANTENNA
                if ((settings->chandef.chan->center_freq) != (sta_frequency)) {
                        *channel_switched_flag = 1;
-                       settings->chandef.chan = __ieee80211_get_channel(wiphy, sta_frequency);
+                       settings->chandef.chan = ieee80211_get_channel(wiphy, sta_frequency);
                        settings->chandef.center_freq1 = sta_frequency;
                }
                /* Single antenna end */
@@ -4058,11 +4058,11 @@ void slsi_select_wifi_sharing_ap_channel(struct wiphy *wiphy, struct net_device
                            slsi_if_valid_wifi_sharing_channel(sdev, sta_frequency)) {
                                if ((settings->chandef.chan->center_freq) != (sta_frequency)) {
                                        *channel_switched_flag = 1;
-                                       settings->chandef.chan = __ieee80211_get_channel(wiphy, sta_frequency);
+                                       settings->chandef.chan = ieee80211_get_channel(wiphy, sta_frequency);
                                }
                        } else {
                                *channel_switched_flag = 1;
-                               settings->chandef.chan = __ieee80211_get_channel(wiphy, SLSI_2G_CHANNEL_ONE);
+                               settings->chandef.chan = ieee80211_get_channel(wiphy, SLSI_2G_CHANNEL_ONE);
                                settings->chandef.center_freq1 = SLSI_2G_CHANNEL_ONE;
                        }
                }