cfg80211: pass a channel definition struct

[deliverable/linux.git] / drivers / net / wireless / brcm80211 / brcmfmac / wl_cfg80211.c

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
index cb30feaa565be13d61afab2b4fa50dc94d49b8f1..b596ca4f22bd9b77a4777a841fa8203a87df30a0 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c
@@ -1212,8 +1212,8 @@ brcmf_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *ndev,
        else
                WL_CONN("No BSSID specified\n");
 
-       if (params->channel)
-               WL_CONN("channel: %d\n", params->channel->center_freq);
+       if (params->chandef.chan)
+               WL_CONN("channel: %d\n", params->chandef.chan->center_freq);
        else
                WL_CONN("no channel specified\n");
 
@@ -1286,12 +1286,12 @@ brcmf_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *ndev,
        }
 
        /* Channel */
-       if (params->channel) {
+       if (params->chandef.chan) {
                u32 target_channel;
 
                cfg->channel =
                        ieee80211_frequency_to_channel(
-                               params->channel->center_freq);
+                               params->chandef.chan->center_freq);
                if (params->channel_fixed) {
                        /* adding chanspec */
                        brcmf_ch_to_chanspec(cfg->channel,
@@ -1721,7 +1721,7 @@ brcmf_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *ndev,
 }
 
 static s32
-brcmf_cfg80211_set_tx_power(struct wiphy *wiphy,
+brcmf_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
                            enum nl80211_tx_power_setting type, s32 mbm)
 {
 
@@ -1770,7 +1770,9 @@ done:
        return err;
 }
 
-static s32 brcmf_cfg80211_get_tx_power(struct wiphy *wiphy, s32 *dbm)
+static s32 brcmf_cfg80211_get_tx_power(struct wiphy *wiphy,
+                                      struct wireless_dev *wdev,
+                                      s32 *dbm)
 {
        struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
        struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
@@ -3936,7 +3938,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wiphy, struct net_device *ndev,
        s32 bssidx = 0;
 
        WL_TRACE("channel_type=%d, beacon_interval=%d, dtim_period=%d,\n",
-                settings->channel_type, settings->beacon_interval,
+                cfg80211_get_chandef_type(&settings->chandef),
+                settings->beacon_interval,
                 settings->dtim_period);
        WL_TRACE("ssid=%s(%d), auth_type=%d, inactivity_timeout=%d\n",
                 settings->ssid, settings->ssid_len, settings->auth_type,