rt2x00: Replace open coded interface checking with interface combinations.

Mac80211 has formal infrastructure to specify which interface combinations
are supported. Make use of this facility in favor of open coding it
ourselves.
So far we only have to specify we can support multiple AP interfaces,
no other combinations are supported.

Inspired by an earlier patch from Paul Fertser.

Signed-off-by: Gertjan van Wingerde <[email protected]>
Cc: Paul Fertser <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 09bf01ce65f4b36e539f81005cc5ee170288194a..0751b35ef6dcd536ba51c3554dc4b58e359a9628 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -740,6 +740,14 @@ enum rt2x00_capability_flags {
        CAPABILITY_VCO_RECALIBRATION,
 };
 
+/*
+ * Interface combinations
+ */
+enum {
+       IF_COMB_AP = 0,
+       NUM_IF_COMB,
+};
+
 /*
  * rt2x00 device structure.
  */
@@ -866,6 +874,12 @@ struct rt2x00_dev {
        unsigned int intf_associated;
        unsigned int intf_beaconing;
 
+       /*
+        * Interface combinations
+        */
+       struct ieee80211_iface_limit if_limits_ap;
+       struct ieee80211_iface_combination if_combinations[NUM_IF_COMB];
+
        /*
         * Link quality
         */

diff --git a/drivers/net/wireless/rt2x00/rt2x00dev.c b/drivers/net/wireless/rt2x00/rt2x00dev.c
index 10cf67267775ed93487183d24a9facc2bc9aa423..69097d1faeb676d97ddd27c7ba7dc3f575cd2f6f 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c
@@ -1118,6 +1118,34 @@ void rt2x00lib_stop(struct rt2x00_dev *rt2x00dev)
        rt2x00dev->intf_associated = 0;
 }
 
+static inline void rt2x00lib_set_if_combinations(struct rt2x00_dev *rt2x00dev)
+{
+       struct ieee80211_iface_limit *if_limit;
+       struct ieee80211_iface_combination *if_combination;
+
+       /*
+        * Build up AP interface limits structure.
+        */
+       if_limit = &rt2x00dev->if_limits_ap;
+       if_limit->max = rt2x00dev->ops->max_ap_intf;
+       if_limit->types = BIT(NL80211_IFTYPE_AP);
+
+       /*
+        * Build up AP interface combinations structure.
+        */
+       if_combination = &rt2x00dev->if_combinations[IF_COMB_AP];
+       if_combination->limits = if_limit;
+       if_combination->n_limits = 1;
+       if_combination->max_interfaces = if_limit->max;
+       if_combination->num_different_channels = 1;
+
+       /*
+        * Finally, specify the possible combinations to mac80211.
+        */
+       rt2x00dev->hw->wiphy->iface_combinations = rt2x00dev->if_combinations;
+       rt2x00dev->hw->wiphy->n_iface_combinations = 1;
+}
+
 /*
  * driver allocation handlers.
  */
@@ -1125,6 +1153,11 @@ int rt2x00lib_probe_dev(struct rt2x00_dev *rt2x00dev)
 {
        int retval = -ENOMEM;
 
+       /*
+        * Set possible interface combinations.
+        */
+       rt2x00lib_set_if_combinations(rt2x00dev);
+
        /*
         * Allocate the driver data memory, if necessary.
         */

diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c
index 2f98d3d4a979a0f5602a311dccfb57d66d51a5c3..98a9e48f8e4a38e852c54e8dbdef0c2369a753a4 100644 (file)
--- a/drivers/net/wireless/rt2x00/rt2x00mac.c
+++ b/drivers/net/wireless/rt2x00/rt2x00mac.c
@@ -214,45 +214,6 @@ int rt2x00mac_add_interface(struct ieee80211_hw *hw,
            !test_bit(DEVICE_STATE_STARTED, &rt2x00dev->flags))
                return -ENODEV;
 
-       switch (vif->type) {
-       case NL80211_IFTYPE_AP:
-               /*
-                * We don't support mixed combinations of
-                * sta and ap interfaces.
-                */
-               if (rt2x00dev->intf_sta_count)
-                       return -ENOBUFS;
-
-               /*
-                * Check if we exceeded the maximum amount
-                * of supported interfaces.
-                */
-               if (rt2x00dev->intf_ap_count >= rt2x00dev->ops->max_ap_intf)
-                       return -ENOBUFS;
-
-               break;
-       case NL80211_IFTYPE_STATION:
-       case NL80211_IFTYPE_ADHOC:
-       case NL80211_IFTYPE_MESH_POINT:
-       case NL80211_IFTYPE_WDS:
-               /*
-                * We don't support mixed combinations of
-                * sta and ap interfaces.
-                */
-               if (rt2x00dev->intf_ap_count)
-                       return -ENOBUFS;
-
-               /*
-                * We don't support multiple STA interfaces.
-                */
-               if (rt2x00dev->intf_sta_count)
-                       return -ENOBUFS;
-
-               break;
-       default:
-               return -EINVAL;
-       }
-
        /*
         * Loop through all beacon queues to find a free
         * entry. Since there are as much beacon entries