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>

2 files changed, 36 insertions, 28 deletions

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index ac0241e3539b..fbb2d072cb9e 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -735,14 +735,16 @@ static int ieee80211_get_station(struct wiphy *wiphy, struct net_device *dev,
 }
 
 static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
-                                         struct ieee80211_channel *chan,
-                                         enum nl80211_channel_type channel_type)
+                                         struct cfg80211_chan_def *chandef)
 {
         struct ieee80211_local *local = wiphy_priv(wiphy);
         struct ieee80211_sub_if_data *sdata;
+        enum nl80211_channel_type channel_type;
         int ret = 0;
 
-        if (local->monitor_channel == chan &&
+        channel_type = cfg80211_get_chandef_type(chandef);
+
+        if (local->monitor_channel == chandef->chan &&
             local->monitor_channel_type == channel_type)
                 return 0;
 
@@ -754,17 +756,17 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy,
                 if (sdata) {
                         ieee80211_vif_release_channel(sdata);
                         ret = ieee80211_vif_use_channel(
-                                        sdata, chan, channel_type,
+                                        sdata, chandef->chan, channel_type,
                                         IEEE80211_CHANCTX_EXCLUSIVE);
                 }
         } else if (local->open_count == local->monitors) {
-                local->_oper_channel = chan;
+                local->_oper_channel = chandef->chan;
                 local->_oper_channel_type = channel_type;
                 ieee80211_hw_config(local, 0);
         }
 
         if (ret == 0) {
-                local->monitor_channel = chan;
+                local->monitor_channel = chandef->chan;
                 local->monitor_channel_type = channel_type;
         }
         mutex_unlock(&local->iflist_mtx);
@@ -888,9 +890,10 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
         sdata->smps_mode = IEEE80211_SMPS_OFF;
         sdata->needed_rx_chains = sdata->local->rx_chains;
 
-        err = ieee80211_vif_use_channel(sdata, params->channel,
-                                        params->channel_type,
-                                        IEEE80211_CHANCTX_SHARED);
+        err = ieee80211_vif_use_channel(
+                sdata, params->chandef.chan,
+                cfg80211_get_chandef_type(&params->chandef),
+                IEEE80211_CHANCTX_SHARED);
         if (err)
                 return err;
 
@@ -1707,9 +1710,10 @@ static int ieee80211_join_mesh(struct wiphy *wiphy, struct net_device *dev,
         sdata->smps_mode = IEEE80211_SMPS_OFF;
         sdata->needed_rx_chains = sdata->local->rx_chains;
 
-        err = ieee80211_vif_use_channel(sdata, setup->channel,
-                                        setup->channel_type,
-                                        IEEE80211_CHANCTX_SHARED);
+        err = ieee80211_vif_use_channel(
+                sdata, setup->chandef.chan,
+                cfg80211_get_chandef_type(&setup->chandef),
+                IEEE80211_CHANCTX_SHARED);
         if (err)
                 return err;
 
@@ -3110,23 +3114,24 @@ static int ieee80211_probe_client(struct wiphy *wiphy, struct net_device *dev,
         return 0;
 }
 
-static struct ieee80211_channel *
-ieee80211_cfg_get_channel(struct wiphy *wiphy, struct wireless_dev *wdev,
-                          enum nl80211_channel_type *type)
+static int ieee80211_cfg_get_channel(struct wiphy *wiphy,
+                                     struct wireless_dev *wdev,
+                                     struct cfg80211_chan_def *chandef)
 {
         struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev);
         struct ieee80211_chanctx_conf *chanctx_conf;
-        struct ieee80211_channel *chan = NULL;
+        int ret = -ENODATA;
 
         rcu_read_lock();
         chanctx_conf = rcu_dereference(sdata->vif.chanctx_conf);
         if (chanctx_conf) {
-                *type = chanctx_conf->channel_type;
-                chan = chanctx_conf->channel;
+                chandef->chan = chanctx_conf->channel;
+                chandef->_type = chanctx_conf->channel_type;
+                ret = 0;
         }
         rcu_read_unlock();
 
-        return chan;
+        return ret;
 }
 
 #ifdef CONFIG_PM
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index 845973b67a73..bed616fd97e9 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -51,7 +51,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
         struct cfg80211_bss *bss;
         u32 bss_change;
         u8 supp_rates[IEEE80211_MAX_SUPP_RATES];
-        enum nl80211_channel_type channel_type;
+        struct cfg80211_chan_def chandef;
 
         lockdep_assert_held(&ifibss->mtx);
 
@@ -79,12 +79,13 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
 
         sdata->drop_unencrypted = capability & WLAN_CAPABILITY_PRIVACY ? 1 : 0;
 
-        channel_type = ifibss->channel_type;
-        if (!cfg80211_can_beacon_sec_chan(local->hw.wiphy, chan, channel_type))
-                channel_type = NL80211_CHAN_HT20;
+        chandef.chan = chan;
+        chandef._type = ifibss->channel_type;
+        if (!cfg80211_reg_can_beacon(local->hw.wiphy, &chandef))
+                chandef._type = NL80211_CHAN_HT20;
 
         ieee80211_vif_release_channel(sdata);
-        if (ieee80211_vif_use_channel(sdata, chan, channel_type,
+        if (ieee80211_vif_use_channel(sdata, chan, chandef._type,
                                       ifibss->fixed_channel ?
                                         IEEE80211_CHANCTX_SHARED :
                                         IEEE80211_CHANCTX_EXCLUSIVE)) {
@@ -158,7 +159,8 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
                        ifibss->ie, ifibss->ie_len);
 
         /* add HT capability and information IEs */
-        if (channel_type && sband->ht_cap.ht_supported) {
+        if (chandef._type != NL80211_CHAN_NO_HT &&
+            sband->ht_cap.ht_supported) {
                 pos = skb_put(skb, 4 +
                                    sizeof(struct ieee80211_ht_cap) +
                                    sizeof(struct ieee80211_ht_operation));
@@ -170,7 +172,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
                  * keep them at 0
                  */
                 pos = ieee80211_ie_build_ht_oper(pos, &sband->ht_cap,
-                                                 chan, channel_type, 0);
+                                                 chan, chandef._type, 0);
         }
 
         if (local->hw.queues >= IEEE80211_NUM_ACS) {
@@ -1078,8 +1080,9 @@ int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata,
 
         sdata->vif.bss_conf.beacon_int = params->beacon_interval;
 
-        sdata->u.ibss.channel = params->channel;
-        sdata->u.ibss.channel_type = params->channel_type;
+        sdata->u.ibss.channel = params->chandef.chan;
+        sdata->u.ibss.channel_type =
+                cfg80211_get_chandef_type(&params->chandef);
         sdata->u.ibss.fixed_channel = params->channel_fixed;
 
         if (params->ie) {