diff options
author | Christoph Hellwig <hch@lst.de> | 2005-06-18 19:27:56 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-27 00:23:55 -0400 |
commit | 95dd91fbd8d3c788ef93bc94b4b600889e04dba1 (patch) | |
tree | f9d1e9bb31856bc49d5853187b32c80f6ee79076 /drivers/net/wireless/orinoco.h | |
parent | 16739b065f4b0965d975f5c756204c7aa911cd61 (diff) |
[PATCH] orinoco: scanning support
Patch from Pavel Roskin
Diffstat (limited to 'drivers/net/wireless/orinoco.h')
-rw-r--r-- | drivers/net/wireless/orinoco.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/drivers/net/wireless/orinoco.h b/drivers/net/wireless/orinoco.h index 329e79f6d7b1..2a6b1c09b26d 100644 --- a/drivers/net/wireless/orinoco.h +++ b/drivers/net/wireless/orinoco.h | |||
@@ -32,6 +32,20 @@ struct orinoco_key { | |||
32 | char data[ORINOCO_MAX_KEY_SIZE]; | 32 | char data[ORINOCO_MAX_KEY_SIZE]; |
33 | } __attribute__ ((packed)); | 33 | } __attribute__ ((packed)); |
34 | 34 | ||
35 | struct header_struct { | ||
36 | /* 802.3 */ | ||
37 | u8 dest[ETH_ALEN]; | ||
38 | u8 src[ETH_ALEN]; | ||
39 | u16 len; | ||
40 | /* 802.2 */ | ||
41 | u8 dsap; | ||
42 | u8 ssap; | ||
43 | u8 ctrl; | ||
44 | /* SNAP */ | ||
45 | u8 oui[3]; | ||
46 | u16 ethertype; | ||
47 | } __attribute__ ((packed)); | ||
48 | |||
35 | typedef enum { | 49 | typedef enum { |
36 | FIRMWARE_TYPE_AGERE, | 50 | FIRMWARE_TYPE_AGERE, |
37 | FIRMWARE_TYPE_INTERSIL, | 51 | FIRMWARE_TYPE_INTERSIL, |
@@ -51,6 +65,7 @@ struct orinoco_private { | |||
51 | int open; | 65 | int open; |
52 | u16 last_linkstatus; | 66 | u16 last_linkstatus; |
53 | struct work_struct join_work; | 67 | struct work_struct join_work; |
68 | struct work_struct wevent_work; | ||
54 | 69 | ||
55 | /* Net device stuff */ | 70 | /* Net device stuff */ |
56 | struct net_device *ndev; | 71 | struct net_device *ndev; |
@@ -77,6 +92,7 @@ struct orinoco_private { | |||
77 | unsigned int has_pm:1; | 92 | unsigned int has_pm:1; |
78 | unsigned int has_preamble:1; | 93 | unsigned int has_preamble:1; |
79 | unsigned int has_sensitivity:1; | 94 | unsigned int has_sensitivity:1; |
95 | unsigned int has_hostscan:1; | ||
80 | unsigned int broken_disableport:1; | 96 | unsigned int broken_disableport:1; |
81 | 97 | ||
82 | /* Configuration paramaters */ | 98 | /* Configuration paramaters */ |
@@ -103,6 +119,12 @@ struct orinoco_private { | |||
103 | /* Configuration dependent variables */ | 119 | /* Configuration dependent variables */ |
104 | int port_type, createibss; | 120 | int port_type, createibss; |
105 | int promiscuous, mc_count; | 121 | int promiscuous, mc_count; |
122 | |||
123 | /* Scanning support */ | ||
124 | int scan_inprogress; /* Scan pending... */ | ||
125 | u32 scan_mode; /* Type of scan done */ | ||
126 | char * scan_result; /* Result of previous scan */ | ||
127 | int scan_len; /* Lenght of result */ | ||
106 | }; | 128 | }; |
107 | 129 | ||
108 | #ifdef ORINOCO_DEBUG | 130 | #ifdef ORINOCO_DEBUG |