From 04c5e5af939bb25b3bac1c916d4ec422b14dbf20 Mon Sep 17 00:00:00 2001
From: Holger Schurig <hs4233@mail.mn-solutions.de>
Date: Mon, 28 Jan 2008 17:27:03 +0100
Subject: [PATCH] --- yaml --- r: 89835 b: refs/heads/master c:
 23ff50361f23355334bffe33de84f0b52aa34b9d h: refs/heads/master i:   89833:
 b2d5f01fb61c6d9b1b63ed287fbc71bb3c94c3a2   89831:
 7d24628c0d1f8d1cbf6fba8808851db320c40b87 v: v3

---
 [refs]                                     |  2 +-
 trunk/drivers/net/wireless/libertas/join.c | 17 -----------------
 trunk/drivers/net/wireless/libertas/join.h |  2 --
 trunk/drivers/net/wireless/libertas/scan.c | 17 +++++++++++++++++
 4 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/[refs] b/[refs]
index 358413627789..c9b526593cf6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e226868ec3f3f98544ed2e6e7af7b6b8a629f492
+refs/heads/master: 23ff50361f23355334bffe33de84f0b52aa34b9d
diff --git a/trunk/drivers/net/wireless/libertas/join.c b/trunk/drivers/net/wireless/libertas/join.c
index a0a060939322..56e64a697c37 100644
--- a/trunk/drivers/net/wireless/libertas/join.c
+++ b/trunk/drivers/net/wireless/libertas/join.c
@@ -98,23 +98,6 @@ static void lbs_set_basic_rate_flags(u8 *rates, size_t len)
 	}
 }
 
-/**
- *  @brief Unsets the MSB on basic rates
- *
- * Scan through an array and unset the MSB for basic data rates.
- *
- *  @param rates     buffer of data rates
- *  @param len       size of buffer
- */
-void lbs_unset_basic_rate_flags(u8 *rates, size_t len)
-{
-	int i;
-
-	for (i = 0; i < len; i++)
-		rates[i] &= 0x7f;
-}
-
-
 /**
  *  @brief Associate to a specific BSS discovered in a scan
  *
diff --git a/trunk/drivers/net/wireless/libertas/join.h b/trunk/drivers/net/wireless/libertas/join.h
index c617d071f781..792c64fe3514 100644
--- a/trunk/drivers/net/wireless/libertas/join.h
+++ b/trunk/drivers/net/wireless/libertas/join.h
@@ -48,6 +48,4 @@ int lbs_send_deauthentication(struct lbs_private *priv);
 
 int lbs_associate(struct lbs_private *priv, struct assoc_request *assoc_req);
 
-void lbs_unset_basic_rate_flags(u8 *rates, size_t len);
-
 #endif
diff --git a/trunk/drivers/net/wireless/libertas/scan.c b/trunk/drivers/net/wireless/libertas/scan.c
index 69f94c92b32d..37b9684bf29c 100644
--- a/trunk/drivers/net/wireless/libertas/scan.c
+++ b/trunk/drivers/net/wireless/libertas/scan.c
@@ -73,6 +73,23 @@ static const u8 bcastmac[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };
 /*                                                                   */
 /*********************************************************************/
 
+/**
+ *  @brief Unsets the MSB on basic rates
+ *
+ * Scan through an array and unset the MSB for basic data rates.
+ *
+ *  @param rates     buffer of data rates
+ *  @param len       size of buffer
+ */
+static void lbs_unset_basic_rate_flags(u8 *rates, size_t len)
+{
+	int i;
+
+	for (i = 0; i < len; i++)
+		rates[i] &= 0x7f;
+}
+
+
 static inline void clear_bss_descriptor (struct bss_descriptor * bss)
 {
 	/* Don't blow away ->list, just BSS data */