rt2x00: Cleanup mode registration

Don't wildly pass any number for num_rates to rt2x00lib,
instead pass which type of rates are supported (CCK, OFDM).
Same for num_modes but then for the 2GHZ and 5GHZ band.

This makes the interface look much nicer and makes
extending it later easier.

Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 23 insertions, 15 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h
index 7a83e0a7dd05..e315d79b2aec 100644
--- a/drivers/net/wireless/rt2x00/rt2x00.h
+++ b/drivers/net/wireless/rt2x00/rt2x00.h
@@ -392,30 +392,38 @@ static inline struct rt2x00_intf* vif_to_intf(struct ieee80211_vif *vif)
         return (struct rt2x00_intf *)vif->drv_priv;
 }
 
-/*
+/**
+ * struct hw_mode_spec: Hardware specifications structure
+ *
  * Details about the supported modes, rates and channels
  * of a particular chipset. This is used by rt2x00lib
  * to build the ieee80211_hw_mode array for mac80211.
+ *
+ * @supported_bands: Bitmask contained the supported bands (2.4GHz, 5.2GHz).
+ * @supported_rates: Rate types which are supported (CCK, OFDM).
+ * @num_channels: Number of supported channels. This is used as array size
+ *      for @tx_power_a, @tx_power_bg and @channels.
+ * channels: Device/chipset specific channel values (See &struct rf_channel).
+ * @tx_power_a: TX power values for all 5.2GHz channels (may be NULL).
+ * @tx_power_bg: TX power values for all 2.4GHz channels (may be NULL).
+ * @tx_power_default: Default TX power value to use when either
+ *      @tx_power_a or @tx_power_bg is missing.
  */
 struct hw_mode_spec {
-        /*
-         * Number of modes, rates and channels.
-         */
-        int num_modes;
-        int num_rates;
-        int num_channels;
+        unsigned int supported_bands;
+#define SUPPORT_BAND_2GHZ       0x00000001
+#define SUPPORT_BAND_5GHZ       0x00000002
+
+        unsigned int supported_rates;
+#define SUPPORT_RATE_CCK        0x00000001
+#define SUPPORT_RATE_OFDM       0x00000002
+
+        unsigned int num_channels;
+        const struct rf_channel *channels;
 
-        /*
-         * txpower values.
-         */
         const u8 *tx_power_a;
         const u8 *tx_power_bg;
         u8 tx_power_default;
-
-        /*
-         * Device/chipset specific value.
-         */
-        const struct rf_channel *channels;
 };
 
 /*