Merge branches 'pxa-core' and 'pxa-machines' into pxa-all

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / orinoco.h

diff --git a/drivers/net/wireless/orinoco.h b/drivers/net/wireless/orinoco.h
index 4720fb20d66d1c730582e8ecf5d4552a7b4540b5..c6b1858abde87597f3ff64bdbd4deeb33bad9568 100644 (file)
--- a/drivers/net/wireless/orinoco.h
+++ b/drivers/net/wireless/orinoco.h
@@ -36,6 +36,12 @@ typedef enum {
        FIRMWARE_TYPE_SYMBOL
 } fwtype_t;
 
+typedef struct {
+       union hermes_scan_info bss;
+       unsigned long last_scanned;
+       struct list_head list;
+} bss_element;
+
 struct orinoco_private {
        void *card;     /* Pointer to card dependent structure */
        int (*hard_reset)(struct orinoco_private *);
@@ -105,10 +111,12 @@ struct orinoco_private {
        int promiscuous, mc_count;
 
        /* Scanning support */
+       struct list_head bss_list;
+       struct list_head bss_free_list;
+       bss_element *bss_data;
+
        int     scan_inprogress;        /* Scan pending... */
        u32     scan_mode;              /* Type of scan done */
-       char *  scan_result;            /* Result of previous scan */
-       int     scan_len;               /* Lenght of result */
 };
 
 #ifdef ORINOCO_DEBUG