libertas: consolidate some REASSOCIATION code blocks

[Dan Williams]

Commit:     f086f1580e5dc2759301f59202e4a37b44b5ee29
Parent:     2cea6d13b3b3dd05f8c1a706b83463de3afa57e9
commit f086f1580e5dc2759301f59202e4a37b44b5ee29
Author:     Dan Williams <dcbw at localhost.localdomain>
AuthorDate: Tue Nov 14 16:44:36 2006 -0500
Commit:     Dan Williams <dcbw at localhost.localdomain>
CommitDate: Tue Nov 14 16:44:36 2006 -0500

    libertas: consolidate some REASSOCIATION code blocks
---
 drivers/net/wireless/libertas/wlan_dev.h |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/libertas/wlan_dev.h b/drivers/net/wireless/libertas/wlan_dev.h
index 7561443..8732520 100644
--- a/drivers/net/wireless/libertas/wlan_dev.h
+++ b/drivers/net/wireless/libertas/wlan_dev.h
@@ -264,11 +264,6 @@ struct _wlan_adapter {
 	/** Timers */
 	struct timer_list command_timer;
 
-#ifdef REASSOCIATION
-	/**Reassociation timer*/
-	struct timer_list reassoc_timer;
-#endif				/* REASSOCIATION */
-
 	/* TX queue used in PS mode */
 	spinlock_t txqueue_lock;
 	struct sk_buff *tx_queue_ps[NR_TX_QUEUE];
@@ -302,6 +297,8 @@ #ifdef REASSOCIATION
 	/** Reassociation on and off */
 	u8 Reassoc_on;
 	struct semaphore ReassocSem;
+	/**Reassociation timer*/
+	struct timer_list reassoc_timer;
 #endif				/* REASSOCIATION */
 
 	/** MAC address information */