[PATCH] libertas: remove adapter->scantype

[mv-sheeva.git] / drivers / net / wireless / libertas / dev.h

diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index 785192b884bc27c1419d7aff773c8d477b1fb21a..f6b1402509f5883feaf2bb6d9dd4044d74713583 100644 (file)
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -14,7 +14,6 @@
 
 #include "defs.h"
 #include "scan.h"
-#include "thread.h"
 
 extern struct ethtool_ops libertas_ethtool_ops;
 
@@ -73,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 */
@@ -146,7 +143,8 @@ struct _wlan_private {
        struct device *hotplug_device;
 
        /** thread to service interrupts */
-       struct wlan_thread mainthread;
+       struct task_struct *main_thread;
+       wait_queue_head_t waitq;
 
        struct delayed_work assoc_work;
        struct workqueue_struct *assoc_thread;
@@ -188,12 +186,12 @@ struct assoc_request {
        u8 bssid[ETH_ALEN];
 
        /** WEP keys */
-       struct WLAN_802_11_KEY wep_keys[4];
+       struct enc_key wep_keys[4];
        u16 wep_tx_keyidx;
 
        /** WPA keys */
-       struct WLAN_802_11_KEY wpa_mcast_key;
-       struct WLAN_802_11_KEY wpa_unicast_key;
+       struct enc_key wpa_mcast_key;
+       struct enc_key wpa_unicast_key;
 
        struct wlan_802_11_security secinfo;
 
@@ -259,23 +257,15 @@ struct _wlan_adapter {
        /* IW_MODE_* */
        u8 mode;
 
-       u8 prev_ssid[IW_ESSID_MAX_SIZE + 1];
-       u8 prev_ssid_len;
-       u8 prev_bssid[ETH_ALEN];
-
        /* Scan results list */
        struct list_head network_list;
        struct list_head network_free_list;
        struct bss_descriptor *networks;
 
-       u8 scantype;
-       u32 scanmode;
-
-       u16 beaconperiod;
        u8 adhoccreate;
 
        /** capability Info used in Association, start, join */
-       struct ieeetypes_capinfo capinfo;
+       u16 capability;
 
        /** MAC address information */
        u8 current_addr[ETH_ALEN];
@@ -287,20 +277,10 @@ struct _wlan_adapter {
 
        u16 enablehwauto;
        u16 ratebitmap;
-       /** control G rates */
-       u8 adhoc_grate_enabled;
-
-       u32 txantenna;
-       u32 rxantenna;
 
        u32 fragthsd;
        u32 rtsthsd;
 
-       u32 datarate;
-       u8 is_datarate_auto;
-
-       u16 listeninterval;
-       u16 prescan;
        u8 txretrycount;
 
        /** Tx-related variables (for single packet tx) */
@@ -311,22 +291,17 @@ struct _wlan_adapter {
        u16 currentpacketfilter;
        u32 connect_status;
        u16 regioncode;
-       u16 regiontableindex;
        u16 txpowerlevel;
 
        /** POWER MANAGEMENT AND PnP SUPPORT */
        u8 surpriseremoved;
-       u16 atimwindow;
 
        u16 psmode;             /* Wlan802_11PowermodeCAM=disable
                                   Wlan802_11PowermodeMAX_PSP=enable */
-       u16 multipledtim;
        u32 psstate;
        u8 needtowakeup;
 
        struct PS_CMD_ConfirmSleep libertas_ps_confirm_sleep;
-       u16 locallisteninterval;
-       u16 nullpktinterval;
 
        struct assoc_request * pending_assoc_req;
        struct assoc_request * in_progress_assoc_req;
@@ -335,23 +310,18 @@ struct _wlan_adapter {
        struct wlan_802_11_security secinfo;
 
        /** WEP keys */
-       struct WLAN_802_11_KEY wep_keys[4];
+       struct enc_key wep_keys[4];
        u16 wep_tx_keyidx;
 
        /** WPA keys */
-       struct WLAN_802_11_KEY wpa_mcast_key;
-       struct WLAN_802_11_KEY wpa_unicast_key;
+       struct enc_key wpa_mcast_key;
+       struct enc_key wpa_unicast_key;
 
        /** WPA Information Elements*/
        u8 wpa_ie[MAX_WPA_IE_LEN];
        u8 wpa_ie_len;
 
-       u16 rxantennamode;
-       u16 txantennamode;
-
        /** Requested Signal Strength*/
-       u16 bcn_avg_factor;
-       u16 data_avg_factor;
        u16 SNR[MAX_TYPE_B][MAX_TYPE_AVG];
        u16 NF[MAX_TYPE_B][MAX_TYPE_AVG];
        u8 RSSI[MAX_TYPE_B][MAX_TYPE_AVG];
@@ -359,15 +329,13 @@ struct _wlan_adapter {
        u8 rawNF[DEFAULT_DATA_AVG_FACTOR];
        u16 nextSNRNF;
        u16 numSNRNF;
-       u16 rxpd_rate;
 
        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;
@@ -392,14 +360,9 @@ struct _wlan_adapter {
        struct wlan_offset_value offsetvalue;
 
        struct cmd_ds_802_11_get_log logmsg;
-       u16 scanprobes;
-
-       u32 pkttxctrl;
 
-       u16 txrate;
        u32 linkmode;
        u32 radiomode;
-       u32 debugmode;
        u8 fw_ready;
 
        u8 last_scanned_channel;