cfg80211: pass a channel definition struct

Instead of passing a channel pointer and channel type
to all functions and driver methods, pass a new channel
definition struct. Right now, this struct contains just
the control channel and channel type, but for VHT this
will change.

Also, add a small inline cfg80211_get_chandef_type() so
that drivers don't need to use the _type field of the
new structure all the time, which will change.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

1 files changed, 18 insertions, 12 deletions

diff --git a/drivers/net/wireless/mwifiex/cfg80211.c b/drivers/net/wireless/mwifiex/cfg80211.c
index f69190b492aa..42be612faf0f 100644
--- a/drivers/net/wireless/mwifiex/cfg80211.c
+++ b/drivers/net/wireless/mwifiex/cfg80211.c
@@ -1291,21 +1291,23 @@ static int mwifiex_cfg80211_start_ap(struct wiphy *wiphy,
                 return -EINVAL;
         }
 
-        bss_cfg->channel =
-            (u8)ieee80211_frequency_to_channel(params->channel->center_freq);
+        bss_cfg->channel = ieee80211_frequency_to_channel(
+                                params->chandef.chan->center_freq);
 
         /* Set appropriate bands */
-        if (params->channel->band == IEEE80211_BAND_2GHZ) {
+        if (params->chandef.chan->band == IEEE80211_BAND_2GHZ) {
                 bss_cfg->band_cfg = BAND_CONFIG_BG;
 
-                if (params->channel_type == NL80211_CHAN_NO_HT)
+                if (cfg80211_get_chandef_type(&params->chandef) ==
+                                                NL80211_CHAN_NO_HT)
                         config_bands = BAND_B | BAND_G;
                 else
                         config_bands = BAND_B | BAND_G | BAND_GN;
         } else {
                 bss_cfg->band_cfg = BAND_CONFIG_A;
 
-                if (params->channel_type == NL80211_CHAN_NO_HT)
+                if (cfg80211_get_chandef_type(&params->chandef) ==
+                                                NL80211_CHAN_NO_HT)
                         config_bands = BAND_A;
                 else
                         config_bands = BAND_AN | BAND_A;
@@ -1678,7 +1680,7 @@ static int mwifiex_set_ibss_params(struct mwifiex_private *priv,
         int index = 0, i;
         u8 config_bands = 0;
 
-        if (params->channel->band == IEEE80211_BAND_2GHZ) {
+        if (params->chandef.chan->band == IEEE80211_BAND_2GHZ) {
                 if (!params->basic_rates) {
                         config_bands = BAND_B | BAND_G;
                 } else {
@@ -1703,10 +1705,12 @@ static int mwifiex_set_ibss_params(struct mwifiex_private *priv,
                         }
                 }
 
-                if (params->channel_type != NL80211_CHAN_NO_HT)
+                if (cfg80211_get_chandef_type(&params->chandef) !=
+                                                NL80211_CHAN_NO_HT)
                         config_bands |= BAND_GN;
         } else {
-                if (params->channel_type == NL80211_CHAN_NO_HT)
+                if (cfg80211_get_chandef_type(&params->chandef) !=
+                                                NL80211_CHAN_NO_HT)
                         config_bands = BAND_A;
                 else
                         config_bands = BAND_AN | BAND_A;
@@ -1723,9 +1727,10 @@ static int mwifiex_set_ibss_params(struct mwifiex_private *priv,
         }
 
         adapter->sec_chan_offset =
-                mwifiex_chan_type_to_sec_chan_offset(params->channel_type);
-        priv->adhoc_channel =
-                ieee80211_frequency_to_channel(params->channel->center_freq);
+                mwifiex_chan_type_to_sec_chan_offset(
+                        cfg80211_get_chandef_type(&params->chandef));
+        priv->adhoc_channel = ieee80211_frequency_to_channel(
+                                params->chandef.chan->center_freq);
 
         wiphy_dbg(wiphy, "info: set ibss band %d, chan %d, chan offset %d\n",
                   config_bands, priv->adhoc_channel, adapter->sec_chan_offset);
@@ -1759,7 +1764,8 @@ mwifiex_cfg80211_join_ibss(struct wiphy *wiphy, struct net_device *dev,
 
         ret = mwifiex_cfg80211_assoc(priv, params->ssid_len, params->ssid,
                                      params->bssid, priv->bss_mode,
-                                     params->channel, NULL, params->privacy);
+                                     params->chandef.chan, NULL,
+                                     params->privacy);
 done:
         if (!ret) {
                 cfg80211_ibss_joined(priv->netdev, priv->cfg_bssid, GFP_KERNEL);