[PATCH] libertas: remove unused variables in wlan_dev_t

[linux-2.6] / drivers / net / wireless / libertas / dev.h

diff --git a/drivers/net/wireless/libertas/dev.h b/drivers/net/wireless/libertas/dev.h
index e8b9020f9bd69676654177a54944cbd4e1fb5751..c43aa10f1a8b92ef7f1167865d0dfeeeb3d88d55 100644 (file)
--- a/drivers/net/wireless/libertas/dev.h
+++ b/drivers/net/wireless/libertas/dev.h
@@ -89,31 +89,6 @@ struct sleep_params {
        u16 sp_reserved;
 };
 
-/** Data structure for the Marvell WLAN device */
-typedef struct _wlan_dev {
-       /** device name */
-       char name[DEV_NAME_LEN];
-       /** card pointer */
-       void *card;
-       /** IO port */
-       u32 ioport;
-       /** Upload received */
-       u32 upld_rcv;
-       /** Upload type */
-       u32 upld_typ;
-       /** Upload length */
-       u32 upld_len;
-       /** netdev pointer */
-       struct net_device *netdev;
-       /* Upload buffer */
-       u8 upld_buf[WLAN_UPLD_SIZE];
-       /* Download sent:
-          bit0 1/0=data_sent/data_tx_done,
-          bit1 1/0=cmd_sent/cmd_tx_done,
-          all other bits reserved 0 */
-       u8 dnld_sent;
-} wlan_dev_t, *pwlan_dev_t;
-
 /* Mesh statistics */
 struct wlan_mesh_stats {
        u32     fwd_bcast_cnt;          /* Fwd: Broadcast counter */
@@ -123,6 +98,7 @@ struct wlan_mesh_stats {
        u32     fwd_drop_noroute;       /* Fwd: No route to Destination */
        u32     fwd_drop_nobuf;         /* Fwd: Run out of internal buffers */
        u32     drop_blind;             /* Rx:  Dropped by blinding table */
+       u32     tx_failed_cnt;          /* Tx:  Failed transmissions */
 };
 
 /** Private structure for the MV device */
@@ -131,8 +107,11 @@ struct _wlan_private {
        int mesh_open;
        int infra_open;
 
+       char name[DEV_NAME_LEN];
+
+       void *card;
        wlan_adapter *adapter;
-       wlan_dev_t wlan_dev;
+       struct net_device *dev;
 
        struct net_device_stats stats;
        struct net_device *mesh_dev ; /* Virtual device */
@@ -153,6 +132,16 @@ struct _wlan_private {
        u32 bbp_offset;
        u32 rf_offset;
 
+       /** Upload length */
+       u32 upld_len;
+       /* Upload buffer */
+       u8 upld_buf[WLAN_UPLD_SIZE];
+       /* Download sent:
+          bit0 1/0=data_sent/data_tx_done,
+          bit1 1/0=cmd_sent/cmd_tx_done,
+          all other bits reserved 0 */
+       u8 dnld_sent;
+
        const struct firmware *firmware;
        struct device *hotplug_device;
 
@@ -161,6 +150,14 @@ struct _wlan_private {
 
        struct delayed_work assoc_work;
        struct workqueue_struct *assoc_thread;
+
+       /** Hardware access */
+       int (*hw_register_dev) (wlan_private * priv);
+       int (*hw_unregister_dev) (wlan_private *);
+       int (*hw_prog_firmware) (wlan_private *);
+       int (*hw_host_to_card) (wlan_private * priv, u8 type, u8 * payload, u16 nb);
+       int (*hw_get_int_status) (wlan_private * priv, u8 *);
+       int (*hw_read_event_cause) (wlan_private *);
 };
 
 /** Association request
@@ -396,6 +393,8 @@ struct _wlan_adapter {
        u32 radiomode;
        u32 debugmode;
        u8 fw_ready;
+
+       u8 last_scanned_channel;
 };
 
 #endif                         /* _WLAN_DEV_H_ */