rt2x00: Rate structure overhaul

Recent changes to the rate structure registration broke rt2x00,
the hw_value was reduced from 32bits to 16bits while rt2x00 used
the full 32bits. However the way rt2x00 used the value was inflexible
and needed to be changed anyway.

This patch creates a array containing information for each rate,
the hw_value passed to mac80211 is the index value for that array
including a field to indicate if short preamble should be enabled.

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

1 files changed, 0 insertions, 71 deletions

diff --git a/drivers/net/wireless/rt2x00/rt2x00reg.h b/drivers/net/wireless/rt2x00/rt2x00reg.h
index e0ebe51c082f..0325bed2fbf5 100644
--- a/drivers/net/wireless/rt2x00/rt2x00reg.h
+++ b/drivers/net/wireless/rt2x00/rt2x00reg.h
@@ -220,75 +220,4 @@ static inline u8 rt2x00_get_field8(const u8 reg,
         return (reg & field.bit_mask) >> field.bit_offset;
 }
 
-/*
- * Device specific rate value.
- * We will have to create the device specific rate value
- * passed to the ieee80211 kernel. We need to make it a consist of
- * multiple fields because we want to store more then 1 device specific
- * values inside the value.
- *      1 - rate, stored as 100 kbit/s.
- *      2 - preamble, short_preamble enabled flag.
- *      3 - MASK_RATE, which rates are enabled in this mode, this mask
- *      corresponds with the TX register format for the current device.
- *      4 - plcp, 802.11b rates are device specific,
- *      802.11g rates are set according to the ieee802.11a-1999 p.14.
- * The bit to enable preamble is set in a seperate define.
- */
-#define DEV_RATE        FIELD32(0x000007ff)
-#define DEV_PREAMBLE    FIELD32(0x00000800)
-#define DEV_RATEMASK    FIELD32(0x00fff000)
-#define DEV_PLCP        FIELD32(0xff000000)
-
-/*
- * Bitfields
- */
-#define DEV_RATEBIT_1MB         ( 1 << 0 )
-#define DEV_RATEBIT_2MB         ( 1 << 1 )
-#define DEV_RATEBIT_5_5MB       ( 1 << 2 )
-#define DEV_RATEBIT_11MB        ( 1 << 3 )
-#define DEV_RATEBIT_6MB         ( 1 << 4 )
-#define DEV_RATEBIT_9MB         ( 1 << 5 )
-#define DEV_RATEBIT_12MB        ( 1 << 6 )
-#define DEV_RATEBIT_18MB        ( 1 << 7 )
-#define DEV_RATEBIT_24MB        ( 1 << 8 )
-#define DEV_RATEBIT_36MB        ( 1 << 9 )
-#define DEV_RATEBIT_48MB        ( 1 << 10 )
-#define DEV_RATEBIT_54MB        ( 1 << 11 )
-
-/*
- * Bitmasks for DEV_RATEMASK
- */
-#define DEV_RATEMASK_1MB        ( (DEV_RATEBIT_1MB << 1) -1 )
-#define DEV_RATEMASK_2MB        ( (DEV_RATEBIT_2MB << 1) -1 )
-#define DEV_RATEMASK_5_5MB      ( (DEV_RATEBIT_5_5MB << 1) -1 )
-#define DEV_RATEMASK_11MB       ( (DEV_RATEBIT_11MB << 1) -1 )
-#define DEV_RATEMASK_6MB        ( (DEV_RATEBIT_6MB << 1) -1 )
-#define DEV_RATEMASK_9MB        ( (DEV_RATEBIT_9MB << 1) -1 )
-#define DEV_RATEMASK_12MB       ( (DEV_RATEBIT_12MB << 1) -1 )
-#define DEV_RATEMASK_18MB       ( (DEV_RATEBIT_18MB << 1) -1 )
-#define DEV_RATEMASK_24MB       ( (DEV_RATEBIT_24MB << 1) -1 )
-#define DEV_RATEMASK_36MB       ( (DEV_RATEBIT_36MB << 1) -1 )
-#define DEV_RATEMASK_48MB       ( (DEV_RATEBIT_48MB << 1) -1 )
-#define DEV_RATEMASK_54MB       ( (DEV_RATEBIT_54MB << 1) -1 )
-
-/*
- * Bitmask groups of bitrates
- */
-#define DEV_BASIC_RATEMASK \
-        ( DEV_RATEMASK_11MB | \
-          DEV_RATEBIT_6MB | DEV_RATEBIT_12MB | DEV_RATEBIT_24MB )
-
-#define DEV_CCK_RATEMASK        ( DEV_RATEMASK_11MB )
-#define DEV_OFDM_RATEMASK       ( DEV_RATEMASK_54MB & ~DEV_CCK_RATEMASK )
-
-/*
- * Macro's to set and get specific fields from the device specific val and val2
- * fields inside the ieee80211_rate entry.
- */
-#define DEVICE_SET_RATE_FIELD(__value, __mask) \
-        (int)( ((__value) << DEV_##__mask.bit_offset) & DEV_##__mask.bit_mask )
-
-#define DEVICE_GET_RATE_FIELD(__value, __mask) \
-        (int)( ((__value) & DEV_##__mask.bit_mask) >> DEV_##__mask.bit_offset )
-
 #endif /* RT2X00REG_H */