[PATCH] libertas: simplify and clean up data rate handling

Remove unused/duplicated fields and consolidate static data rate arrays,
for example the libertas_supported_rates[] and datarates[] arrays in
the bss_descriptor structure, and the libertas_supported_rates field
in the wlan_adapter structure.

Introduce libertas_fw_index_to_data_rate and libertas_data_rate_to_fw_index
functions and use them everywhere firmware requires a rate index rather
than a rate array.

The firmware requires the 4 basic rates to have the MSB set, but most
other stuff doesn't, like WEXT and mesh ioctls.  Therefore, only set the MSB
on basic rates when pushing rate arrays to firmware instead of doing a ton
of (rate & 0x7f) everywhere.

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 5 insertions, 11 deletions

diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index c6fb703f665b..6acb8fb8733e 100644
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -72,10 +72,8 @@ struct current_bss_params {
         u8 band;
         /** channel */
         u8 channel;
-        /** number of rates supported */
-        int numofrates;
-        /** supported rates*/
-        u8 datarates[WLAN_SUPPORTED_RATES];
+        /** zero-terminated array of supported data rates */
+        u8 rates[MAX_RATES + 1];
 };
 
 /** sleep_params */
@@ -296,9 +294,6 @@ struct _wlan_adapter {
         u32 fragthsd;
         u32 rtsthsd;
 
-        u32 datarate;
-        u8 is_datarate_auto;
-
         u16 listeninterval;
         u16 prescan;
         u8 txretrycount;
@@ -364,10 +359,9 @@ struct _wlan_adapter {
         u8 radioon;
         u32 preamble;
 
-        /** Multi bands Parameter*/
-        u8 libertas_supported_rates[G_SUPPORTED_RATES];
-
-        /** Blue Tooth Co-existence Arbitration */
+        /** data rate stuff */
+        u8 cur_rate;
+        u8 auto_rate;
 
         /** sleep_params */
         struct sleep_params sp;