[PATCH 1/4] libertas: reassociation code fixups

[Dan Williams]

Fix up reassociation code compilation and move private reassociation
ioctls over to wlan_ioctl.c with the other private ioctls.

Signed-off-by: Dan Williams <dcbw at redhat.com>

diff --git a/drivers/net/wireless/libertas/wlan_ioctl.c b/drivers/net/wireless/libertas/wlan_ioctl.c
index 1325598..9ff7267 100644
--- a/drivers/net/wireless/libertas/wlan_ioctl.c
+++ b/drivers/net/wireless/libertas/wlan_ioctl.c
@@ -2094,6 +2094,47 @@ static int wlan_bt_list_ioctl(wlan_priva
 	LEAVE();
 	return WLAN_STATUS_SUCCESS;
 }
+
+#ifdef REASSOCIATION
+/** 
+ *  @brief Set Auto Reassociation On
+ *   
+ *  @param priv                 A pointer to wlan_private structure
+ *  @return 	   		WLAN_STATUS_SUCCESS --success, otherwise fail 
+ */
+static int reassociation_on(wlan_private * priv)
+{
+	wlan_adapter *Adapter = priv->adapter;
+
+	ENTER();
+
+	Adapter->Reassoc_on = 1;
+
+	LEAVE();
+	return WLAN_STATUS_SUCCESS;
+}
+
+/** 
+ *  @brief Set Auto Reassociation Off
+ *   
+ *  @param priv                 A pointer to wlan_private structure
+ *  @return 	   		WLAN_STATUS_SUCCESS --success, otherwise fail 
+ */
+static int reassociation_off(wlan_private * priv)
+{
+	wlan_adapter *Adapter = priv->adapter;
+
+	ENTER();
+
+	del_timer(&Adapter->reassoc_timer);
+
+	Adapter->Reassoc_on = 0;
+
+	LEAVE();
+	return WLAN_STATUS_SUCCESS;
+}
+#endif				/* REASSOCIATION */
+
 /**
  *  @brief ioctl function - entry point
  *
diff --git a/drivers/net/wireless/libertas/wlan_main.c b/drivers/net/wireless/libertas/wlan_main.c
index d2e2db6..85db79f 100644
--- a/drivers/net/wireless/libertas/wlan_main.c
+++ b/drivers/net/wireless/libertas/wlan_main.c
@@ -59,6 +59,10 @@ #include "wlan_dev.h"
 #include "wlan_fw.h"
 #include "wlan_wext.h"
 
+#ifdef REASSOCIATION
+#include "wlan_join.h"
+#endif
+
 #ifdef ENABLE_PM
 static struct pm_dev *wlan_pm_dev = NULL;
 #endif
diff --git a/drivers/net/wireless/libertas/wlan_wext.c b/drivers/net/wireless/libertas/wlan_wext.c
index eb5fd8d..0f77057 100644
--- a/drivers/net/wireless/libertas/wlan_wext.c
+++ b/drivers/net/wireless/libertas/wlan_wext.c
@@ -642,46 +642,6 @@ int wlan_radio_ioctl(wlan_private * priv
 	return ret;
 }
 
-#ifdef REASSOCIATION
-/** 
- *  @brief Set Auto Reassociation On
- *   
- *  @param priv                 A pointer to wlan_private structure
- *  @return 	   		WLAN_STATUS_SUCCESS --success, otherwise fail 
- */
-static int reassociation_on(wlan_private * priv)
-{
-	wlan_adapter *Adapter = priv->adapter;
-
-	ENTER();
-
-	Adapter->Reassoc_on = 1;
-
-	LEAVE();
-	return WLAN_STATUS_SUCCESS;
-}
-
-/** 
- *  @brief Set Auto Reassociation Off
- *   
- *  @param priv                 A pointer to wlan_private structure
- *  @return 	   		WLAN_STATUS_SUCCESS --success, otherwise fail 
- */
-static int reassociation_off(wlan_private * priv)
-{
-	wlan_adapter *Adapter = priv->adapter;
-
-	ENTER();
-
-	del_timer(&Adapter->reassoc_timer);
-
-	Adapter->Reassoc_on = 0;
-
-	LEAVE();
-	return WLAN_STATUS_SUCCESS;
-}
-#endif				/* REASSOCIATION */
-
 /** 
  *  @brief Copy Rates
  *