Diff markup
1 /* 1 /*
2 * WL3501 Wireless LAN PCMCIA Card Driver for 2 * WL3501 Wireless LAN PCMCIA Card Driver for Linux
3 * Written originally for Linux 2.0.30 by Fox 3 * Written originally for Linux 2.0.30 by Fox Chen, mhchen@golf.ccl.itri.org.tw
4 * Ported to 2.2, 2.4 & 2.5 by Arnaldo Carvalh 4 * Ported to 2.2, 2.4 & 2.5 by Arnaldo Carvalho de Melo <acme@conectiva.com.br>
5 * Wireless extensions in 2.4 by Gustavo Nieme 5 * Wireless extensions in 2.4 by Gustavo Niemeyer <niemeyer@conectiva.com>
6 * 6 *
7 * References used by Fox Chen while writing t 7 * References used by Fox Chen while writing the original driver for 2.0.30:
8 * 8 *
9 * 1. WL24xx packet drivers (tooasm.asm) 9 * 1. WL24xx packet drivers (tooasm.asm)
10 * 2. Access Point Firmware Interface Specif 10 * 2. Access Point Firmware Interface Specification for IEEE 802.11 SUTRO
11 * 3. IEEE 802.11 11 * 3. IEEE 802.11
12 * 4. Linux network driver (/usr/src/linux/d 12 * 4. Linux network driver (/usr/src/linux/drivers/net)
13 * 5. ISA card driver - wl24.c 13 * 5. ISA card driver - wl24.c
14 * 6. Linux PCMCIA skeleton driver - skeleto 14 * 6. Linux PCMCIA skeleton driver - skeleton.c
15 * 7. Linux PCMCIA 3c589 network driver - 3c 15 * 7. Linux PCMCIA 3c589 network driver - 3c589_cs.c
16 * 16 *
17 * Tested with WL2400 firmware 1.2, Linux 2.0. 17 * Tested with WL2400 firmware 1.2, Linux 2.0.30, and pcmcia-cs-2.9.12
18 * 1. Performance: about 165 Kbytes/sec in T 18 * 1. Performance: about 165 Kbytes/sec in TCP/IP with Ad-Hoc mode.
19 * rsh 192.168.1.3 "dd if=/dev/zero bs=1k 19 * rsh 192.168.1.3 "dd if=/dev/zero bs=1k count=1000" > /dev/null
20 * (Specification 2M bits/sec. is about 2 20 * (Specification 2M bits/sec. is about 250 Kbytes/sec., but we must deduct
21 * ETHER/IP/UDP/TCP header, and acknowle 21 * ETHER/IP/UDP/TCP header, and acknowledgement overhead)
22 * 22 *
23 * Tested with Planet AP in 2.4.17, 184 Kbytes 23 * Tested with Planet AP in 2.4.17, 184 Kbytes/s in UDP in Infrastructure mode,
24 * 173 Kbytes/s in TCP. 24 * 173 Kbytes/s in TCP.
25 * 25 *
26 * Tested with Planet AP in 2.5.73-bk, 216 Kby 26 * Tested with Planet AP in 2.5.73-bk, 216 Kbytes/s in Infrastructure mode
27 * with a SMP machine (dual pentium 100), usin 27 * with a SMP machine (dual pentium 100), using pktgen, 432 pps (pkt_size = 60)
28 */ 28 */
29 29
30 #include <linux/delay.h> 30 #include <linux/delay.h>
31 #include <linux/types.h> 31 #include <linux/types.h>
32 #include <linux/ethtool.h> 32 #include <linux/ethtool.h>
33 #include <linux/init.h> 33 #include <linux/init.h>
34 #include <linux/interrupt.h> 34 #include <linux/interrupt.h>
35 #include <linux/in.h> 35 #include <linux/in.h>
36 #include <linux/kernel.h> 36 #include <linux/kernel.h>
37 #include <linux/module.h> 37 #include <linux/module.h>
38 #include <linux/fcntl.h> 38 #include <linux/fcntl.h>
39 #include <linux/if_arp.h> 39 #include <linux/if_arp.h>
40 #include <linux/ioport.h> 40 #include <linux/ioport.h>
41 #include <linux/netdevice.h> 41 #include <linux/netdevice.h>
42 #include <linux/etherdevice.h> 42 #include <linux/etherdevice.h>
43 #include <linux/skbuff.h> 43 #include <linux/skbuff.h>
44 #include <linux/slab.h> 44 #include <linux/slab.h>
45 #include <linux/string.h> 45 #include <linux/string.h>
46 #include <linux/wireless.h> 46 #include <linux/wireless.h>
47 47
48 #include <net/iw_handler.h> 48 #include <net/iw_handler.h>
49 49
50 #include <pcmcia/cs_types.h> 50 #include <pcmcia/cs_types.h>
51 #include <pcmcia/cs.h> 51 #include <pcmcia/cs.h>
52 #include <pcmcia/cistpl.h> 52 #include <pcmcia/cistpl.h>
53 #include <pcmcia/cisreg.h> 53 #include <pcmcia/cisreg.h>
54 #include <pcmcia/ds.h> 54 #include <pcmcia/ds.h>
55 55
56 #include <asm/io.h> 56 #include <asm/io.h>
57 #include <asm/uaccess.h> 57 #include <asm/uaccess.h>
58 #include <asm/system.h> 58 #include <asm/system.h>
59 59
60 #include "wl3501.h" 60 #include "wl3501.h"
61 61
62 #ifndef __i386__ 62 #ifndef __i386__
63 #define slow_down_io() 63 #define slow_down_io()
64 #endif 64 #endif
65 65
66 /* For rough constant delay */ 66 /* For rough constant delay */
67 #define WL3501_NOPLOOP(n) { int x = 0; while ( 67 #define WL3501_NOPLOOP(n) { int x = 0; while (x++ < n) slow_down_io(); }
68 68
69 /* 69 /*
70 * All the PCMCIA modules use PCMCIA_DEBUG to 70 * All the PCMCIA modules use PCMCIA_DEBUG to control debugging. If you do not
71 * define PCMCIA_DEBUG at all, all the debug c 71 * define PCMCIA_DEBUG at all, all the debug code will be left out. If you
72 * compile with PCMCIA_DEBUG=0, the debug code 72 * compile with PCMCIA_DEBUG=0, the debug code will be present but disabled --
73 * but it can then be enabled for specific mod 73 * but it can then be enabled for specific modules at load time with a
74 * 'pc_debug=#' option to insmod. 74 * 'pc_debug=#' option to insmod.
75 */ 75 */
76 #define PCMCIA_DEBUG 0 76 #define PCMCIA_DEBUG 0
77 #ifdef PCMCIA_DEBUG 77 #ifdef PCMCIA_DEBUG
78 static int pc_debug = PCMCIA_DEBUG; 78 static int pc_debug = PCMCIA_DEBUG;
79 module_param(pc_debug, int, 0); 79 module_param(pc_debug, int, 0);
80 #define dprintk(n, format, args...) \ 80 #define dprintk(n, format, args...) \
81 { if (pc_debug > (n)) \ 81 { if (pc_debug > (n)) \
82 printk(KERN_INFO "%s: " format 82 printk(KERN_INFO "%s: " format "\n", __FUNCTION__ , ##args); }
83 #else 83 #else
84 #define dprintk(n, format, args...) 84 #define dprintk(n, format, args...)
85 #endif 85 #endif
86 86
87 #define wl3501_outb(a, b) { outb(a, b); slow_d 87 #define wl3501_outb(a, b) { outb(a, b); slow_down_io(); }
88 #define wl3501_outb_p(a, b) { outb_p(a, b); sl 88 #define wl3501_outb_p(a, b) { outb_p(a, b); slow_down_io(); }
89 #define wl3501_outsb(a, b, c) { outsb(a, b, c) 89 #define wl3501_outsb(a, b, c) { outsb(a, b, c); slow_down_io(); }
90 90
91 #define WL3501_RELEASE_TIMEOUT (25 * HZ) 91 #define WL3501_RELEASE_TIMEOUT (25 * HZ)
92 #define WL3501_MAX_ADHOC_TRIES 16 92 #define WL3501_MAX_ADHOC_TRIES 16
93 93
94 #define WL3501_RESUME 0 94 #define WL3501_RESUME 0
95 #define WL3501_SUSPEND 1 95 #define WL3501_SUSPEND 1
96 96
97 /* 97 /*
98 * The event() function is this driver's Card 98 * The event() function is this driver's Card Services event handler. It will
99 * be called by Card Services when an appropri 99 * be called by Card Services when an appropriate card status event is
100 * received. The config() and release() entry 100 * received. The config() and release() entry points are used to configure or
101 * release a socket, in response to card inser 101 * release a socket, in response to card insertion and ejection events. They
102 * are invoked from the wl24 event handler. 102 * are invoked from the wl24 event handler.
103 */ 103 */
104 static int wl3501_config(struct pcmcia_device 104 static int wl3501_config(struct pcmcia_device *link);
105 static void wl3501_release(struct pcmcia_devic 105 static void wl3501_release(struct pcmcia_device *link);
106 106
107 /* 107 /*
108 * The dev_info variable is the "key" that is 108 * The dev_info variable is the "key" that is used to match up this
109 * device driver with appropriate cards, throu 109 * device driver with appropriate cards, through the card configuration
110 * database. 110 * database.
111 */ 111 */
112 static dev_info_t wl3501_dev_info = "wl3501_cs 112 static dev_info_t wl3501_dev_info = "wl3501_cs";
113 113
114 static int wl3501_chan2freq[] = { 114 static int wl3501_chan2freq[] = {
115 [0] = 2412, [1] = 2417, [2] = 2422, 115 [0] = 2412, [1] = 2417, [2] = 2422, [3] = 2427, [4] = 2432,
116 [5] = 2437, [6] = 2442, [7] = 2447, 116 [5] = 2437, [6] = 2442, [7] = 2447, [8] = 2452, [9] = 2457,
117 [10] = 2462, [11] = 2467, [12] = 2472, 117 [10] = 2462, [11] = 2467, [12] = 2472, [13] = 2477,
118 }; 118 };
119 119
120 static const struct { 120 static const struct {
121 int reg_domain; 121 int reg_domain;
122 int min, max, deflt; 122 int min, max, deflt;
123 } iw_channel_table[] = { 123 } iw_channel_table[] = {
124 { 124 {
125 .reg_domain = IW_REG_DOMAIN_FC 125 .reg_domain = IW_REG_DOMAIN_FCC,
126 .min = 1, 126 .min = 1,
127 .max = 11, 127 .max = 11,
128 .deflt = 1, 128 .deflt = 1,
129 }, 129 },
130 { 130 {
131 .reg_domain = IW_REG_DOMAIN_DO 131 .reg_domain = IW_REG_DOMAIN_DOC,
132 .min = 1, 132 .min = 1,
133 .max = 11, 133 .max = 11,
134 .deflt = 1, 134 .deflt = 1,
135 }, 135 },
136 { 136 {
137 .reg_domain = IW_REG_DOMAIN_ET 137 .reg_domain = IW_REG_DOMAIN_ETSI,
138 .min = 1, 138 .min = 1,
139 .max = 13, 139 .max = 13,
140 .deflt = 1, 140 .deflt = 1,
141 }, 141 },
142 { 142 {
143 .reg_domain = IW_REG_DOMAIN_SP 143 .reg_domain = IW_REG_DOMAIN_SPAIN,
144 .min = 10, 144 .min = 10,
145 .max = 11, 145 .max = 11,
146 .deflt = 10, 146 .deflt = 10,
147 }, 147 },
148 { 148 {
149 .reg_domain = IW_REG_DOMAIN_FR 149 .reg_domain = IW_REG_DOMAIN_FRANCE,
150 .min = 10, 150 .min = 10,
151 .max = 13, 151 .max = 13,
152 .deflt = 10, 152 .deflt = 10,
153 }, 153 },
154 { 154 {
155 .reg_domain = IW_REG_DOMAIN_MK 155 .reg_domain = IW_REG_DOMAIN_MKK,
156 .min = 14, 156 .min = 14,
157 .max = 14, 157 .max = 14,
158 .deflt = 14, 158 .deflt = 14,
159 }, 159 },
160 { 160 {
161 .reg_domain = IW_REG_DOMAIN_MK 161 .reg_domain = IW_REG_DOMAIN_MKK1,
162 .min = 1, 162 .min = 1,
163 .max = 14, 163 .max = 14,
164 .deflt = 1, 164 .deflt = 1,
165 }, 165 },
166 { 166 {
167 .reg_domain = IW_REG_DOMAIN_IS 167 .reg_domain = IW_REG_DOMAIN_ISRAEL,
168 .min = 3, 168 .min = 3,
169 .max = 9, 169 .max = 9,
170 .deflt = 9, 170 .deflt = 9,
171 }, 171 },
172 }; 172 };
173 173
174 /** 174 /**
175 * iw_valid_channel - validate channel in regu 175 * iw_valid_channel - validate channel in regulatory domain
176 * @reg_comain - regulatory domain 176 * @reg_comain - regulatory domain
177 * @channel - channel to validate 177 * @channel - channel to validate
178 * 178 *
179 * Returns 0 if invalid in the specified regul 179 * Returns 0 if invalid in the specified regulatory domain, non-zero if valid.
180 */ 180 */
181 static int iw_valid_channel(int reg_domain, in 181 static int iw_valid_channel(int reg_domain, int channel)
182 { 182 {
183 int i, rc = 0; 183 int i, rc = 0;
184 184
185 for (i = 0; i < ARRAY_SIZE(iw_channel_ 185 for (i = 0; i < ARRAY_SIZE(iw_channel_table); i++)
186 if (reg_domain == iw_channel_t 186 if (reg_domain == iw_channel_table[i].reg_domain) {
187 rc = channel >= iw_cha 187 rc = channel >= iw_channel_table[i].min &&
188 channel <= iw_cha 188 channel <= iw_channel_table[i].max;
189 break; 189 break;
190 } 190 }
191 return rc; 191 return rc;
192 } 192 }
193 193
194 /** 194 /**
195 * iw_default_channel - get default channel fo 195 * iw_default_channel - get default channel for a regulatory domain
196 * @reg_comain - regulatory domain 196 * @reg_comain - regulatory domain
197 * 197 *
198 * Returns the default channel for a regulator 198 * Returns the default channel for a regulatory domain
199 */ 199 */
200 static int iw_default_channel(int reg_domain) 200 static int iw_default_channel(int reg_domain)
201 { 201 {
202 int i, rc = 1; 202 int i, rc = 1;
203 203
204 for (i = 0; i < ARRAY_SIZE(iw_channel_ 204 for (i = 0; i < ARRAY_SIZE(iw_channel_table); i++)
205 if (reg_domain == iw_channel_t 205 if (reg_domain == iw_channel_table[i].reg_domain) {
206 rc = iw_channel_table[ 206 rc = iw_channel_table[i].deflt;
207 break; 207 break;
208 } 208 }
209 return rc; 209 return rc;
210 } 210 }
211 211
212 static void iw_set_mgmt_info_element(enum iw_m 212 static void iw_set_mgmt_info_element(enum iw_mgmt_info_element_ids id,
213 struct iw 213 struct iw_mgmt_info_element *el,
214 void *val 214 void *value, int len)
215 { 215 {
216 el->id = id; 216 el->id = id;
217 el->len = len; 217 el->len = len;
218 memcpy(el->data, value, len); 218 memcpy(el->data, value, len);
219 } 219 }
220 220
221 static void iw_copy_mgmt_info_element(struct i 221 static void iw_copy_mgmt_info_element(struct iw_mgmt_info_element *to,
222 struct i 222 struct iw_mgmt_info_element *from)
223 { 223 {
224 iw_set_mgmt_info_element(from->id, to, 224 iw_set_mgmt_info_element(from->id, to, from->data, from->len);
225 } 225 }
226 226
227 static inline void wl3501_switch_page(struct w 227 static inline void wl3501_switch_page(struct wl3501_card *this, u8 page)
228 { 228 {
229 wl3501_outb(page, this->base_addr + WL 229 wl3501_outb(page, this->base_addr + WL3501_NIC_BSS);
230 } 230 }
231 231
232 /* 232 /*
233 * Get Ethernet MAC addresss. 233 * Get Ethernet MAC addresss.
234 * 234 *
235 * WARNING: We switch to FPAGE0 and switc back 235 * WARNING: We switch to FPAGE0 and switc back again.
236 * Making sure there is no other WL f 236 * Making sure there is no other WL function beening called by ISR.
237 */ 237 */
238 static int wl3501_get_flash_mac_addr(struct wl 238 static int wl3501_get_flash_mac_addr(struct wl3501_card *this)
239 { 239 {
240 int base_addr = this->base_addr; 240 int base_addr = this->base_addr;
241 241
242 /* get MAC addr */ 242 /* get MAC addr */
243 wl3501_outb(WL3501_BSS_FPAGE3, base_ad 243 wl3501_outb(WL3501_BSS_FPAGE3, base_addr + WL3501_NIC_BSS); /* BSS */
244 wl3501_outb(0x00, base_addr + WL3501_N 244 wl3501_outb(0x00, base_addr + WL3501_NIC_LMAL); /* LMAL */
245 wl3501_outb(0x40, base_addr + WL3501_N 245 wl3501_outb(0x40, base_addr + WL3501_NIC_LMAH); /* LMAH */
246 246
247 /* wait for reading EEPROM */ 247 /* wait for reading EEPROM */
248 WL3501_NOPLOOP(100); 248 WL3501_NOPLOOP(100);
249 this->mac_addr[0] = inb(base_addr + WL 249 this->mac_addr[0] = inb(base_addr + WL3501_NIC_IODPA);
250 WL3501_NOPLOOP(100); 250 WL3501_NOPLOOP(100);
251 this->mac_addr[1] = inb(base_addr + WL 251 this->mac_addr[1] = inb(base_addr + WL3501_NIC_IODPA);
252 WL3501_NOPLOOP(100); 252 WL3501_NOPLOOP(100);
253 this->mac_addr[2] = inb(base_addr + WL 253 this->mac_addr[2] = inb(base_addr + WL3501_NIC_IODPA);
254 WL3501_NOPLOOP(100); 254 WL3501_NOPLOOP(100);
255 this->mac_addr[3] = inb(base_addr + WL 255 this->mac_addr[3] = inb(base_addr + WL3501_NIC_IODPA);
256 WL3501_NOPLOOP(100); 256 WL3501_NOPLOOP(100);
257 this->mac_addr[4] = inb(base_addr + WL 257 this->mac_addr[4] = inb(base_addr + WL3501_NIC_IODPA);
258 WL3501_NOPLOOP(100); 258 WL3501_NOPLOOP(100);
259 this->mac_addr[5] = inb(base_addr + WL 259 this->mac_addr[5] = inb(base_addr + WL3501_NIC_IODPA);
260 WL3501_NOPLOOP(100); 260 WL3501_NOPLOOP(100);
261 this->reg_domain = inb(base_addr + WL3 261 this->reg_domain = inb(base_addr + WL3501_NIC_IODPA);
262 WL3501_NOPLOOP(100); 262 WL3501_NOPLOOP(100);
263 wl3501_outb(WL3501_BSS_FPAGE0, base_ad 263 wl3501_outb(WL3501_BSS_FPAGE0, base_addr + WL3501_NIC_BSS);
264 wl3501_outb(0x04, base_addr + WL3501_N 264 wl3501_outb(0x04, base_addr + WL3501_NIC_LMAL);
265 wl3501_outb(0x40, base_addr + WL3501_N 265 wl3501_outb(0x40, base_addr + WL3501_NIC_LMAH);
266 WL3501_NOPLOOP(100); 266 WL3501_NOPLOOP(100);
267 this->version[0] = inb(base_addr + WL3 267 this->version[0] = inb(base_addr + WL3501_NIC_IODPA);
268 WL3501_NOPLOOP(100); 268 WL3501_NOPLOOP(100);
269 this->version[1] = inb(base_addr + WL3 269 this->version[1] = inb(base_addr + WL3501_NIC_IODPA);
270 /* switch to SRAM Page 0 (for safety) 270 /* switch to SRAM Page 0 (for safety) */
271 wl3501_switch_page(this, WL3501_BSS_SP 271 wl3501_switch_page(this, WL3501_BSS_SPAGE0);
272 272
273 /* The MAC addr should be 00:60:... */ 273 /* The MAC addr should be 00:60:... */
274 return this->mac_addr[0] == 0x00 && th 274 return this->mac_addr[0] == 0x00 && this->mac_addr[1] == 0x60;
275 } 275 }
276 276
277 /** 277 /**
278 * wl3501_set_to_wla - Move 'size' bytes from 278 * wl3501_set_to_wla - Move 'size' bytes from PC to card
279 * @dest: Card addressing space 279 * @dest: Card addressing space
280 * @src: PC addressing space 280 * @src: PC addressing space
281 * @size: Bytes to move 281 * @size: Bytes to move
282 * 282 *
283 * Move 'size' bytes from PC to card. (Shouldn 283 * Move 'size' bytes from PC to card. (Shouldn't be interrupted)
284 */ 284 */
285 static void wl3501_set_to_wla(struct wl3501_ca 285 static void wl3501_set_to_wla(struct wl3501_card *this, u16 dest, void *src,
286 int size) 286 int size)
287 { 287 {
288 /* switch to SRAM Page 0 */ 288 /* switch to SRAM Page 0 */
289 wl3501_switch_page(this, (dest & 0x800 289 wl3501_switch_page(this, (dest & 0x8000) ? WL3501_BSS_SPAGE1 :
290 290 WL3501_BSS_SPAGE0);
291 /* set LMAL and LMAH */ 291 /* set LMAL and LMAH */
292 wl3501_outb(dest & 0xff, this->base_ad 292 wl3501_outb(dest & 0xff, this->base_addr + WL3501_NIC_LMAL);
293 wl3501_outb(((dest >> 8) & 0x7f), this 293 wl3501_outb(((dest >> 8) & 0x7f), this->base_addr + WL3501_NIC_LMAH);
294 294
295 /* rep out to Port A */ 295 /* rep out to Port A */
296 wl3501_outsb(this->base_addr + WL3501_ 296 wl3501_outsb(this->base_addr + WL3501_NIC_IODPA, src, size);
297 } 297 }
298 298
299 /** 299 /**
300 * wl3501_get_from_wla - Move 'size' bytes fro 300 * wl3501_get_from_wla - Move 'size' bytes from card to PC
301 * @src: Card addressing space 301 * @src: Card addressing space
302 * @dest: PC addressing space 302 * @dest: PC addressing space
303 * @size: Bytes to move 303 * @size: Bytes to move
304 * 304 *
305 * Move 'size' bytes from card to PC. (Shouldn 305 * Move 'size' bytes from card to PC. (Shouldn't be interrupted)
306 */ 306 */
307 static void wl3501_get_from_wla(struct wl3501_ 307 static void wl3501_get_from_wla(struct wl3501_card *this, u16 src, void *dest,
308 int size) 308 int size)
309 { 309 {
310 /* switch to SRAM Page 0 */ 310 /* switch to SRAM Page 0 */
311 wl3501_switch_page(this, (src & 0x8000 311 wl3501_switch_page(this, (src & 0x8000) ? WL3501_BSS_SPAGE1 :
312 312 WL3501_BSS_SPAGE0);
313 /* set LMAL and LMAH */ 313 /* set LMAL and LMAH */
314 wl3501_outb(src & 0xff, this->base_add 314 wl3501_outb(src & 0xff, this->base_addr + WL3501_NIC_LMAL);
315 wl3501_outb((src >> 8) & 0x7f, this->b 315 wl3501_outb((src >> 8) & 0x7f, this->base_addr + WL3501_NIC_LMAH);
316 316
317 /* rep get from Port A */ 317 /* rep get from Port A */
318 insb(this->base_addr + WL3501_NIC_IODP 318 insb(this->base_addr + WL3501_NIC_IODPA, dest, size);
319 } 319 }
320 320
321 /* 321 /*
322 * Get/Allocate a free Tx Data Buffer 322 * Get/Allocate a free Tx Data Buffer
323 * 323 *
324 * *--------------*-----------------*-------- 324 * *--------------*-----------------*----------------------------------*
325 * | PLCP | MAC Header | DST S 325 * | PLCP | MAC Header | DST SRC Data ... |
326 * | (24 bytes) | (30 bytes) | (6) ( 326 * | (24 bytes) | (30 bytes) | (6) (6) (Ethernet Row Data) |
327 * *--------------*-----------------*-------- 327 * *--------------*-----------------*----------------------------------*
328 * \ \- IEEE 802.11 -/ \------- 328 * \ \- IEEE 802.11 -/ \-------------- len --------------/
329 * \-struct wl3501_80211_tx_hdr--/ \------ 329 * \-struct wl3501_80211_tx_hdr--/ \-------- Ethernet Frame -------/
330 * 330 *
331 * Return = Postion in Card 331 * Return = Postion in Card
332 */ 332 */
333 static u16 wl3501_get_tx_buffer(struct wl3501_ 333 static u16 wl3501_get_tx_buffer(struct wl3501_card *this, u16 len)
334 { 334 {
335 u16 next, blk_cnt = 0, zero = 0; 335 u16 next, blk_cnt = 0, zero = 0;
336 u16 full_len = sizeof(struct wl3501_80 336 u16 full_len = sizeof(struct wl3501_80211_tx_hdr) + len;
337 u16 ret = 0; 337 u16 ret = 0;
338 338
339 if (full_len > this->tx_buffer_cnt * 2 339 if (full_len > this->tx_buffer_cnt * 254)
340 goto out; 340 goto out;
341 ret = this->tx_buffer_head; 341 ret = this->tx_buffer_head;
342 while (full_len) { 342 while (full_len) {
343 if (full_len < 254) 343 if (full_len < 254)
344 full_len = 0; 344 full_len = 0;
345 else 345 else
346 full_len -= 254; 346 full_len -= 254;
347 wl3501_get_from_wla(this, this 347 wl3501_get_from_wla(this, this->tx_buffer_head, &next,
348 sizeof(nex 348 sizeof(next));
349 if (!full_len) 349 if (!full_len)
350 wl3501_set_to_wla(this 350 wl3501_set_to_wla(this, this->tx_buffer_head, &zero,
351 size 351 sizeof(zero));
352 this->tx_buffer_head = next; 352 this->tx_buffer_head = next;
353 blk_cnt++; 353 blk_cnt++;
354 /* if buffer is not enough */ 354 /* if buffer is not enough */
355 if (!next && full_len) { 355 if (!next && full_len) {
356 this->tx_buffer_head = 356 this->tx_buffer_head = ret;
357 ret = 0; 357 ret = 0;
358 goto out; 358 goto out;
359 } 359 }
360 } 360 }
361 this->tx_buffer_cnt -= blk_cnt; 361 this->tx_buffer_cnt -= blk_cnt;
362 out: 362 out:
363 return ret; 363 return ret;
364 } 364 }
365 365
366 /* 366 /*
367 * Free an allocated Tx Buffer. ptr must be co 367 * Free an allocated Tx Buffer. ptr must be correct position.
368 */ 368 */
369 static void wl3501_free_tx_buffer(struct wl350 369 static void wl3501_free_tx_buffer(struct wl3501_card *this, u16 ptr)
370 { 370 {
371 /* check if all space is not free */ 371 /* check if all space is not free */
372 if (!this->tx_buffer_head) 372 if (!this->tx_buffer_head)
373 this->tx_buffer_head = ptr; 373 this->tx_buffer_head = ptr;
374 else 374 else
375 wl3501_set_to_wla(this, this-> 375 wl3501_set_to_wla(this, this->tx_buffer_tail,
376 &ptr, sizeof 376 &ptr, sizeof(ptr));
377 while (ptr) { 377 while (ptr) {
378 u16 next; 378 u16 next;
379 379
380 this->tx_buffer_cnt++; 380 this->tx_buffer_cnt++;
381 wl3501_get_from_wla(this, ptr, 381 wl3501_get_from_wla(this, ptr, &next, sizeof(next));
382 this->tx_buffer_tail = ptr; 382 this->tx_buffer_tail = ptr;
383 ptr = next; 383 ptr = next;
384 } 384 }
385 } 385 }
386 386
387 static int wl3501_esbq_req_test(struct wl3501_ 387 static int wl3501_esbq_req_test(struct wl3501_card *this)
388 { 388 {
389 u8 tmp; 389 u8 tmp;
390 390
391 wl3501_get_from_wla(this, this->esbq_r 391 wl3501_get_from_wla(this, this->esbq_req_head + 3, &tmp, sizeof(tmp));
392 return tmp & 0x80; 392 return tmp & 0x80;
393 } 393 }
394 394
395 static void wl3501_esbq_req(struct wl3501_card 395 static void wl3501_esbq_req(struct wl3501_card *this, u16 *ptr)
396 { 396 {
397 u16 tmp = 0; 397 u16 tmp = 0;
398 398
399 wl3501_set_to_wla(this, this->esbq_req 399 wl3501_set_to_wla(this, this->esbq_req_head, ptr, 2);
400 wl3501_set_to_wla(this, this->esbq_req 400 wl3501_set_to_wla(this, this->esbq_req_head + 2, &tmp, sizeof(tmp));
401 this->esbq_req_head += 4; 401 this->esbq_req_head += 4;
402 if (this->esbq_req_head >= this->esbq_ 402 if (this->esbq_req_head >= this->esbq_req_end)
403 this->esbq_req_head = this->es 403 this->esbq_req_head = this->esbq_req_start;
404 } 404 }
405 405
406 static int wl3501_esbq_exec(struct wl3501_card 406 static int wl3501_esbq_exec(struct wl3501_card *this, void *sig, int sig_size)
407 { 407 {
408 int rc = -EIO; 408 int rc = -EIO;
409 409
410 if (wl3501_esbq_req_test(this)) { 410 if (wl3501_esbq_req_test(this)) {
411 u16 ptr = wl3501_get_tx_buffer 411 u16 ptr = wl3501_get_tx_buffer(this, sig_size);
412 if (ptr) { 412 if (ptr) {
413 wl3501_set_to_wla(this 413 wl3501_set_to_wla(this, ptr, sig, sig_size);
414 wl3501_esbq_req(this, 414 wl3501_esbq_req(this, &ptr);
415 rc = 0; 415 rc = 0;
416 } 416 }
417 } 417 }
418 return rc; 418 return rc;
419 } 419 }
420 420
421 static int wl3501_get_mib_value(struct wl3501_ 421 static int wl3501_get_mib_value(struct wl3501_card *this, u8 index,
422 void *bf, int 422 void *bf, int size)
423 { 423 {
424 struct wl3501_get_req sig = { 424 struct wl3501_get_req sig = {
425 .sig_id = WL3501_SIG_GET_R 425 .sig_id = WL3501_SIG_GET_REQ,
426 .mib_attrib = index, 426 .mib_attrib = index,
427 }; 427 };
428 unsigned long flags; 428 unsigned long flags;
429 int rc = -EIO; 429 int rc = -EIO;
430 430
431 spin_lock_irqsave(&this->lock, flags); 431 spin_lock_irqsave(&this->lock, flags);
432 if (wl3501_esbq_req_test(this)) { 432 if (wl3501_esbq_req_test(this)) {
433 u16 ptr = wl3501_get_tx_buffer 433 u16 ptr = wl3501_get_tx_buffer(this, sizeof(sig));
434 if (ptr) { 434 if (ptr) {
435 wl3501_set_to_wla(this 435 wl3501_set_to_wla(this, ptr, &sig, sizeof(sig));
436 wl3501_esbq_req(this, 436 wl3501_esbq_req(this, &ptr);
437 this->sig_get_confirm. 437 this->sig_get_confirm.mib_status = 255;
438 spin_unlock_irqrestore 438 spin_unlock_irqrestore(&this->lock, flags);
439 rc = wait_event_interr 439 rc = wait_event_interruptible(this->wait,
440 this->sig_get_ 440 this->sig_get_confirm.mib_status != 255);
441 if (!rc) 441 if (!rc)
442 memcpy(bf, thi 442 memcpy(bf, this->sig_get_confirm.mib_value,
443 size); 443 size);
444 goto out; 444 goto out;
445 } 445 }
446 } 446 }
447 spin_unlock_irqrestore(&this->lock, fl 447 spin_unlock_irqrestore(&this->lock, flags);
448 out: 448 out:
449 return rc; 449 return rc;
450 } 450 }
451 451
452 static int wl3501_pwr_mgmt(struct wl3501_card 452 static int wl3501_pwr_mgmt(struct wl3501_card *this, int suspend)
453 { 453 {
454 struct wl3501_pwr_mgmt_req sig = { 454 struct wl3501_pwr_mgmt_req sig = {
455 .sig_id = WL3501_SIG_P 455 .sig_id = WL3501_SIG_PWR_MGMT_REQ,
456 .pwr_save = suspend, 456 .pwr_save = suspend,
457 .wake_up = !suspend, 457 .wake_up = !suspend,
458 .receive_dtims = 10, 458 .receive_dtims = 10,
459 }; 459 };
460 unsigned long flags; 460 unsigned long flags;
461 int rc = -EIO; 461 int rc = -EIO;
462 462
463 spin_lock_irqsave(&this->lock, flags); 463 spin_lock_irqsave(&this->lock, flags);
464 if (wl3501_esbq_req_test(this)) { 464 if (wl3501_esbq_req_test(this)) {
465 u16 ptr = wl3501_get_tx_buffer 465 u16 ptr = wl3501_get_tx_buffer(this, sizeof(sig));
466 if (ptr) { 466 if (ptr) {
467 wl3501_set_to_wla(this 467 wl3501_set_to_wla(this, ptr, &sig, sizeof(sig));
468 wl3501_esbq_req(this, 468 wl3501_esbq_req(this, &ptr);
469 this->sig_pwr_mgmt_con 469 this->sig_pwr_mgmt_confirm.status = 255;
470 spin_unlock_irqrestore 470 spin_unlock_irqrestore(&this->lock, flags);
471 rc = wait_event_interr 471 rc = wait_event_interruptible(this->wait,
472 this->sig_pwr_ 472 this->sig_pwr_mgmt_confirm.status != 255);
473 printk(KERN_INFO "%s: 473 printk(KERN_INFO "%s: %s status=%d\n", __FUNCTION__,
474 suspend ? "susp 474 suspend ? "suspend" : "resume",
475 this->sig_pwr_m 475 this->sig_pwr_mgmt_confirm.status);
476 goto out; 476 goto out;
477 } 477 }
478 } 478 }
479 spin_unlock_irqrestore(&this->lock, fl 479 spin_unlock_irqrestore(&this->lock, flags);
480 out: 480 out:
481 return rc; 481 return rc;
482 } 482 }
483 483
484 /** 484 /**
485 * wl3501_send_pkt - Send a packet. 485 * wl3501_send_pkt - Send a packet.
486 * @this - card 486 * @this - card
487 * 487 *
488 * Send a packet. 488 * Send a packet.
489 * 489 *
490 * data = Ethernet raw frame. (e.g. data[0] - 490 * data = Ethernet raw frame. (e.g. data[0] - data[5] is Dest MAC Addr,
491 * data[6] - 491 * data[6] - data[11] is Src MAC Addr)
492 * Ref: IEEE 802.11 492 * Ref: IEEE 802.11
493 */ 493 */
494 static int wl3501_send_pkt(struct wl3501_card 494 static int wl3501_send_pkt(struct wl3501_card *this, u8 *data, u16 len)
495 { 495 {
496 u16 bf, sig_bf, next, tmplen, pktlen; 496 u16 bf, sig_bf, next, tmplen, pktlen;
497 struct wl3501_md_req sig = { 497 struct wl3501_md_req sig = {
498 .sig_id = WL3501_SIG_MD_REQ, 498 .sig_id = WL3501_SIG_MD_REQ,
499 }; 499 };
500 u8 *pdata = (char *)data; 500 u8 *pdata = (char *)data;
501 int rc = -EIO; 501 int rc = -EIO;
502 502
503 if (wl3501_esbq_req_test(this)) { 503 if (wl3501_esbq_req_test(this)) {
504 sig_bf = wl3501_get_tx_buffer( 504 sig_bf = wl3501_get_tx_buffer(this, sizeof(sig));
505 rc = -ENOMEM; 505 rc = -ENOMEM;
506 if (!sig_bf) /* No free buf 506 if (!sig_bf) /* No free buffer available */
507 goto out; 507 goto out;
508 bf = wl3501_get_tx_buffer(this 508 bf = wl3501_get_tx_buffer(this, len + 26 + 24);
509 if (!bf) { 509 if (!bf) {
510 /* No free buffer avai 510 /* No free buffer available */
511 wl3501_free_tx_buffer( 511 wl3501_free_tx_buffer(this, sig_bf);
512 goto out; 512 goto out;
513 } 513 }
514 rc = 0; 514 rc = 0;
515 memcpy(&sig.daddr[0], pdata, 1 515 memcpy(&sig.daddr[0], pdata, 12);
516 pktlen = len - 12; 516 pktlen = len - 12;
517 pdata += 12; 517 pdata += 12;
518 sig.data = bf; 518 sig.data = bf;
519 if (((*pdata) * 256 + (*(pdata 519 if (((*pdata) * 256 + (*(pdata + 1))) > 1500) {
520 u8 addr4[ETH_ALEN] = { 520 u8 addr4[ETH_ALEN] = {
521 [0] = 0xAA, [1 521 [0] = 0xAA, [1] = 0xAA, [2] = 0x03, [4] = 0x00,
522 }; 522 };
523 523
524 wl3501_set_to_wla(this 524 wl3501_set_to_wla(this, bf + 2 +
525 offs 525 offsetof(struct wl3501_tx_hdr, addr4),
526 addr 526 addr4, sizeof(addr4));
527 sig.size = pktlen + 24 527 sig.size = pktlen + 24 + 4 + 6;
528 if (pktlen > (254 - si 528 if (pktlen > (254 - sizeof(struct wl3501_tx_hdr))) {
529 tmplen = 254 - 529 tmplen = 254 - sizeof(struct wl3501_tx_hdr);
530 pktlen -= tmpl 530 pktlen -= tmplen;
531 } else { 531 } else {
532 tmplen = pktle 532 tmplen = pktlen;
533 pktlen = 0; 533 pktlen = 0;
534 } 534 }
535 wl3501_set_to_wla(this 535 wl3501_set_to_wla(this,
536 bf + 536 bf + 2 + sizeof(struct wl3501_tx_hdr),
537 pdat 537 pdata, tmplen);
538 pdata += tmplen; 538 pdata += tmplen;
539 wl3501_get_from_wla(th 539 wl3501_get_from_wla(this, bf, &next, sizeof(next));
540 bf = next; 540 bf = next;
541 } else { 541 } else {
542 sig.size = pktlen + 24 542 sig.size = pktlen + 24 + 4 - 2;
543 pdata += 2; 543 pdata += 2;
544 pktlen -= 2; 544 pktlen -= 2;
545 if (pktlen > (254 - si 545 if (pktlen > (254 - sizeof(struct wl3501_tx_hdr) + 6)) {
546 tmplen = 254 - 546 tmplen = 254 - sizeof(struct wl3501_tx_hdr) + 6;
547 pktlen -= tmpl 547 pktlen -= tmplen;
548 } else { 548 } else {
549 tmplen = pktle 549 tmplen = pktlen;
550 pktlen = 0; 550 pktlen = 0;
551 } 551 }
552 wl3501_set_to_wla(this 552 wl3501_set_to_wla(this, bf + 2 +
553 offs 553 offsetof(struct wl3501_tx_hdr, addr4),
554 pdat 554 pdata, tmplen);
555 pdata += tmplen; 555 pdata += tmplen;
556 wl3501_get_from_wla(th 556 wl3501_get_from_wla(this, bf, &next, sizeof(next));
557 bf = next; 557 bf = next;
558 } 558 }
559 while (pktlen > 0) { 559 while (pktlen > 0) {
560 if (pktlen > 254) { 560 if (pktlen > 254) {
561 tmplen = 254; 561 tmplen = 254;
562 pktlen -= 254; 562 pktlen -= 254;
563 } else { 563 } else {
564 tmplen = pktle 564 tmplen = pktlen;
565 pktlen = 0; 565 pktlen = 0;
566 } 566 }
567 wl3501_set_to_wla(this 567 wl3501_set_to_wla(this, bf + 2, pdata, tmplen);
568 pdata += tmplen; 568 pdata += tmplen;
569 wl3501_get_from_wla(th 569 wl3501_get_from_wla(this, bf, &next, sizeof(next));
570 bf = next; 570 bf = next;
571 } 571 }
572 wl3501_set_to_wla(this, sig_bf 572 wl3501_set_to_wla(this, sig_bf, &sig, sizeof(sig));
573 wl3501_esbq_req(this, &sig_bf) 573 wl3501_esbq_req(this, &sig_bf);
574 } 574 }
575 out: 575 out:
576 return rc; 576 return rc;
577 } 577 }
578 578
579 static int wl3501_mgmt_resync(struct wl3501_ca 579 static int wl3501_mgmt_resync(struct wl3501_card *this)
580 { 580 {
581 struct wl3501_resync_req sig = { 581 struct wl3501_resync_req sig = {
582 .sig_id = WL3501_SIG_RESYNC_RE 582 .sig_id = WL3501_SIG_RESYNC_REQ,
583 }; 583 };
584 584
585 return wl3501_esbq_exec(this, &sig, si 585 return wl3501_esbq_exec(this, &sig, sizeof(sig));
586 } 586 }
587 587
588 static inline int wl3501_fw_bss_type(struct wl 588 static inline int wl3501_fw_bss_type(struct wl3501_card *this)
589 { 589 {
590 return this->net_type == IW_MODE_INFRA 590 return this->net_type == IW_MODE_INFRA ? WL3501_NET_TYPE_INFRA :
591 591 WL3501_NET_TYPE_ADHOC;
592 } 592 }
593 593
594 static inline int wl3501_fw_cap_info(struct wl 594 static inline int wl3501_fw_cap_info(struct wl3501_card *this)
595 { 595 {
596 return this->net_type == IW_MODE_INFRA 596 return this->net_type == IW_MODE_INFRA ? WL3501_MGMT_CAPABILITY_ESS :
597 597 WL3501_MGMT_CAPABILITY_IBSS;
598 } 598 }
599 599
600 static int wl3501_mgmt_scan(struct wl3501_card 600 static int wl3501_mgmt_scan(struct wl3501_card *this, u16 chan_time)
601 { 601 {
602 struct wl3501_scan_req sig = { 602 struct wl3501_scan_req sig = {
603 .sig_id = WL3501_SIG_S 603 .sig_id = WL3501_SIG_SCAN_REQ,
604 .scan_type = WL3501_SCAN_ 604 .scan_type = WL3501_SCAN_TYPE_ACTIVE,
605 .probe_delay = 0x10, 605 .probe_delay = 0x10,
606 .min_chan_time = chan_time, 606 .min_chan_time = chan_time,
607 .max_chan_time = chan_time, 607 .max_chan_time = chan_time,
608 .bss_type = wl3501_fw_bs 608 .bss_type = wl3501_fw_bss_type(this),
609 }; 609 };
610 610
611 this->bss_cnt = this->join_sta_bss = 0 611 this->bss_cnt = this->join_sta_bss = 0;
612 return wl3501_esbq_exec(this, &sig, si 612 return wl3501_esbq_exec(this, &sig, sizeof(sig));
613 } 613 }
614 614
615 static int wl3501_mgmt_join(struct wl3501_card 615 static int wl3501_mgmt_join(struct wl3501_card *this, u16 stas)
616 { 616 {
617 struct wl3501_join_req sig = { 617 struct wl3501_join_req sig = {
618 .sig_id = WL3501_SIG 618 .sig_id = WL3501_SIG_JOIN_REQ,
619 .timeout = 10, 619 .timeout = 10,
620 .ds_pset = { 620 .ds_pset = {
621 .el = { 621 .el = {
622 .id = IW_MGMT 622 .id = IW_MGMT_INFO_ELEMENT_DS_PARAMETER_SET,
623 .len = 1, 623 .len = 1,
624 }, 624 },
625 .chan = this->chan, 625 .chan = this->chan,
626 }, 626 },
627 }; 627 };
628 628
629 memcpy(&sig.beacon_period, &this->bss_ 629 memcpy(&sig.beacon_period, &this->bss_set[stas].beacon_period, 72);
630 return wl3501_esbq_exec(this, &sig, si 630 return wl3501_esbq_exec(this, &sig, sizeof(sig));
631 } 631 }
632 632
633 static int wl3501_mgmt_start(struct wl3501_car 633 static int wl3501_mgmt_start(struct wl3501_card *this)
634 { 634 {
635 struct wl3501_start_req sig = { 635 struct wl3501_start_req sig = {
636 .sig_id = WL35 636 .sig_id = WL3501_SIG_START_REQ,
637 .beacon_period = 400, 637 .beacon_period = 400,
638 .dtim_period = 1, 638 .dtim_period = 1,
639 .ds_pset = { 639 .ds_pset = {
640 .el = { 640 .el = {
641 .id = IW_MGMT 641 .id = IW_MGMT_INFO_ELEMENT_DS_PARAMETER_SET,
642 .len = 1, 642 .len = 1,
643 }, 643 },
644 .chan = this->chan, 644 .chan = this->chan,
645 }, 645 },
646 .bss_basic_rset = { 646 .bss_basic_rset = {
647 .el = { 647 .el = {
648 .id = IW_M 648 .id = IW_MGMT_INFO_ELEMENT_SUPPORTED_RATES,
649 .len = 2, 649 .len = 2,
650 }, 650 },
651 .data_rate_labels = { 651 .data_rate_labels = {
652 [0] = IW_MGMT_ 652 [0] = IW_MGMT_RATE_LABEL_MANDATORY |
653 IW_MGMT_ 653 IW_MGMT_RATE_LABEL_1MBIT,
654 [1] = IW_MGMT_ 654 [1] = IW_MGMT_RATE_LABEL_MANDATORY |
655 IW_MGMT_ 655 IW_MGMT_RATE_LABEL_2MBIT,
656 }, 656 },
657 }, 657 },
658 .operational_rset = { 658 .operational_rset = {
659 .el = { 659 .el = {
660 .id = IW_M 660 .id = IW_MGMT_INFO_ELEMENT_SUPPORTED_RATES,
661 .len = 2, 661 .len = 2,
662 }, 662 },
663 .data_rate_labels = { 663 .data_rate_labels = {
664 [0] = IW_MGMT_ 664 [0] = IW_MGMT_RATE_LABEL_MANDATORY |
665 IW_MGMT_ 665 IW_MGMT_RATE_LABEL_1MBIT,
666 [1] = IW_MGMT_ 666 [1] = IW_MGMT_RATE_LABEL_MANDATORY |
667 IW_MGMT_ 667 IW_MGMT_RATE_LABEL_2MBIT,
668 }, 668 },
669 }, 669 },
670 .ibss_pset = { 670 .ibss_pset = {
671 .el = { 671 .el = {
672 .id = IW_ 672 .id = IW_MGMT_INFO_ELEMENT_IBSS_PARAMETER_SET,
673 .len = 2, 673 .len = 2,
674 }, 674 },
675 .atim_window = 10, 675 .atim_window = 10,
676 }, 676 },
677 .bss_type = wl35 677 .bss_type = wl3501_fw_bss_type(this),
678 .cap_info = wl35 678 .cap_info = wl3501_fw_cap_info(this),
679 }; 679 };
680 680
681 iw_copy_mgmt_info_element(&sig.ssid.el 681 iw_copy_mgmt_info_element(&sig.ssid.el, &this->essid.el);
682 iw_copy_mgmt_info_element(&this->keep_ 682 iw_copy_mgmt_info_element(&this->keep_essid.el, &this->essid.el);
683 return wl3501_esbq_exec(this, &sig, si 683 return wl3501_esbq_exec(this, &sig, sizeof(sig));
684 } 684 }
685 685
686 static void wl3501_mgmt_scan_confirm(struct wl 686 static void wl3501_mgmt_scan_confirm(struct wl3501_card *this, u16 addr)
687 { 687 {
688 u16 i = 0; 688 u16 i = 0;
689 int matchflag = 0; 689 int matchflag = 0;
690 struct wl3501_scan_confirm sig; 690 struct wl3501_scan_confirm sig;
691 691
692 dprintk(3, "entry"); 692 dprintk(3, "entry");
693 wl3501_get_from_wla(this, addr, &sig, 693 wl3501_get_from_wla(this, addr, &sig, sizeof(sig));
694 if (sig.status == WL3501_STATUS_SUCCES 694 if (sig.status == WL3501_STATUS_SUCCESS) {
695 dprintk(3, "success"); 695 dprintk(3, "success");
696 if ((this->net_type == IW_MODE 696 if ((this->net_type == IW_MODE_INFRA &&
697 (sig.cap_info & WL3501_MG 697 (sig.cap_info & WL3501_MGMT_CAPABILITY_ESS)) ||
698 (this->net_type == IW_MODE 698 (this->net_type == IW_MODE_ADHOC &&
699 (sig.cap_info & WL3501_MG 699 (sig.cap_info & WL3501_MGMT_CAPABILITY_IBSS)) ||
700 this->net_type == IW_MODE_ 700 this->net_type == IW_MODE_AUTO) {
701 if (!this->essid.el.le 701 if (!this->essid.el.len)
702 matchflag = 1; 702 matchflag = 1;
703 else if (this->essid.e 703 else if (this->essid.el.len == 3 &&
704 !memcmp(this- 704 !memcmp(this->essid.essid, "ANY", 3))
705 matchflag = 1; 705 matchflag = 1;
706 else if (this->essid.e 706 else if (this->essid.el.len != sig.ssid.el.len)
707 matchflag = 0; 707 matchflag = 0;
708 else if (memcmp(this-> 708 else if (memcmp(this->essid.essid, sig.ssid.essid,
709 this-> 709 this->essid.el.len))
710 matchflag = 0; 710 matchflag = 0;
711 else 711 else
712 matchflag = 1; 712 matchflag = 1;
713 if (matchflag) { 713 if (matchflag) {
714 for (i = 0; i 714 for (i = 0; i < this->bss_cnt; i++) {
715 if (!m 715 if (!memcmp(this->bss_set[i].bssid,
716 716 sig.bssid, ETH_ALEN)) {
717 717 matchflag = 0;
718 718 break;
719 } 719 }
720 } 720 }
721 } 721 }
722 if (matchflag && (i < 722 if (matchflag && (i < 20)) {
723 memcpy(&this-> 723 memcpy(&this->bss_set[i].beacon_period,
724 &sig.be 724 &sig.beacon_period, 73);
725 this->bss_cnt+ 725 this->bss_cnt++;
726 this->rssi = s 726 this->rssi = sig.rssi;
727 } 727 }
728 } 728 }
729 } else if (sig.status == WL3501_STATUS 729 } else if (sig.status == WL3501_STATUS_TIMEOUT) {
730 dprintk(3, "timeout"); 730 dprintk(3, "timeout");
731 this->join_sta_bss = 0; 731 this->join_sta_bss = 0;
732 for (i = this->join_sta_bss; i 732 for (i = this->join_sta_bss; i < this->bss_cnt; i++)
733 if (!wl3501_mgmt_join( 733 if (!wl3501_mgmt_join(this, i))
734 break; 734 break;
735 this->join_sta_bss = i; 735 this->join_sta_bss = i;
736 if (this->join_sta_bss == this 736 if (this->join_sta_bss == this->bss_cnt) {
737 if (this->net_type == 737 if (this->net_type == IW_MODE_INFRA)
738 wl3501_mgmt_sc 738 wl3501_mgmt_scan(this, 100);
739 else { 739 else {
740 this->adhoc_ti 740 this->adhoc_times++;
741 if (this->adho 741 if (this->adhoc_times > WL3501_MAX_ADHOC_TRIES)
742 wl3501 742 wl3501_mgmt_start(this);
743 else 743 else
744 wl3501 744 wl3501_mgmt_scan(this, 100);
745 } 745 }
746 } 746 }
747 } 747 }
748 } 748 }
749 749
750 /** 750 /**
751 * wl3501_block_interrupt - Mask interrupt fro 751 * wl3501_block_interrupt - Mask interrupt from SUTRO
752 * @this - card 752 * @this - card
753 * 753 *
754 * Mask interrupt from SUTRO. (i.e. SUTRO cann 754 * Mask interrupt from SUTRO. (i.e. SUTRO cannot interrupt the HOST)
755 * Return: 1 if interrupt is originally enable 755 * Return: 1 if interrupt is originally enabled
756 */ 756 */
757 static int wl3501_block_interrupt(struct wl350 757 static int wl3501_block_interrupt(struct wl3501_card *this)
758 { 758 {
759 u8 old = inb(this->base_addr + WL3501_ 759 u8 old = inb(this->base_addr + WL3501_NIC_GCR);
760 u8 new = old & (~(WL3501_GCR_ECINT | W 760 u8 new = old & (~(WL3501_GCR_ECINT | WL3501_GCR_INT2EC |
761 WL3501_GCR_ENECINT)); 761 WL3501_GCR_ENECINT));
762 762
763 wl3501_outb(new, this->base_addr + WL3 763 wl3501_outb(new, this->base_addr + WL3501_NIC_GCR);
764 return old & WL3501_GCR_ENECINT; 764 return old & WL3501_GCR_ENECINT;
765 } 765 }
766 766
767 /** 767 /**
768 * wl3501_unblock_interrupt - Enable interrupt 768 * wl3501_unblock_interrupt - Enable interrupt from SUTRO
769 * @this - card 769 * @this - card
770 * 770 *
771 * Enable interrupt from SUTRO. (i.e. SUTRO ca 771 * Enable interrupt from SUTRO. (i.e. SUTRO can interrupt the HOST)
772 * Return: 1 if interrupt is originally enable 772 * Return: 1 if interrupt is originally enabled
773 */ 773 */
774 static int wl3501_unblock_interrupt(struct wl3 774 static int wl3501_unblock_interrupt(struct wl3501_card *this)
775 { 775 {
776 u8 old = inb(this->base_addr + WL3501_ 776 u8 old = inb(this->base_addr + WL3501_NIC_GCR);
777 u8 new = (old & ~(WL3501_GCR_ECINT | W 777 u8 new = (old & ~(WL3501_GCR_ECINT | WL3501_GCR_INT2EC)) |
778 WL3501_GCR_ENECINT; 778 WL3501_GCR_ENECINT;
779 779
780 wl3501_outb(new, this->base_addr + WL3 780 wl3501_outb(new, this->base_addr + WL3501_NIC_GCR);
781 return old & WL3501_GCR_ENECINT; 781 return old & WL3501_GCR_ENECINT;
782 } 782 }
783 783
784 /** 784 /**
785 * wl3501_receive - Receive data from Receive 785 * wl3501_receive - Receive data from Receive Queue.
786 * 786 *
787 * Receive data from Receive Queue. 787 * Receive data from Receive Queue.
788 * 788 *
789 * @this: card 789 * @this: card
790 * @bf: address of host 790 * @bf: address of host
791 * @size: size of buffer. 791 * @size: size of buffer.
792 */ 792 */
793 static u16 wl3501_receive(struct wl3501_card * 793 static u16 wl3501_receive(struct wl3501_card *this, u8 *bf, u16 size)
794 { 794 {
795 u16 next_addr, next_addr1; 795 u16 next_addr, next_addr1;
796 u8 *data = bf + 12; 796 u8 *data = bf + 12;
797 797
798 size -= 12; 798 size -= 12;
799 wl3501_get_from_wla(this, this->start_ 799 wl3501_get_from_wla(this, this->start_seg + 2,
800 &next_addr, sizeof 800 &next_addr, sizeof(next_addr));
801 if (size > WL3501_BLKSZ - sizeof(struc 801 if (size > WL3501_BLKSZ - sizeof(struct wl3501_rx_hdr)) {
802 wl3501_get_from_wla(this, 802 wl3501_get_from_wla(this,
803 this->star 803 this->start_seg +
804 sizeof 804 sizeof(struct wl3501_rx_hdr), data,
805 WL3501_BLK 805 WL3501_BLKSZ -
806 sizeof 806 sizeof(struct wl3501_rx_hdr));
807 size -= WL3501_BLKSZ - sizeof( 807 size -= WL3501_BLKSZ - sizeof(struct wl3501_rx_hdr);
808 data += WL3501_BLKSZ - sizeof( 808 data += WL3501_BLKSZ - sizeof(struct wl3501_rx_hdr);
809 } else { 809 } else {
810 wl3501_get_from_wla(this, 810 wl3501_get_from_wla(this,
811 this->star 811 this->start_seg +
812 sizeof 812 sizeof(struct wl3501_rx_hdr),
813 data, size 813 data, size);
814 size = 0; 814 size = 0;
815 } 815 }
816 while (size > 0) { 816 while (size > 0) {
817 if (size > WL3501_BLKSZ - 5) { 817 if (size > WL3501_BLKSZ - 5) {
818 wl3501_get_from_wla(th 818 wl3501_get_from_wla(this, next_addr + 5, data,
819 WL 819 WL3501_BLKSZ - 5);
820 size -= WL3501_BLKSZ - 820 size -= WL3501_BLKSZ - 5;
821 data += WL3501_BLKSZ - 821 data += WL3501_BLKSZ - 5;
822 wl3501_get_from_wla(th 822 wl3501_get_from_wla(this, next_addr + 2, &next_addr1,
823 si 823 sizeof(next_addr1));
824 next_addr = next_addr1 824 next_addr = next_addr1;
825 } else { 825 } else {
826 wl3501_get_from_wla(th 826 wl3501_get_from_wla(this, next_addr + 5, data, size);
827 size = 0; 827 size = 0;
828 } 828 }
829 } 829 }
830 return 0; 830 return 0;
831 } 831 }
832 832
833 static void wl3501_esbq_req_free(struct wl3501 833 static void wl3501_esbq_req_free(struct wl3501_card *this)
834 { 834 {
835 u8 tmp; 835 u8 tmp;
836 u16 addr; 836 u16 addr;
837 837
838 if (this->esbq_req_head == this->esbq_ 838 if (this->esbq_req_head == this->esbq_req_tail)
839 goto out; 839 goto out;
840 wl3501_get_from_wla(this, this->esbq_r 840 wl3501_get_from_wla(this, this->esbq_req_tail + 3, &tmp, sizeof(tmp));
841 if (!(tmp & 0x80)) 841 if (!(tmp & 0x80))
842 goto out; 842 goto out;
843 wl3501_get_from_wla(this, this->esbq_r 843 wl3501_get_from_wla(this, this->esbq_req_tail, &addr, sizeof(addr));
844 wl3501_free_tx_buffer(this, addr); 844 wl3501_free_tx_buffer(this, addr);
845 this->esbq_req_tail += 4; 845 this->esbq_req_tail += 4;
846 if (this->esbq_req_tail >= this->esbq_ 846 if (this->esbq_req_tail >= this->esbq_req_end)
847 this->esbq_req_tail = this->es 847 this->esbq_req_tail = this->esbq_req_start;
848 out: 848 out:
849 return; 849 return;
850 } 850 }
851 851
852 static int wl3501_esbq_confirm(struct wl3501_c 852 static int wl3501_esbq_confirm(struct wl3501_card *this)
853 { 853 {
854 u8 tmp; 854 u8 tmp;
855 855
856 wl3501_get_from_wla(this, this->esbq_c 856 wl3501_get_from_wla(this, this->esbq_confirm + 3, &tmp, sizeof(tmp));
857 return tmp & 0x80; 857 return tmp & 0x80;
858 } 858 }
859 859
860 static void wl3501_online(struct net_device *d 860 static void wl3501_online(struct net_device *dev)
861 { 861 {
862 struct wl3501_card *this = netdev_priv 862 struct wl3501_card *this = netdev_priv(dev);
863 DECLARE_MAC_BUF(mac); 863 DECLARE_MAC_BUF(mac);
864 864
865 printk(KERN_INFO "%s: Wireless LAN onl 865 printk(KERN_INFO "%s: Wireless LAN online. BSSID: %s\n",
866 dev->name, print_mac(mac, this- 866 dev->name, print_mac(mac, this->bssid));
867 netif_wake_queue(dev); 867 netif_wake_queue(dev);
868 } 868 }
869 869
870 static void wl3501_esbq_confirm_done(struct wl 870 static void wl3501_esbq_confirm_done(struct wl3501_card *this)
871 { 871 {
872 u8 tmp = 0; 872 u8 tmp = 0;
873 873
874 wl3501_set_to_wla(this, this->esbq_con 874 wl3501_set_to_wla(this, this->esbq_confirm + 3, &tmp, sizeof(tmp));
875 this->esbq_confirm += 4; 875 this->esbq_confirm += 4;
876 if (this->esbq_confirm >= this->esbq_c 876 if (this->esbq_confirm >= this->esbq_confirm_end)
877 this->esbq_confirm = this->esb 877 this->esbq_confirm = this->esbq_confirm_start;
878 } 878 }
879 879
880 static int wl3501_mgmt_auth(struct wl3501_card 880 static int wl3501_mgmt_auth(struct wl3501_card *this)
881 { 881 {
882 struct wl3501_auth_req sig = { 882 struct wl3501_auth_req sig = {
883 .sig_id = WL3501_SIG_AUTH_REQ 883 .sig_id = WL3501_SIG_AUTH_REQ,
884 .type = WL3501_SYS_TYPE_OPE 884 .type = WL3501_SYS_TYPE_OPEN,
885 .timeout = 1000, 885 .timeout = 1000,
886 }; 886 };
887 887
888 dprintk(3, "entry"); 888 dprintk(3, "entry");
889 memcpy(sig.mac_addr, this->bssid, ETH_ 889 memcpy(sig.mac_addr, this->bssid, ETH_ALEN);
890 return wl3501_esbq_exec(this, &sig, si 890 return wl3501_esbq_exec(this, &sig, sizeof(sig));
891 } 891 }
892 892
893 static int wl3501_mgmt_association(struct wl35 893 static int wl3501_mgmt_association(struct wl3501_card *this)
894 { 894 {
895 struct wl3501_assoc_req sig = { 895 struct wl3501_assoc_req sig = {
896 .sig_id = WL3501_SIG_ 896 .sig_id = WL3501_SIG_ASSOC_REQ,
897 .timeout = 1000, 897 .timeout = 1000,
898 .listen_interval = 5, 898 .listen_interval = 5,
899 .cap_info = this->cap_i 899 .cap_info = this->cap_info,
900 }; 900 };
901 901
902 dprintk(3, "entry"); 902 dprintk(3, "entry");
903 memcpy(sig.mac_addr, this->bssid, ETH_ 903 memcpy(sig.mac_addr, this->bssid, ETH_ALEN);
904 return wl3501_esbq_exec(this, &sig, si 904 return wl3501_esbq_exec(this, &sig, sizeof(sig));
905 } 905 }
906 906
907 static void wl3501_mgmt_join_confirm(struct ne 907 static void wl3501_mgmt_join_confirm(struct net_device *dev, u16 addr)
908 { 908 {
909 struct wl3501_card *this = netdev_priv 909 struct wl3501_card *this = netdev_priv(dev);
910 struct wl3501_join_confirm sig; 910 struct wl3501_join_confirm sig;
911 911
912 dprintk(3, "entry"); 912 dprintk(3, "entry");
913 wl3501_get_from_wla(this, addr, &sig, 913 wl3501_get_from_wla(this, addr, &sig, sizeof(sig));
914 if (sig.status == WL3501_STATUS_SUCCES 914 if (sig.status == WL3501_STATUS_SUCCESS) {
915 if (this->net_type == IW_MODE_ 915 if (this->net_type == IW_MODE_INFRA) {
916 if (this->join_sta_bss 916 if (this->join_sta_bss < this->bss_cnt) {
917 const int i = 917 const int i = this->join_sta_bss;
918 memcpy(this->b 918 memcpy(this->bssid,
919 this->b 919 this->bss_set[i].bssid, ETH_ALEN);
920 this->chan = t 920 this->chan = this->bss_set[i].ds_pset.chan;
921 iw_copy_mgmt_i 921 iw_copy_mgmt_info_element(&this->keep_essid.el,
922 922 &this->bss_set[i].ssid.el);
923 wl3501_mgmt_au 923 wl3501_mgmt_auth(this);
924 } 924 }
925 } else { 925 } else {
926 const int i = this->jo 926 const int i = this->join_sta_bss;
927 927
928 memcpy(&this->bssid, & 928 memcpy(&this->bssid, &this->bss_set[i].bssid, ETH_ALEN);
929 this->chan = this->bss 929 this->chan = this->bss_set[i].ds_pset.chan;
930 iw_copy_mgmt_info_elem 930 iw_copy_mgmt_info_element(&this->keep_essid.el,
931 931 &this->bss_set[i].ssid.el);
932 wl3501_online(dev); 932 wl3501_online(dev);
933 } 933 }
934 } else { 934 } else {
935 int i; 935 int i;
936 this->join_sta_bss++; 936 this->join_sta_bss++;
937 for (i = this->join_sta_bss; i 937 for (i = this->join_sta_bss; i < this->bss_cnt; i++)
938 if (!wl3501_mgmt_join( 938 if (!wl3501_mgmt_join(this, i))
939 break; 939 break;
940 this->join_sta_bss = i; 940 this->join_sta_bss = i;
941 if (this->join_sta_bss == this 941 if (this->join_sta_bss == this->bss_cnt) {
942 if (this->net_type == 942 if (this->net_type == IW_MODE_INFRA)
943 wl3501_mgmt_sc 943 wl3501_mgmt_scan(this, 100);
944 else { 944 else {
945 this->adhoc_ti 945 this->adhoc_times++;
946 if (this->adho 946 if (this->adhoc_times > WL3501_MAX_ADHOC_TRIES)
947 wl3501 947 wl3501_mgmt_start(this);
948 else 948 else
949 wl3501 949 wl3501_mgmt_scan(this, 100);
950 } 950 }
951 } 951 }
952 } 952 }
953 } 953 }
954 954
955 static inline void wl3501_alarm_interrupt(stru 955 static inline void wl3501_alarm_interrupt(struct net_device *dev,
956 stru 956 struct wl3501_card *this)
957 { 957 {
958 if (this->net_type == IW_MODE_INFRA) { 958 if (this->net_type == IW_MODE_INFRA) {
959 printk(KERN_INFO "Wireless LAN 959 printk(KERN_INFO "Wireless LAN offline\n");
960 netif_stop_queue(dev); 960 netif_stop_queue(dev);
961 wl3501_mgmt_resync(this); 961 wl3501_mgmt_resync(this);
962 } 962 }
963 } 963 }
964 964
965 static inline void wl3501_md_confirm_interrupt 965 static inline void wl3501_md_confirm_interrupt(struct net_device *dev,
966 966 struct wl3501_card *this,
967 967 u16 addr)
968 { 968 {
969 struct wl3501_md_confirm sig; 969 struct wl3501_md_confirm sig;
970 970
971 dprintk(3, "entry"); 971 dprintk(3, "entry");
972 wl3501_get_from_wla(this, addr, &sig, 972 wl3501_get_from_wla(this, addr, &sig, sizeof(sig));
973 wl3501_free_tx_buffer(this, sig.data); 973 wl3501_free_tx_buffer(this, sig.data);
974 if (netif_queue_stopped(dev)) 974 if (netif_queue_stopped(dev))
975 netif_wake_queue(dev); 975 netif_wake_queue(dev);
976 } 976 }
977 977
978 static inline void wl3501_md_ind_interrupt(str 978 static inline void wl3501_md_ind_interrupt(struct net_device *dev,
979 str 979 struct wl3501_card *this, u16 addr)
980 { 980 {
981 struct wl3501_md_ind sig; 981 struct wl3501_md_ind sig;
982 struct sk_buff *skb; 982 struct sk_buff *skb;
983 u8 rssi, addr4[ETH_ALEN]; 983 u8 rssi, addr4[ETH_ALEN];
984 u16 pkt_len; 984 u16 pkt_len;
985 985
986 wl3501_get_from_wla(this, addr, &sig, 986 wl3501_get_from_wla(this, addr, &sig, sizeof(sig));
987 this->start_seg = sig.data; 987 this->start_seg = sig.data;
988 wl3501_get_from_wla(this, 988 wl3501_get_from_wla(this,
989 sig.data + offseto 989 sig.data + offsetof(struct wl3501_rx_hdr, rssi),
990 &rssi, sizeof(rssi 990 &rssi, sizeof(rssi));
991 this->rssi = rssi <= 63 ? (rssi * 100) 991 this->rssi = rssi <= 63 ? (rssi * 100) / 64 : 255;
992 992
993 wl3501_get_from_wla(this, 993 wl3501_get_from_wla(this,
994 sig.data + 994 sig.data +
995 offsetof(struc 995 offsetof(struct wl3501_rx_hdr, addr4),
996 &addr4, sizeof(add 996 &addr4, sizeof(addr4));
997 if (!(addr4[0] == 0xAA && addr4[1] == 997 if (!(addr4[0] == 0xAA && addr4[1] == 0xAA &&
998 addr4[2] == 0x03 && addr4[4] == 998 addr4[2] == 0x03 && addr4[4] == 0x00)) {
999 printk(KERN_INFO "Insupported 999 printk(KERN_INFO "Insupported packet type!\n");
1000 return; 1000 return;
1001 } 1001 }
1002 pkt_len = sig.size + 12 - 24 - 4 - 6; 1002 pkt_len = sig.size + 12 - 24 - 4 - 6;
1003 1003
1004 skb = dev_alloc_skb(pkt_len + 5); 1004 skb = dev_alloc_skb(pkt_len + 5);
1005 1005
1006 if (!skb) { 1006 if (!skb) {
1007 printk(KERN_WARNING "%s: Can' 1007 printk(KERN_WARNING "%s: Can't alloc a sk_buff of size %d.\n",
1008 dev->name, pkt_len); 1008 dev->name, pkt_len);
1009 this->stats.rx_dropped++; 1009 this->stats.rx_dropped++;
1010 } else { 1010 } else {
1011 skb->dev = dev; 1011 skb->dev = dev;
1012 skb_reserve(skb, 2); /* IP he 1012 skb_reserve(skb, 2); /* IP headers on 16 bytes boundaries */
1013 skb_copy_to_linear_data(skb, 1013 skb_copy_to_linear_data(skb, (unsigned char *)&sig.daddr, 12);
1014 wl3501_receive(this, skb->dat 1014 wl3501_receive(this, skb->data, pkt_len);
1015 skb_put(skb, pkt_len); 1015 skb_put(skb, pkt_len);
1016 skb->protocol = eth_type_tr 1016 skb->protocol = eth_type_trans(skb, dev);
1017 dev->last_rx = jiffies; 1017 dev->last_rx = jiffies;
1018 this->stats.rx_packets++; 1018 this->stats.rx_packets++;
1019 this->stats.rx_bytes += skb-> 1019 this->stats.rx_bytes += skb->len;
1020 netif_rx(skb); 1020 netif_rx(skb);
1021 } 1021 }
1022 } 1022 }
1023 1023
1024 static inline void wl3501_get_confirm_interru 1024 static inline void wl3501_get_confirm_interrupt(struct wl3501_card *this,
1025 1025 u16 addr, void *sig, int size)
1026 { 1026 {
1027 dprintk(3, "entry"); 1027 dprintk(3, "entry");
1028 wl3501_get_from_wla(this, addr, &this 1028 wl3501_get_from_wla(this, addr, &this->sig_get_confirm,
1029 sizeof(this->sig_ 1029 sizeof(this->sig_get_confirm));
1030 wake_up(&this->wait); 1030 wake_up(&this->wait);
1031 } 1031 }
1032 1032
1033 static inline void wl3501_start_confirm_inter 1033 static inline void wl3501_start_confirm_interrupt(struct net_device *dev,
1034 1034 struct wl3501_card *this,
1035 1035 u16 addr)
1036 { 1036 {
1037 struct wl3501_start_confirm sig; 1037 struct wl3501_start_confirm sig;
1038 1038
1039 dprintk(3, "entry"); 1039 dprintk(3, "entry");
1040 wl3501_get_from_wla(this, addr, &sig, 1040 wl3501_get_from_wla(this, addr, &sig, sizeof(sig));
1041 if (sig.status == WL3501_STATUS_SUCCE 1041 if (sig.status == WL3501_STATUS_SUCCESS)
1042 netif_wake_queue(dev); 1042 netif_wake_queue(dev);
1043 } 1043 }
1044 1044
1045 static inline void wl3501_assoc_confirm_inter 1045 static inline void wl3501_assoc_confirm_interrupt(struct net_device *dev,
1046 1046 u16 addr)
1047 { 1047 {
1048 struct wl3501_card *this = netdev_pri 1048 struct wl3501_card *this = netdev_priv(dev);
1049 struct wl3501_assoc_confirm sig; 1049 struct wl3501_assoc_confirm sig;
1050 1050
1051 dprintk(3, "entry"); 1051 dprintk(3, "entry");
1052 wl3501_get_from_wla(this, addr, &sig, 1052 wl3501_get_from_wla(this, addr, &sig, sizeof(sig));
1053 1053
1054 if (sig.status == WL3501_STATUS_SUCCE 1054 if (sig.status == WL3501_STATUS_SUCCESS)
1055 wl3501_online(dev); 1055 wl3501_online(dev);
1056 } 1056 }
1057 1057
1058 static inline void wl3501_auth_confirm_interr 1058 static inline void wl3501_auth_confirm_interrupt(struct wl3501_card *this,
1059 1059 u16 addr)
1060 { 1060 {
1061 struct wl3501_auth_confirm sig; 1061 struct wl3501_auth_confirm sig;
1062 1062
1063 dprintk(3, "entry"); 1063 dprintk(3, "entry");
1064 wl3501_get_from_wla(this, addr, &sig, 1064 wl3501_get_from_wla(this, addr, &sig, sizeof(sig));
1065 1065
1066 if (sig.status == WL3501_STATUS_SUCCE 1066 if (sig.status == WL3501_STATUS_SUCCESS)
1067 wl3501_mgmt_association(this) 1067 wl3501_mgmt_association(this);
1068 else 1068 else
1069 wl3501_mgmt_resync(this); 1069 wl3501_mgmt_resync(this);
1070 } 1070 }
1071 1071
1072 static inline void wl3501_rx_interrupt(struct 1072 static inline void wl3501_rx_interrupt(struct net_device *dev)
1073 { 1073 {
1074 int morepkts; 1074 int morepkts;
1075 u16 addr; 1075 u16 addr;
1076 u8 sig_id; 1076 u8 sig_id;
1077 struct wl3501_card *this = netdev_pri 1077 struct wl3501_card *this = netdev_priv(dev);
1078 1078
1079 dprintk(3, "entry"); 1079 dprintk(3, "entry");
1080 loop: 1080 loop:
1081 morepkts = 0; 1081 morepkts = 0;
1082 if (!wl3501_esbq_confirm(this)) 1082 if (!wl3501_esbq_confirm(this))
1083 goto free; 1083 goto free;
1084 wl3501_get_from_wla(this, this->esbq_ 1084 wl3501_get_from_wla(this, this->esbq_confirm, &addr, sizeof(addr));
1085 wl3501_get_from_wla(this, addr + 2, & 1085 wl3501_get_from_wla(this, addr + 2, &sig_id, sizeof(sig_id));
1086 1086
1087 switch (sig_id) { 1087 switch (sig_id) {
1088 case WL3501_SIG_DEAUTH_IND: 1088 case WL3501_SIG_DEAUTH_IND:
1089 case WL3501_SIG_DISASSOC_IND: 1089 case WL3501_SIG_DISASSOC_IND:
1090 case WL3501_SIG_ALARM: 1090 case WL3501_SIG_ALARM:
1091 wl3501_alarm_interrupt(dev, t 1091 wl3501_alarm_interrupt(dev, this);
1092 break; 1092 break;
1093 case WL3501_SIG_MD_CONFIRM: 1093 case WL3501_SIG_MD_CONFIRM:
1094 wl3501_md_confirm_interrupt(d 1094 wl3501_md_confirm_interrupt(dev, this, addr);
1095 break; 1095 break;
1096 case WL3501_SIG_MD_IND: 1096 case WL3501_SIG_MD_IND:
1097 wl3501_md_ind_interrupt(dev, 1097 wl3501_md_ind_interrupt(dev, this, addr);
1098 break; 1098 break;
1099 case WL3501_SIG_GET_CONFIRM: 1099 case WL3501_SIG_GET_CONFIRM:
1100 wl3501_get_confirm_interrupt( 1100 wl3501_get_confirm_interrupt(this, addr,
1101 1101 &this->sig_get_confirm,
1102 1102 sizeof(this->sig_get_confirm));
1103 break; 1103 break;
1104 case WL3501_SIG_PWR_MGMT_CONFIRM: 1104 case WL3501_SIG_PWR_MGMT_CONFIRM:
1105 wl3501_get_confirm_interrupt( 1105 wl3501_get_confirm_interrupt(this, addr,
1106 1106 &this->sig_pwr_mgmt_confirm,
1107 s 1107 sizeof(this->sig_pwr_mgmt_confirm));
1108 break; 1108 break;
1109 case WL3501_SIG_START_CONFIRM: 1109 case WL3501_SIG_START_CONFIRM:
1110 wl3501_start_confirm_interrup 1110 wl3501_start_confirm_interrupt(dev, this, addr);
1111 break; 1111 break;
1112 case WL3501_SIG_SCAN_CONFIRM: 1112 case WL3501_SIG_SCAN_CONFIRM:
1113 wl3501_mgmt_scan_confirm(this 1113 wl3501_mgmt_scan_confirm(this, addr);
1114 break; 1114 break;
1115 case WL3501_SIG_JOIN_CONFIRM: 1115 case WL3501_SIG_JOIN_CONFIRM:
1116 wl3501_mgmt_join_confirm(dev, 1116 wl3501_mgmt_join_confirm(dev, addr);
1117 break; 1117 break;
1118 case WL3501_SIG_ASSOC_CONFIRM: 1118 case WL3501_SIG_ASSOC_CONFIRM:
1119 wl3501_assoc_confirm_interrup 1119 wl3501_assoc_confirm_interrupt(dev, addr);
1120 break; 1120 break;
1121 case WL3501_SIG_AUTH_CONFIRM: 1121 case WL3501_SIG_AUTH_CONFIRM:
1122 wl3501_auth_confirm_interrupt 1122 wl3501_auth_confirm_interrupt(this, addr);
1123 break; 1123 break;
1124 case WL3501_SIG_RESYNC_CONFIRM: 1124 case WL3501_SIG_RESYNC_CONFIRM:
1125 wl3501_mgmt_resync(this); /* 1125 wl3501_mgmt_resync(this); /* FIXME: should be resync_confirm */
1126 break; 1126 break;
1127 } 1127 }
1128 wl3501_esbq_confirm_done(this); 1128 wl3501_esbq_confirm_done(this);
1129 morepkts = 1; 1129 morepkts = 1;
1130 /* free request if necessary */ 1130 /* free request if necessary */
1131 free: 1131 free:
1132 wl3501_esbq_req_free(this); 1132 wl3501_esbq_req_free(this);
1133 if (morepkts) 1133 if (morepkts)
1134 goto loop; 1134 goto loop;
1135 } 1135 }
1136 1136
1137 static inline void wl3501_ack_interrupt(struc 1137 static inline void wl3501_ack_interrupt(struct wl3501_card *this)
1138 { 1138 {
1139 wl3501_outb(WL3501_GCR_ECINT, this->b 1139 wl3501_outb(WL3501_GCR_ECINT, this->base_addr + WL3501_NIC_GCR);
1140 } 1140 }
1141 1141
1142 /** 1142 /**
1143 * wl3501_interrupt - Hardware interrupt from 1143 * wl3501_interrupt - Hardware interrupt from card.
1144 * @irq - Interrupt number 1144 * @irq - Interrupt number
1145 * @dev_id - net_device 1145 * @dev_id - net_device
1146 * 1146 *
1147 * We must acknowledge the interrupt as soon 1147 * We must acknowledge the interrupt as soon as possible, and block the
1148 * interrupt from the same card immediately t 1148 * interrupt from the same card immediately to prevent re-entry.
1149 * 1149 *
1150 * Before accessing the Control_Status_Block, 1150 * Before accessing the Control_Status_Block, we must lock SUTRO first.
1151 * On the other hand, to prevent SUTRO from m 1151 * On the other hand, to prevent SUTRO from malfunctioning, we must
1152 * unlock the SUTRO as soon as possible. 1152 * unlock the SUTRO as soon as possible.
1153 */ 1153 */
1154 static irqreturn_t wl3501_interrupt(int irq, 1154 static irqreturn_t wl3501_interrupt(int irq, void *dev_id)
1155 { 1155 {
1156 struct net_device *dev = dev_id; 1156 struct net_device *dev = dev_id;
1157 struct wl3501_card *this; 1157 struct wl3501_card *this;
1158 1158
1159 this = netdev_priv(dev); 1159 this = netdev_priv(dev);
1160 spin_lock(&this->lock); 1160 spin_lock(&this->lock);
1161 wl3501_ack_interrupt(this); 1161 wl3501_ack_interrupt(this);
1162 wl3501_block_interrupt(this); 1162 wl3501_block_interrupt(this);
1163 wl3501_rx_interrupt(dev); 1163 wl3501_rx_interrupt(dev);
1164 wl3501_unblock_interrupt(this); 1164 wl3501_unblock_interrupt(this);
1165 spin_unlock(&this->lock); 1165 spin_unlock(&this->lock);
1166 1166
1167 return IRQ_HANDLED; 1167 return IRQ_HANDLED;
1168 } 1168 }
1169 1169
1170 static int wl3501_reset_board(struct wl3501_c 1170 static int wl3501_reset_board(struct wl3501_card *this)
1171 { 1171 {
1172 u8 tmp = 0; 1172 u8 tmp = 0;
1173 int i, rc = 0; 1173 int i, rc = 0;
1174 1174
1175 /* Coreset */ 1175 /* Coreset */
1176 wl3501_outb_p(WL3501_GCR_CORESET, thi 1176 wl3501_outb_p(WL3501_GCR_CORESET, this->base_addr + WL3501_NIC_GCR);
1177 wl3501_outb_p(0, this->base_addr + WL 1177 wl3501_outb_p(0, this->base_addr + WL3501_NIC_GCR);
1178 wl3501_outb_p(WL3501_GCR_CORESET, thi 1178 wl3501_outb_p(WL3501_GCR_CORESET, this->base_addr + WL3501_NIC_GCR);
1179 1179
1180 /* Reset SRAM 0x480 to zero */ 1180 /* Reset SRAM 0x480 to zero */
1181 wl3501_set_to_wla(this, 0x480, &tmp, 1181 wl3501_set_to_wla(this, 0x480, &tmp, sizeof(tmp));
1182 1182
1183 /* Start up */ 1183 /* Start up */
1184 wl3501_outb_p(0, this->base_addr + WL 1184 wl3501_outb_p(0, this->base_addr + WL3501_NIC_GCR);
1185 1185
1186 WL3501_NOPLOOP(1024 * 50); 1186 WL3501_NOPLOOP(1024 * 50);
1187 1187
1188 wl3501_unblock_interrupt(this); /* ac 1188 wl3501_unblock_interrupt(this); /* acme: was commented */
1189 1189
1190 /* Polling Self_Test_Status */ 1190 /* Polling Self_Test_Status */
1191 for (i = 0; i < 10000; i++) { 1191 for (i = 0; i < 10000; i++) {
1192 wl3501_get_from_wla(this, 0x4 1192 wl3501_get_from_wla(this, 0x480, &tmp, sizeof(tmp));
1193 1193
1194 if (tmp == 'W') { 1194 if (tmp == 'W') {
1195 /* firmware complete 1195 /* firmware complete all test successfully */
1196 tmp = 'A'; 1196 tmp = 'A';
1197 wl3501_set_to_wla(thi 1197 wl3501_set_to_wla(this, 0x480, &tmp, sizeof(tmp));
1198 goto out; 1198 goto out;
1199 } 1199 }
1200 WL3501_NOPLOOP(10); 1200 WL3501_NOPLOOP(10);
1201 } 1201 }
1202 printk(KERN_WARNING "%s: failed to re 1202 printk(KERN_WARNING "%s: failed to reset the board!\n", __FUNCTION__);
1203 rc = -ENODEV; 1203 rc = -ENODEV;
1204 out: 1204 out:
1205 return rc; 1205 return rc;
1206 } 1206 }
1207 1207
1208 static int wl3501_init_firmware(struct wl3501 1208 static int wl3501_init_firmware(struct wl3501_card *this)
1209 { 1209 {
1210 u16 ptr, next; 1210 u16 ptr, next;
1211 int rc = wl3501_reset_board(this); 1211 int rc = wl3501_reset_board(this);
1212 1212
1213 if (rc) 1213 if (rc)
1214 goto fail; 1214 goto fail;
1215 this->card_name[0] = '\0'; 1215 this->card_name[0] = '\0';
1216 wl3501_get_from_wla(this, 0x1a00, 1216 wl3501_get_from_wla(this, 0x1a00,
1217 this->card_name, 1217 this->card_name, sizeof(this->card_name));
1218 this->card_name[sizeof(this->card_nam 1218 this->card_name[sizeof(this->card_name) - 1] = '\0';
1219 this->firmware_date[0] = '\0'; 1219 this->firmware_date[0] = '\0';
1220 wl3501_get_from_wla(this, 0x1a40, 1220 wl3501_get_from_wla(this, 0x1a40,
1221 this->firmware_da 1221 this->firmware_date, sizeof(this->firmware_date));
1222 this->firmware_date[sizeof(this->firm 1222 this->firmware_date[sizeof(this->firmware_date) - 1] = '\0';
1223 /* Switch to SRAM Page 0 */ 1223 /* Switch to SRAM Page 0 */
1224 wl3501_switch_page(this, WL3501_BSS_S 1224 wl3501_switch_page(this, WL3501_BSS_SPAGE0);
1225 /* Read parameter from card */ 1225 /* Read parameter from card */
1226 wl3501_get_from_wla(this, 0x482, &thi 1226 wl3501_get_from_wla(this, 0x482, &this->esbq_req_start, 2);
1227 wl3501_get_from_wla(this, 0x486, &thi 1227 wl3501_get_from_wla(this, 0x486, &this->esbq_req_end, 2);
1228 wl3501_get_from_wla(this, 0x488, &thi 1228 wl3501_get_from_wla(this, 0x488, &this->esbq_confirm_start, 2);
1229 wl3501_get_from_wla(this, 0x48c, &thi 1229 wl3501_get_from_wla(this, 0x48c, &this->esbq_confirm_end, 2);
1230 wl3501_get_from_wla(this, 0x48e, &thi 1230 wl3501_get_from_wla(this, 0x48e, &this->tx_buffer_head, 2);
1231 wl3501_get_from_wla(this, 0x492, &thi 1231 wl3501_get_from_wla(this, 0x492, &this->tx_buffer_size, 2);
1232 this->esbq_req_tail = this->esbq_ 1232 this->esbq_req_tail = this->esbq_req_head = this->esbq_req_start;
1233 this->esbq_req_end += this->esbq_ 1233 this->esbq_req_end += this->esbq_req_start;
1234 this->esbq_confirm = this->esbq_ 1234 this->esbq_confirm = this->esbq_confirm_start;
1235 this->esbq_confirm_end += this->esbq_ 1235 this->esbq_confirm_end += this->esbq_confirm_start;
1236 /* Initial Tx Buffer */ 1236 /* Initial Tx Buffer */
1237 this->tx_buffer_cnt = 1; 1237 this->tx_buffer_cnt = 1;
1238 ptr = this->tx_buffer_head; 1238 ptr = this->tx_buffer_head;
1239 next = ptr + WL3501_BLKSZ; 1239 next = ptr + WL3501_BLKSZ;
1240 while ((next - this->tx_buffer_head) 1240 while ((next - this->tx_buffer_head) < this->tx_buffer_size) {
1241 this->tx_buffer_cnt++; 1241 this->tx_buffer_cnt++;
1242 wl3501_set_to_wla(this, ptr, 1242 wl3501_set_to_wla(this, ptr, &next, sizeof(next));
1243 ptr = next; 1243 ptr = next;
1244 next = ptr + WL3501_BLKSZ; 1244 next = ptr + WL3501_BLKSZ;
1245 } 1245 }
1246 rc = 0; 1246 rc = 0;
1247 next = 0; 1247 next = 0;
1248 wl3501_set_to_wla(this, ptr, &next, s 1248 wl3501_set_to_wla(this, ptr, &next, sizeof(next));
1249 this->tx_buffer_tail = ptr; 1249 this->tx_buffer_tail = ptr;
1250 out: 1250 out:
1251 return rc; 1251 return rc;
1252 fail: 1252 fail:
1253 printk(KERN_WARNING "%s: failed!\n", 1253 printk(KERN_WARNING "%s: failed!\n", __FUNCTION__);
1254 goto out; 1254 goto out;
1255 } 1255 }
1256 1256
1257 static int wl3501_close(struct net_device *de 1257 static int wl3501_close(struct net_device *dev)
1258 { 1258 {
1259 struct wl3501_card *this = netdev_pri 1259 struct wl3501_card *this = netdev_priv(dev);
1260 int rc = -ENODEV; 1260 int rc = -ENODEV;
1261 unsigned long flags; 1261 unsigned long flags;
1262 struct pcmcia_device *link; 1262 struct pcmcia_device *link;
1263 link = this->p_dev; 1263 link = this->p_dev;
1264 1264
1265 spin_lock_irqsave(&this->lock, flags) 1265 spin_lock_irqsave(&this->lock, flags);
1266 link->open--; 1266 link->open--;
1267 1267
1268 /* Stop wl3501_hard_start_xmit() from 1268 /* Stop wl3501_hard_start_xmit() from now on */
1269 netif_stop_queue(dev); 1269 netif_stop_queue(dev);
1270 wl3501_ack_interrupt(this); 1270 wl3501_ack_interrupt(this);
1271 1271
1272 /* Mask interrupts from the SUTRO */ 1272 /* Mask interrupts from the SUTRO */
1273 wl3501_block_interrupt(this); 1273 wl3501_block_interrupt(this);
1274 1274
1275 rc = 0; 1275 rc = 0;
1276 printk(KERN_INFO "%s: WL3501 closed\n 1276 printk(KERN_INFO "%s: WL3501 closed\n", dev->name);
1277 spin_unlock_irqrestore(&this->lock, f 1277 spin_unlock_irqrestore(&this->lock, flags);
1278 return rc; 1278 return rc;
1279 } 1279 }
1280 1280
1281 /** 1281 /**
1282 * wl3501_reset - Reset the SUTRO. 1282 * wl3501_reset - Reset the SUTRO.
1283 * @dev - network device 1283 * @dev - network device
1284 * 1284 *
1285 * It is almost the same as wl3501_open(). In 1285 * It is almost the same as wl3501_open(). In fact, we may just wl3501_close()
1286 * and wl3501_open() again, but I wouldn't li 1286 * and wl3501_open() again, but I wouldn't like to free_irq() when the driver
1287 * is running. It seems to be dangerous. 1287 * is running. It seems to be dangerous.
1288 */ 1288 */
1289 static int wl3501_reset(struct net_device *de 1289 static int wl3501_reset(struct net_device *dev)
1290 { 1290 {
1291 struct wl3501_card *this = netdev_pri 1291 struct wl3501_card *this = netdev_priv(dev);
1292 int rc = -ENODEV; 1292 int rc = -ENODEV;
1293 1293
1294 wl3501_block_interrupt(this); 1294 wl3501_block_interrupt(this);
1295 1295
1296 if (wl3501_init_firmware(this)) { 1296 if (wl3501_init_firmware(this)) {
1297 printk(KERN_WARNING "%s: Can' 1297 printk(KERN_WARNING "%s: Can't initialize Firmware!\n",
1298 dev->name); 1298 dev->name);
1299 /* Free IRQ, and mark IRQ as 1299 /* Free IRQ, and mark IRQ as unused */
1300 free_irq(dev->irq, dev); 1300 free_irq(dev->irq, dev);
1301 goto out; 1301 goto out;
1302 } 1302 }
1303 1303
1304 /* 1304 /*
1305 * Queue has to be started only when 1305 * Queue has to be started only when the Card is Started
1306 */ 1306 */
1307 netif_stop_queue(dev); 1307 netif_stop_queue(dev);
1308 this->adhoc_times = 0; 1308 this->adhoc_times = 0;
1309 wl3501_ack_interrupt(this); 1309 wl3501_ack_interrupt(this);
1310 wl3501_unblock_interrupt(this); 1310 wl3501_unblock_interrupt(this);
1311 wl3501_mgmt_scan(this, 100); 1311 wl3501_mgmt_scan(this, 100);
1312 dprintk(1, "%s: device reset", dev->n 1312 dprintk(1, "%s: device reset", dev->name);
1313 rc = 0; 1313 rc = 0;
1314 out: 1314 out:
1315 return rc; 1315 return rc;
1316 } 1316 }
1317 1317
1318 static void wl3501_tx_timeout(struct net_devi 1318 static void wl3501_tx_timeout(struct net_device *dev)
1319 { 1319 {
1320 struct wl3501_card *this = netdev_pri 1320 struct wl3501_card *this = netdev_priv(dev);
1321 struct net_device_stats *stats = &thi 1321 struct net_device_stats *stats = &this->stats;
1322 unsigned long flags; 1322 unsigned long flags;
1323 int rc; 1323 int rc;
1324 1324
1325 stats->tx_errors++; 1325 stats->tx_errors++;
1326 spin_lock_irqsave(&this->lock, flags) 1326 spin_lock_irqsave(&this->lock, flags);
1327 rc = wl3501_reset(dev); 1327 rc = wl3501_reset(dev);
1328 spin_unlock_irqrestore(&this->lock, f 1328 spin_unlock_irqrestore(&this->lock, flags);
1329 if (rc) 1329 if (rc)
1330 printk(KERN_ERR "%s: Error %d 1330 printk(KERN_ERR "%s: Error %d resetting card on Tx timeout!\n",
1331 dev->name, rc); 1331 dev->name, rc);
1332 else { 1332 else {
1333 dev->trans_start = jiffies; 1333 dev->trans_start = jiffies;
1334 netif_wake_queue(dev); 1334 netif_wake_queue(dev);
1335 } 1335 }
1336 } 1336 }
1337 1337
1338 /* 1338 /*
1339 * Return : 0 - OK 1339 * Return : 0 - OK
1340 * 1 - Could not transmit (dev_queue 1340 * 1 - Could not transmit (dev_queue_xmit will queue it)
1341 * and try to sent it later 1341 * and try to sent it later
1342 */ 1342 */
1343 static int wl3501_hard_start_xmit(struct sk_b 1343 static int wl3501_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
1344 { 1344 {
1345 int enabled, rc; 1345 int enabled, rc;
1346 struct wl3501_card *this = netdev_pri 1346 struct wl3501_card *this = netdev_priv(dev);
1347 unsigned long flags; 1347 unsigned long flags;
1348 1348
1349 spin_lock_irqsave(&this->lock, flags) 1349 spin_lock_irqsave(&this->lock, flags);
1350 enabled = wl3501_block_interrupt(this 1350 enabled = wl3501_block_interrupt(this);
1351 dev->trans_start = jiffies; 1351 dev->trans_start = jiffies;
1352 rc = wl3501_send_pkt(this, skb->data, 1352 rc = wl3501_send_pkt(this, skb->data, skb->len);
1353 if (enabled) 1353 if (enabled)
1354 wl3501_unblock_interrupt(this 1354 wl3501_unblock_interrupt(this);
1355 if (rc) { 1355 if (rc) {
1356 ++this->stats.tx_dropped; 1356 ++this->stats.tx_dropped;
1357 netif_stop_queue(dev); 1357 netif_stop_queue(dev);
1358 } else { 1358 } else {
1359 ++this->stats.tx_packets; 1359 ++this->stats.tx_packets;
1360 this->stats.tx_bytes += skb-> 1360 this->stats.tx_bytes += skb->len;
1361 kfree_skb(skb); 1361 kfree_skb(skb);
1362 1362
1363 if (this->tx_buffer_cnt < 2) 1363 if (this->tx_buffer_cnt < 2)
1364 netif_stop_queue(dev) 1364 netif_stop_queue(dev);
1365 } 1365 }
1366 spin_unlock_irqrestore(&this->lock, f 1366 spin_unlock_irqrestore(&this->lock, flags);
1367 return rc; 1367 return rc;
1368 } 1368 }
1369 1369
1370 static int wl3501_open(struct net_device *dev 1370 static int wl3501_open(struct net_device *dev)
1371 { 1371 {
1372 int rc = -ENODEV; 1372 int rc = -ENODEV;
1373 struct wl3501_card *this = netdev_pri 1373 struct wl3501_card *this = netdev_priv(dev);
1374 unsigned long flags; 1374 unsigned long flags;
1375 struct pcmcia_device *link; 1375 struct pcmcia_device *link;
1376 link = this->p_dev; 1376 link = this->p_dev;
1377 1377
1378 spin_lock_irqsave(&this->lock, flags) 1378 spin_lock_irqsave(&this->lock, flags);
1379 if (!pcmcia_dev_present(link)) 1379 if (!pcmcia_dev_present(link))
1380 goto out; 1380 goto out;
1381 netif_device_attach(dev); 1381 netif_device_attach(dev);
1382 link->open++; 1382 link->open++;
1383 1383
1384 /* Initial WL3501 firmware */ 1384 /* Initial WL3501 firmware */
1385 dprintk(1, "%s: Initialize WL3501 fir 1385 dprintk(1, "%s: Initialize WL3501 firmware...", dev->name);
1386 if (wl3501_init_firmware(this)) 1386 if (wl3501_init_firmware(this))
1387 goto fail; 1387 goto fail;
1388 /* Initial device variables */ 1388 /* Initial device variables */
1389 this->adhoc_times = 0; 1389 this->adhoc_times = 0;
1390 /* Acknowledge Interrupt, for cleanin 1390 /* Acknowledge Interrupt, for cleaning last state */
1391 wl3501_ack_interrupt(this); 1391 wl3501_ack_interrupt(this);
1392 1392
1393 /* Enable interrupt from card after a 1393 /* Enable interrupt from card after all */
1394 wl3501_unblock_interrupt(this); 1394 wl3501_unblock_interrupt(this);
1395 wl3501_mgmt_scan(this, 100); 1395 wl3501_mgmt_scan(this, 100);
1396 rc = 0; 1396 rc = 0;
1397 dprintk(1, "%s: WL3501 opened", dev-> 1397 dprintk(1, "%s: WL3501 opened", dev->name);
1398 printk(KERN_INFO "%s: Card Name: %s\n 1398 printk(KERN_INFO "%s: Card Name: %s\n"
1399 "%s: Firmware Date: 1399 "%s: Firmware Date: %s\n",
1400 dev->name, this->car 1400 dev->name, this->card_name,
1401 dev->name, this->fir 1401 dev->name, this->firmware_date);
1402 out: 1402 out:
1403 spin_unlock_irqrestore(&this->lock, f 1403 spin_unlock_irqrestore(&this->lock, flags);
1404 return rc; 1404 return rc;
1405 fail: 1405 fail:
1406 printk(KERN_WARNING "%s: Can't initia 1406 printk(KERN_WARNING "%s: Can't initialize firmware!\n", dev->name);
1407 goto out; 1407 goto out;
1408 } 1408 }
1409 1409
1410 static struct net_device_stats *wl3501_get_st 1410 static struct net_device_stats *wl3501_get_stats(struct net_device *dev)
1411 { 1411 {
1412 struct wl3501_card *this = netdev_pri 1412 struct wl3501_card *this = netdev_priv(dev);
1413 1413
1414 return &this->stats; 1414 return &this->stats;
1415 } 1415 }
1416 1416
1417 static struct iw_statistics *wl3501_get_wirel 1417 static struct iw_statistics *wl3501_get_wireless_stats(struct net_device *dev)
1418 { 1418 {
1419 struct wl3501_card *this = netdev_pri 1419 struct wl3501_card *this = netdev_priv(dev);
1420 struct iw_statistics *wstats = &this- 1420 struct iw_statistics *wstats = &this->wstats;
1421 u32 value; /* size checked: it is u32 1421 u32 value; /* size checked: it is u32 */
1422 1422
1423 memset(wstats, 0, sizeof(*wstats)); 1423 memset(wstats, 0, sizeof(*wstats));
1424 wstats->status = netif_running(dev); 1424 wstats->status = netif_running(dev);
1425 if (!wl3501_get_mib_value(this, WL350 1425 if (!wl3501_get_mib_value(this, WL3501_MIB_ATTR_WEP_ICV_ERROR_COUNT,
1426 &value, siz 1426 &value, sizeof(value)))
1427 wstats->discard.code += value 1427 wstats->discard.code += value;
1428 if (!wl3501_get_mib_value(this, WL350 1428 if (!wl3501_get_mib_value(this, WL3501_MIB_ATTR_WEP_UNDECRYPTABLE_COUNT,
1429 &value, siz 1429 &value, sizeof(value)))
1430 wstats->discard.code += value 1430 wstats->discard.code += value;
1431 if (!wl3501_get_mib_value(this, WL350 1431 if (!wl3501_get_mib_value(this, WL3501_MIB_ATTR_WEP_EXCLUDED_COUNT,
1432 &value, siz 1432 &value, sizeof(value)))
1433 wstats->discard.code += value 1433 wstats->discard.code += value;
1434 if (!wl3501_get_mib_value(this, WL350 1434 if (!wl3501_get_mib_value(this, WL3501_MIB_ATTR_RETRY_COUNT,
1435 &value, siz 1435 &value, sizeof(value)))
1436 wstats->discard.retries = val 1436 wstats->discard.retries = value;
1437 if (!wl3501_get_mib_value(this, WL350 1437 if (!wl3501_get_mib_value(this, WL3501_MIB_ATTR_FAILED_COUNT,
1438 &value, siz 1438 &value, sizeof(value)))
1439 wstats->discard.misc += value 1439 wstats->discard.misc += value;
1440 if (!wl3501_get_mib_value(this, WL350 1440 if (!wl3501_get_mib_value(this, WL3501_MIB_ATTR_RTS_FAILURE_COUNT,
1441 &value, siz 1441 &value, sizeof(value)))
1442 wstats->discard.misc += value 1442 wstats->discard.misc += value;
1443 if (!wl3501_get_mib_value(this, WL350 1443 if (!wl3501_get_mib_value(this, WL3501_MIB_ATTR_ACK_FAILURE_COUNT,
1444 &value, siz 1444 &value, sizeof(value)))
1445 wstats->discard.misc += value 1445 wstats->discard.misc += value;
1446 if (!wl3501_get_mib_value(this, WL350 1446 if (!wl3501_get_mib_value(this, WL3501_MIB_ATTR_FRAME_DUPLICATE_COUNT,
1447 &value, siz 1447 &value, sizeof(value)))
1448 wstats->discard.misc += value 1448 wstats->discard.misc += value;
1449 return wstats; 1449 return wstats;
1450 } 1450 }
1451 1451
1452 static void wl3501_get_drvinfo(struct net_dev 1452 static void wl3501_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
1453 { 1453 {
1454 strlcpy(info->driver, wl3501_dev_info 1454 strlcpy(info->driver, wl3501_dev_info, sizeof(info->driver));
1455 } 1455 }
1456 1456
1457 static const struct ethtool_ops ops = { 1457 static const struct ethtool_ops ops = {
1458 .get_drvinfo = wl3501_get_drvinfo 1458 .get_drvinfo = wl3501_get_drvinfo
1459 }; 1459 };
1460 1460
1461 /** 1461 /**
1462 * wl3501_detach - deletes a driver "instance 1462 * wl3501_detach - deletes a driver "instance"
1463 * @link - FILL_IN 1463 * @link - FILL_IN
1464 * 1464 *
1465 * This deletes a driver "instance". The devi 1465 * This deletes a driver "instance". The device is de-registered with Card
1466 * Services. If it has been released, all loc 1466 * Services. If it has been released, all local data structures are freed.
1467 * Otherwise, the structures will be freed wh 1467 * Otherwise, the structures will be freed when the device is released.
1468 */ 1468 */
1469 static void wl3501_detach(struct pcmcia_devic 1469 static void wl3501_detach(struct pcmcia_device *link)
1470 { 1470 {
1471 struct net_device *dev = link->priv; 1471 struct net_device *dev = link->priv;
1472 1472
1473 /* If the device is currently configu 1473 /* If the device is currently configured and active, we won't actually
1474 * delete it yet. Instead, it is mar 1474 * delete it yet. Instead, it is marked so that when the release()
1475 * function is called, that will trig 1475 * function is called, that will trigger a proper detach(). */
1476 1476
1477 while (link->open > 0) 1477 while (link->open > 0)
1478 wl3501_close(dev); 1478 wl3501_close(dev);
1479 1479
1480 netif_device_detach(dev); 1480 netif_device_detach(dev);
1481 wl3501_release(link); 1481 wl3501_release(link);
1482 1482
1483 if (link->priv) 1483 if (link->priv)
1484 free_netdev(link->priv); 1484 free_netdev(link->priv);
1485 1485
1486 return; 1486 return;
1487 } 1487 }
1488 1488
1489 static int wl3501_get_name(struct net_device 1489 static int wl3501_get_name(struct net_device *dev, struct iw_request_info *info,
1490 union iwreq_data * 1490 union iwreq_data *wrqu, char *extra)
1491 { 1491 {
1492 strlcpy(wrqu->name, "IEEE 802.11-DS", 1492 strlcpy(wrqu->name, "IEEE 802.11-DS", sizeof(wrqu->name));
1493 return 0; 1493 return 0;
1494 } 1494 }
1495 1495
1496 static int wl3501_set_freq(struct net_device 1496 static int wl3501_set_freq(struct net_device *dev, struct iw_request_info *info,
1497 union iwreq_data * 1497 union iwreq_data *wrqu, char *extra)
1498 { 1498 {
1499 struct wl3501_card *this = netdev_pri 1499 struct wl3501_card *this = netdev_priv(dev);
1500 int channel = wrqu->freq.m; 1500 int channel = wrqu->freq.m;
1501 int rc = -EINVAL; 1501 int rc = -EINVAL;
1502 1502
1503 if (iw_valid_channel(this->reg_domain 1503 if (iw_valid_channel(this->reg_domain, channel)) {
1504 this->chan = channel; 1504 this->chan = channel;
1505 rc = wl3501_reset(dev); 1505 rc = wl3501_reset(dev);
1506 } 1506 }
1507 return rc; 1507 return rc;
1508 } 1508 }
1509 1509
1510 static int wl3501_get_freq(struct net_device 1510 static int wl3501_get_freq(struct net_device *dev, struct iw_request_info *info,
1511 union iwreq_data * 1511 union iwreq_data *wrqu, char *extra)
1512 { 1512 {
1513 struct wl3501_card *this = netdev_pri 1513 struct wl3501_card *this = netdev_priv(dev);
1514 1514
1515 wrqu->freq.m = wl3501_chan2freq[this- 1515 wrqu->freq.m = wl3501_chan2freq[this->chan - 1] * 100000;
1516 wrqu->freq.e = 1; 1516 wrqu->freq.e = 1;
1517 return 0; 1517 return 0;
1518 } 1518 }
1519 1519
1520 static int wl3501_set_mode(struct net_device 1520 static int wl3501_set_mode(struct net_device *dev, struct iw_request_info *info,
1521 union iwreq_data * 1521 union iwreq_data *wrqu, char *extra)
1522 { 1522 {
1523 int rc = -EINVAL; 1523 int rc = -EINVAL;
1524 1524
1525 if (wrqu->mode == IW_MODE_INFRA || 1525 if (wrqu->mode == IW_MODE_INFRA ||
1526 wrqu->mode == IW_MODE_ADHOC || 1526 wrqu->mode == IW_MODE_ADHOC ||
1527 wrqu->mode == IW_MODE_AUTO) { 1527 wrqu->mode == IW_MODE_AUTO) {
1528 struct wl3501_card *this = ne 1528 struct wl3501_card *this = netdev_priv(dev);
1529 1529
1530 this->net_type = wrqu->mode; 1530 this->net_type = wrqu->mode;
1531 rc = wl3501_reset(dev); 1531 rc = wl3501_reset(dev);
1532 } 1532 }
1533 return rc; 1533 return rc;
1534 } 1534 }
1535 1535
1536 static int wl3501_get_mode(struct net_device 1536 static int wl3501_get_mode(struct net_device *dev, struct iw_request_info *info,
1537 union iwreq_data * 1537 union iwreq_data *wrqu, char *extra)
1538 { 1538 {
1539 struct wl3501_card *this = netdev_pri 1539 struct wl3501_card *this = netdev_priv(dev);
1540 1540
1541 wrqu->mode = this->net_type; 1541 wrqu->mode = this->net_type;
1542 return 0; 1542 return 0;
1543 } 1543 }
1544 1544
1545 static int wl3501_get_sens(struct net_device 1545 static int wl3501_get_sens(struct net_device *dev, struct iw_request_info *info,
1546 union iwreq_data * 1546 union iwreq_data *wrqu, char *extra)
1547 { 1547 {
1548 struct wl3501_card *this = netdev_pri 1548 struct wl3501_card *this = netdev_priv(dev);
1549 1549
1550 wrqu->sens.value = this->rssi; 1550 wrqu->sens.value = this->rssi;
1551 wrqu->sens.disabled = !wrqu->sens.val 1551 wrqu->sens.disabled = !wrqu->sens.value;
1552 wrqu->sens.fixed = 1; 1552 wrqu->sens.fixed = 1;
1553 return 0; 1553 return 0;
1554 } 1554 }
1555 1555
1556 static int wl3501_get_range(struct net_device 1556 static int wl3501_get_range(struct net_device *dev,
1557 struct iw_request 1557 struct iw_request_info *info,
1558 union iwreq_data 1558 union iwreq_data *wrqu, char *extra)
1559 { 1559 {
1560 struct iw_range *range = (struct iw_r 1560 struct iw_range *range = (struct iw_range *)extra;
1561 1561
1562 /* Set the length (very important for 1562 /* Set the length (very important for backward compatibility) */
1563 wrqu->data.length = sizeof(*range); 1563 wrqu->data.length = sizeof(*range);
1564 1564
1565 /* Set all the info we don't care or 1565 /* Set all the info we don't care or don't know about to zero */
1566 memset(range, 0, sizeof(*range)); 1566 memset(range, 0, sizeof(*range));
1567 1567
1568 /* Set the Wireless Extension version 1568 /* Set the Wireless Extension versions */
1569 range->we_version_compiled = WIR 1569 range->we_version_compiled = WIRELESS_EXT;
1570 range->we_version_source = 1; 1570 range->we_version_source = 1;
1571 range->throughput = 2 * 1571 range->throughput = 2 * 1000 * 1000; /* ~2 Mb/s */
1572 /* FIXME: study the code to fill in m 1572 /* FIXME: study the code to fill in more fields... */
1573 return 0; 1573 return 0;
1574 } 1574 }
1575 1575
1576 static int wl3501_set_wap(struct net_device * 1576 static int wl3501_set_wap(struct net_device *dev, struct iw_request_info *info,
1577 union iwreq_data *w 1577 union iwreq_data *wrqu, char *extra)
1578 { 1578 {
1579 struct wl3501_card *this = netdev_pri 1579 struct wl3501_card *this = netdev_priv(dev);
1580 static const u8 bcast[ETH_ALEN] = { 2 1580 static const u8 bcast[ETH_ALEN] = { 255, 255, 255, 255, 255, 255 };
1581 int rc = -EINVAL; 1581 int rc = -EINVAL;
1582 1582
1583 /* FIXME: we support other ARPHRDs... 1583 /* FIXME: we support other ARPHRDs...*/
1584 if (wrqu->ap_addr.sa_family != ARPHRD 1584 if (wrqu->ap_addr.sa_family != ARPHRD_ETHER)
1585 goto out; 1585 goto out;
1586 if (!memcmp(bcast, wrqu->ap_addr.sa_d 1586 if (!memcmp(bcast, wrqu->ap_addr.sa_data, ETH_ALEN)) {
1587 /* FIXME: rescan? */ 1587 /* FIXME: rescan? */
1588 } else 1588 } else
1589 memcpy(this->bssid, wrqu->ap_ 1589 memcpy(this->bssid, wrqu->ap_addr.sa_data, ETH_ALEN);
1590 /* FIXME: rescan? deassoc & s 1590 /* FIXME: rescan? deassoc & scan? */
1591 rc = 0; 1591 rc = 0;
1592 out: 1592 out:
1593 return rc; 1593 return rc;
1594 } 1594 }
1595 1595
1596 static int wl3501_get_wap(struct net_device * 1596 static int wl3501_get_wap(struct net_device *dev, struct iw_request_info *info,
1597 union iwreq_data *w 1597 union iwreq_data *wrqu, char *extra)
1598 { 1598 {
1599 struct wl3501_card *this = netdev_pri 1599 struct wl3501_card *this = netdev_priv(dev);
1600 1600
1601 wrqu->ap_addr.sa_family = ARPHRD_ETHE 1601 wrqu->ap_addr.sa_family = ARPHRD_ETHER;
1602 memcpy(wrqu->ap_addr.sa_data, this->b 1602 memcpy(wrqu->ap_addr.sa_data, this->bssid, ETH_ALEN);
1603 return 0; 1603 return 0;
1604 } 1604 }
1605 1605
1606 static int wl3501_set_scan(struct net_device 1606 static int wl3501_set_scan(struct net_device *dev, struct iw_request_info *info,
1607 union iwreq_data * 1607 union iwreq_data *wrqu, char *extra)
1608 { 1608 {
1609 /* 1609 /*
1610 * FIXME: trigger scanning with a res 1610 * FIXME: trigger scanning with a reset, yes, I'm lazy
1611 */ 1611 */
1612 return wl3501_reset(dev); 1612 return wl3501_reset(dev);
1613 } 1613 }
1614 1614
1615 static int wl3501_get_scan(struct net_device 1615 static int wl3501_get_scan(struct net_device *dev, struct iw_request_info *info,
1616 union iwreq_data * 1616 union iwreq_data *wrqu, char *extra)
1617 { 1617 {
1618 struct wl3501_card *this = netdev_pri 1618 struct wl3501_card *this = netdev_priv(dev);
1619 int i; 1619 int i;
1620 char *current_ev = extra; 1620 char *current_ev = extra;
1621 struct iw_event iwe; 1621 struct iw_event iwe;
1622 1622
1623 for (i = 0; i < this->bss_cnt; ++i) { 1623 for (i = 0; i < this->bss_cnt; ++i) {
1624 iwe.cmd = SIO 1624 iwe.cmd = SIOCGIWAP;
1625 iwe.u.ap_addr.sa_family = ARP 1625 iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
1626 memcpy(iwe.u.ap_addr.sa_data, 1626 memcpy(iwe.u.ap_addr.sa_data, this->bss_set[i].bssid, ETH_ALEN);
1627 current_ev = iwe_stream_add_e 1627 current_ev = iwe_stream_add_event(current_ev,
1628 1628 extra + IW_SCAN_MAX_DATA,
1629 1629 &iwe, IW_EV_ADDR_LEN);
1630 iwe.cmd = SIOCGIWES 1630 iwe.cmd = SIOCGIWESSID;
1631 iwe.u.data.flags = 1; 1631 iwe.u.data.flags = 1;
1632 iwe.u.data.length = this->bss 1632 iwe.u.data.length = this->bss_set[i].ssid.el.len;
1633 current_ev = iwe_stream_add_p 1633 current_ev = iwe_stream_add_point(current_ev,
1634 1634 extra + IW_SCAN_MAX_DATA,
1635 1635 &iwe,
1636 1636 this->bss_set[i].ssid.essid);
1637 iwe.cmd = SIOCGIWMODE; 1637 iwe.cmd = SIOCGIWMODE;
1638 iwe.u.mode = this->bss_set[i] 1638 iwe.u.mode = this->bss_set[i].bss_type;
1639 current_ev = iwe_stream_add_e 1639 current_ev = iwe_stream_add_event(current_ev,
1640 1640 extra + IW_SCAN_MAX_DATA,
1641 1641 &iwe, IW_EV_UINT_LEN);
1642 iwe.cmd = SIOCGIWFREQ; 1642 iwe.cmd = SIOCGIWFREQ;
1643 iwe.u.freq.m = this->bss_set[ 1643 iwe.u.freq.m = this->bss_set[i].ds_pset.chan;
1644 iwe.u.freq.e = 0; 1644 iwe.u.freq.e = 0;
1645 current_ev = iwe_stream_add_e 1645 current_ev = iwe_stream_add_event(current_ev,
1646 1646 extra + IW_SCAN_MAX_DATA,
1647 1647 &iwe, IW_EV_FREQ_LEN);
1648 iwe.cmd = SIOCGIWENCODE; 1648 iwe.cmd = SIOCGIWENCODE;
1649 if (this->bss_set[i].cap_info 1649 if (this->bss_set[i].cap_info & WL3501_MGMT_CAPABILITY_PRIVACY)
1650 iwe.u.data.flags = IW 1650 iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY;
1651 else 1651 else
1652 iwe.u.data.flags = IW 1652 iwe.u.data.flags = IW_ENCODE_DISABLED;
1653 iwe.u.data.length = 0; 1653 iwe.u.data.length = 0;
1654 current_ev = iwe_stream_add_p 1654 current_ev = iwe_stream_add_point(current_ev,
1655 1655 extra + IW_SCAN_MAX_DATA,
1656 1656 &iwe, NULL);
1657 } 1657 }
1658 /* Length of data */ 1658 /* Length of data */
1659 wrqu->data.length = (current_ev - ext 1659 wrqu->data.length = (current_ev - extra);
1660 wrqu->data.flags = 0; /* FIXME: set p 1660 wrqu->data.flags = 0; /* FIXME: set properly these flags */
1661 return 0; 1661 return 0;
1662 } 1662 }
1663 1663
1664 static int wl3501_set_essid(struct net_device 1664 static int wl3501_set_essid(struct net_device *dev,
1665 struct iw_request 1665 struct iw_request_info *info,
1666 union iwreq_data 1666 union iwreq_data *wrqu, char *extra)
1667 { 1667 {
1668 struct wl3501_card *this = netdev_pri 1668 struct wl3501_card *this = netdev_priv(dev);
1669 1669
1670 if (wrqu->data.flags) { 1670 if (wrqu->data.flags) {
1671 iw_set_mgmt_info_element(IW_M 1671 iw_set_mgmt_info_element(IW_MGMT_INFO_ELEMENT_SSID,
1672 &thi 1672 &this->essid.el,
1673 extr 1673 extra, wrqu->data.length);
1674 } else { /* We accept any ESSID */ 1674 } else { /* We accept any ESSID */
1675 iw_set_mgmt_info_element(IW_M 1675 iw_set_mgmt_info_element(IW_MGMT_INFO_ELEMENT_SSID,
1676 &thi 1676 &this->essid.el, "ANY", 3);
1677 } 1677 }
1678 return wl3501_reset(dev); 1678 return wl3501_reset(dev);
1679 } 1679 }
1680 1680
1681 static int wl3501_get_essid(struct net_device 1681 static int wl3501_get_essid(struct net_device *dev,
1682 struct iw_request 1682 struct iw_request_info *info,
1683 union iwreq_data 1683 union iwreq_data *wrqu, char *extra)
1684 { 1684 {
1685 struct wl3501_card *this = netdev_pri 1685 struct wl3501_card *this = netdev_priv(dev);
1686 unsigned long flags; 1686 unsigned long flags;
1687 1687
1688 spin_lock_irqsave(&this->lock, flags) 1688 spin_lock_irqsave(&this->lock, flags);
1689 wrqu->essid.flags = 1; 1689 wrqu->essid.flags = 1;
1690 wrqu->essid.length = this->essid.el.l 1690 wrqu->essid.length = this->essid.el.len;
1691 memcpy(extra, this->essid.essid, this 1691 memcpy(extra, this->essid.essid, this->essid.el.len);
1692 spin_unlock_irqrestore(&this->lock, f 1692 spin_unlock_irqrestore(&this->lock, flags);
1693 return 0; 1693 return 0;
1694 } 1694 }
1695 1695
1696 static int wl3501_set_nick(struct net_device 1696 static int wl3501_set_nick(struct net_device *dev, struct iw_request_info *info,
1697 union iwreq_data * 1697 union iwreq_data *wrqu, char *extra)
1698 { 1698 {
1699 struct wl3501_card *this = netdev_pri 1699 struct wl3501_card *this = netdev_priv(dev);
1700 1700
1701 if (wrqu->data.length > sizeof(this-> 1701 if (wrqu->data.length > sizeof(this->nick))
1702 return -E2BIG; 1702 return -E2BIG;
1703 strlcpy(this->nick, extra, wrqu->data 1703 strlcpy(this->nick, extra, wrqu->data.length);
1704 return 0; 1704 return 0;
1705 } 1705 }
1706 1706
1707 static int wl3501_get_nick(struct net_device 1707 static int wl3501_get_nick(struct net_device *dev, struct iw_request_info *info,
1708 union iwreq_data * 1708 union iwreq_data *wrqu, char *extra)
1709 { 1709 {
1710 struct wl3501_card *this = netdev_pri 1710 struct wl3501_card *this = netdev_priv(dev);
1711 1711
1712 strlcpy(extra, this->nick, 32); 1712 strlcpy(extra, this->nick, 32);
1713 wrqu->data.length = strlen(extra); 1713 wrqu->data.length = strlen(extra);
1714 return 0; 1714 return 0;
1715 } 1715 }
1716 1716
1717 static int wl3501_get_rate(struct net_device 1717 static int wl3501_get_rate(struct net_device *dev, struct iw_request_info *info,
1718 union iwreq_data * 1718 union iwreq_data *wrqu, char *extra)
1719 { 1719 {
1720 /* 1720 /*
1721 * FIXME: have to see from where to g 1721 * FIXME: have to see from where to get this info, perhaps this card
1722 * works at 1 Mbit/s too... for now l 1722 * works at 1 Mbit/s too... for now leave at 2 Mbit/s that is the most
1723 * common with the Planet Access Poin 1723 * common with the Planet Access Points. -acme
1724 */ 1724 */
1725 wrqu->bitrate.value = 2000000; 1725 wrqu->bitrate.value = 2000000;
1726 wrqu->bitrate.fixed = 1; 1726 wrqu->bitrate.fixed = 1;
1727 return 0; 1727 return 0;
1728 } 1728 }
1729 1729
1730 static int wl3501_get_rts_threshold(struct ne 1730 static int wl3501_get_rts_threshold(struct net_device *dev,
1731 struct iw 1731 struct iw_request_info *info,
1732 union iwr 1732 union iwreq_data *wrqu, char *extra)
1733 { 1733 {
1734 u16 threshold; /* size checked: it is 1734 u16 threshold; /* size checked: it is u16 */
1735 struct wl3501_card *this = netdev_pri 1735 struct wl3501_card *this = netdev_priv(dev);
1736 int rc = wl3501_get_mib_value(this, W 1736 int rc = wl3501_get_mib_value(this, WL3501_MIB_ATTR_RTS_THRESHOLD,
1737 &thresh 1737 &threshold, sizeof(threshold));
1738 if (!rc) { 1738 if (!rc) {
1739 wrqu->rts.value = threshold; 1739 wrqu->rts.value = threshold;
1740 wrqu->rts.disabled = threshol 1740 wrqu->rts.disabled = threshold >= 2347;
1741 wrqu->rts.fixed = 1; 1741 wrqu->rts.fixed = 1;
1742 } 1742 }
1743 return rc; 1743 return rc;
1744 } 1744 }
1745 1745
1746 static int wl3501_get_frag_threshold(struct n 1746 static int wl3501_get_frag_threshold(struct net_device *dev,
1747 struct i 1747 struct iw_request_info *info,
1748 union iw 1748 union iwreq_data *wrqu, char *extra)
1749 { 1749 {
1750 u16 threshold; /* size checked: it is 1750 u16 threshold; /* size checked: it is u16 */
1751 struct wl3501_card *this = netdev_pri 1751 struct wl3501_card *this = netdev_priv(dev);
1752 int rc = wl3501_get_mib_value(this, W 1752 int rc = wl3501_get_mib_value(this, WL3501_MIB_ATTR_FRAG_THRESHOLD,
1753 &thresh 1753 &threshold, sizeof(threshold));
1754 if (!rc) { 1754 if (!rc) {
1755 wrqu->frag.value = threshold; 1755 wrqu->frag.value = threshold;
1756 wrqu->frag.disabled = thresho 1756 wrqu->frag.disabled = threshold >= 2346;
1757 wrqu->frag.fixed = 1; 1757 wrqu->frag.fixed = 1;
1758 } 1758 }
1759 return rc; 1759 return rc;
1760 } 1760 }
1761 1761
1762 static int wl3501_get_txpow(struct net_device 1762 static int wl3501_get_txpow(struct net_device *dev,
1763 struct iw_request 1763 struct iw_request_info *info,
1764 union iwreq_data 1764 union iwreq_data *wrqu, char *extra)
1765 { 1765 {
1766 u16 txpow; 1766 u16 txpow;
1767 struct wl3501_card *this = netdev_pri 1767 struct wl3501_card *this = netdev_priv(dev);
1768 int rc = wl3501_get_mib_value(this, 1768 int rc = wl3501_get_mib_value(this,
1769 WL3501_ 1769 WL3501_MIB_ATTR_CURRENT_TX_PWR_LEVEL,
1770 &txpow, 1770 &txpow, sizeof(txpow));
1771 if (!rc) { 1771 if (!rc) {
1772 wrqu->txpower.value = txpow; 1772 wrqu->txpower.value = txpow;
1773 wrqu->txpower.disabled = 0; 1773 wrqu->txpower.disabled = 0;
1774 /* 1774 /*
1775 * From the MIB values I thin 1775 * From the MIB values I think this can be configurable,
1776 * as it lists several tx pow 1776 * as it lists several tx power levels -acme
1777 */ 1777 */
1778 wrqu->txpower.fixed = 0; 1778 wrqu->txpower.fixed = 0;
1779 wrqu->txpower.flags = IW_TXPO 1779 wrqu->txpower.flags = IW_TXPOW_MWATT;
1780 } 1780 }
1781 return rc; 1781 return rc;
1782 } 1782 }
1783 1783
1784 static int wl3501_get_retry(struct net_device 1784 static int wl3501_get_retry(struct net_device *dev,
1785 struct iw_request 1785 struct iw_request_info *info,
1786 union iwreq_data 1786 union iwreq_data *wrqu, char *extra)
1787 { 1787 {
1788 u8 retry; /* size checked: it is u8 * 1788 u8 retry; /* size checked: it is u8 */
1789 struct wl3501_card *this = netdev_pri 1789 struct wl3501_card *this = netdev_priv(dev);
1790 int rc = wl3501_get_mib_value(this, 1790 int rc = wl3501_get_mib_value(this,
1791 WL3501_ 1791 WL3501_MIB_ATTR_LONG_RETRY_LIMIT,
1792 &retry, 1792 &retry, sizeof(retry));
1793 if (rc) 1793 if (rc)
1794 goto out; 1794 goto out;
1795 if (wrqu->retry.flags & IW_RETRY_LONG 1795 if (wrqu->retry.flags & IW_RETRY_LONG) {
1796 wrqu->retry.flags = IW_RETRY_ 1796 wrqu->retry.flags = IW_RETRY_LIMIT | IW_RETRY_LONG;
1797 goto set_value; 1797 goto set_value;
1798 } 1798 }
1799 rc = wl3501_get_mib_value(this, WL350 1799 rc = wl3501_get_mib_value(this, WL3501_MIB_ATTR_SHORT_RETRY_LIMIT,
1800 &retry, siz 1800 &retry, sizeof(retry));
1801 if (rc) 1801 if (rc)
1802 goto out; 1802 goto out;
1803 wrqu->retry.flags = IW_RETRY_LIMIT | 1803 wrqu->retry.flags = IW_RETRY_LIMIT | IW_RETRY_SHORT;
1804 set_value: 1804 set_value:
1805 wrqu->retry.value = retry; 1805 wrqu->retry.value = retry;
1806 wrqu->retry.disabled = 0; 1806 wrqu->retry.disabled = 0;
1807 out: 1807 out:
1808 return rc; 1808 return rc;
1809 } 1809 }
1810 1810
1811 static int wl3501_get_encode(struct net_devic 1811 static int wl3501_get_encode(struct net_device *dev,
1812 struct iw_reques 1812 struct iw_request_info *info,
1813 union iwreq_data 1813 union iwreq_data *wrqu, char *extra)
1814 { 1814 {
1815 u8 implemented, restricted, keys[100] 1815 u8 implemented, restricted, keys[100], len_keys, tocopy;
1816 struct wl3501_card *this = netdev_pri 1816 struct wl3501_card *this = netdev_priv(dev);
1817 int rc = wl3501_get_mib_value(this, 1817 int rc = wl3501_get_mib_value(this,
1818 WL3501_ 1818 WL3501_MIB_ATTR_PRIV_OPT_IMPLEMENTED,
1819 &implem 1819 &implemented, sizeof(implemented));
1820 if (rc) 1820 if (rc)
1821 goto out; 1821 goto out;
1822 if (!implemented) { 1822 if (!implemented) {
1823 wrqu->encoding.flags = IW_ENC 1823 wrqu->encoding.flags = IW_ENCODE_DISABLED;
1824 goto out; 1824 goto out;
1825 } 1825 }
1826 rc = wl3501_get_mib_value(this, WL350 1826 rc = wl3501_get_mib_value(this, WL3501_MIB_ATTR_EXCLUDE_UNENCRYPTED,
1827 &restricted 1827 &restricted, sizeof(restricted));
1828 if (rc) 1828 if (rc)
1829 goto out; 1829 goto out;
1830 wrqu->encoding.flags = restricted ? I 1830 wrqu->encoding.flags = restricted ? IW_ENCODE_RESTRICTED :
1831 I 1831 IW_ENCODE_OPEN;
1832 rc = wl3501_get_mib_value(this, WL350 1832 rc = wl3501_get_mib_value(this, WL3501_MIB_ATTR_WEP_KEY_MAPPINGS_LEN,
1833 &len_keys, 1833 &len_keys, sizeof(len_keys));
1834 if (rc) 1834 if (rc)
1835 goto out; 1835 goto out;
1836 rc = wl3501_get_mib_value(this, WL350 1836 rc = wl3501_get_mib_value(this, WL3501_MIB_ATTR_WEP_KEY_MAPPINGS,
1837 keys, len_k 1837 keys, len_keys);
1838 if (rc) 1838 if (rc)
1839 goto out; 1839 goto out;
1840 tocopy = min_t(u8, len_keys, wrqu->en 1840 tocopy = min_t(u8, len_keys, wrqu->encoding.length);
1841 tocopy = min_t(u8, tocopy, 100); 1841 tocopy = min_t(u8, tocopy, 100);
1842 wrqu->encoding.length = tocopy; 1842 wrqu->encoding.length = tocopy;
1843 memcpy(extra, keys, tocopy); 1843 memcpy(extra, keys, tocopy);
1844 out: 1844 out:
1845 return rc; 1845 return rc;
1846 } 1846 }
1847 1847
1848 static int wl3501_get_power(struct net_device 1848 static int wl3501_get_power(struct net_device *dev,
1849 struct iw_request 1849 struct iw_request_info *info,
1850 union iwreq_data 1850 union iwreq_data *wrqu, char *extra)
1851 { 1851 {
1852 u8 pwr_state; 1852 u8 pwr_state;
1853 struct wl3501_card *this = netdev_pri 1853 struct wl3501_card *this = netdev_priv(dev);
1854 int rc = wl3501_get_mib_value(this, 1854 int rc = wl3501_get_mib_value(this,
1855 WL3501_ 1855 WL3501_MIB_ATTR_CURRENT_PWR_STATE,
1856 &pwr_st 1856 &pwr_state, sizeof(pwr_state));
1857 if (rc) 1857 if (rc)
1858 goto out; 1858 goto out;
1859 wrqu->power.disabled = !pwr_state; 1859 wrqu->power.disabled = !pwr_state;
1860 wrqu->power.flags = IW_POWER_ON; 1860 wrqu->power.flags = IW_POWER_ON;
1861 out: 1861 out:
1862 return rc; 1862 return rc;
1863 } 1863 }
1864 1864
1865 static const iw_handler wl3501_handler[] = { 1865 static const iw_handler wl3501_handler[] = {
1866 [SIOCGIWNAME - SIOCIWFIRST] = wl35 1866 [SIOCGIWNAME - SIOCIWFIRST] = wl3501_get_name,
1867 [SIOCSIWFREQ - SIOCIWFIRST] = wl35 1867 [SIOCSIWFREQ - SIOCIWFIRST] = wl3501_set_freq,
1868 [SIOCGIWFREQ - SIOCIWFIRST] = wl35 1868 [SIOCGIWFREQ - SIOCIWFIRST] = wl3501_get_freq,
1869 [SIOCSIWMODE - SIOCIWFIRST] = wl35 1869 [SIOCSIWMODE - SIOCIWFIRST] = wl3501_set_mode,
1870 [SIOCGIWMODE - SIOCIWFIRST] = wl35 1870 [SIOCGIWMODE - SIOCIWFIRST] = wl3501_get_mode,
1871 [SIOCGIWSENS - SIOCIWFIRST] = wl35 1871 [SIOCGIWSENS - SIOCIWFIRST] = wl3501_get_sens,
1872 [SIOCGIWRANGE - SIOCIWFIRST] = wl35 1872 [SIOCGIWRANGE - SIOCIWFIRST] = wl3501_get_range,
1873 [SIOCSIWSPY - SIOCIWFIRST] = iw_h 1873 [SIOCSIWSPY - SIOCIWFIRST] = iw_handler_set_spy,
1874 [SIOCGIWSPY - SIOCIWFIRST] = iw_h 1874 [SIOCGIWSPY - SIOCIWFIRST] = iw_handler_get_spy,
1875 [SIOCSIWTHRSPY - SIOCIWFIRST] = iw_h 1875 [SIOCSIWTHRSPY - SIOCIWFIRST] = iw_handler_set_thrspy,
1876 [SIOCGIWTHRSPY - SIOCIWFIRST] = iw_h 1876 [SIOCGIWTHRSPY - SIOCIWFIRST] = iw_handler_get_thrspy,
1877 [SIOCSIWAP - SIOCIWFIRST] = wl35 1877 [SIOCSIWAP - SIOCIWFIRST] = wl3501_set_wap,
1878 [SIOCGIWAP - SIOCIWFIRST] = wl35 1878 [SIOCGIWAP - SIOCIWFIRST] = wl3501_get_wap,
1879 [SIOCSIWSCAN - SIOCIWFIRST] = wl35 1879 [SIOCSIWSCAN - SIOCIWFIRST] = wl3501_set_scan,
1880 [SIOCGIWSCAN - SIOCIWFIRST] = wl35 1880 [SIOCGIWSCAN - SIOCIWFIRST] = wl3501_get_scan,
1881 [SIOCSIWESSID - SIOCIWFIRST] = wl35 1881 [SIOCSIWESSID - SIOCIWFIRST] = wl3501_set_essid,
1882 [SIOCGIWESSID - SIOCIWFIRST] = wl35 1882 [SIOCGIWESSID - SIOCIWFIRST] = wl3501_get_essid,
1883 [SIOCSIWNICKN - SIOCIWFIRST] = wl35 1883 [SIOCSIWNICKN - SIOCIWFIRST] = wl3501_set_nick,
1884 [SIOCGIWNICKN - SIOCIWFIRST] = wl35 1884 [SIOCGIWNICKN - SIOCIWFIRST] = wl3501_get_nick,
1885 [SIOCGIWRATE - SIOCIWFIRST] = wl35 1885 [SIOCGIWRATE - SIOCIWFIRST] = wl3501_get_rate,
1886 [SIOCGIWRTS - SIOCIWFIRST] = wl35 1886 [SIOCGIWRTS - SIOCIWFIRST] = wl3501_get_rts_threshold,
1887 [SIOCGIWFRAG - SIOCIWFIRST] = wl35 1887 [SIOCGIWFRAG - SIOCIWFIRST] = wl3501_get_frag_threshold,
1888 [SIOCGIWTXPOW - SIOCIWFIRST] = wl35 1888 [SIOCGIWTXPOW - SIOCIWFIRST] = wl3501_get_txpow,
1889 [SIOCGIWRETRY - SIOCIWFIRST] = wl35 1889 [SIOCGIWRETRY - SIOCIWFIRST] = wl3501_get_retry,
1890 [SIOCGIWENCODE - SIOCIWFIRST] = wl35 1890 [SIOCGIWENCODE - SIOCIWFIRST] = wl3501_get_encode,
1891 [SIOCGIWPOWER - SIOCIWFIRST] = wl35 1891 [SIOCGIWPOWER - SIOCIWFIRST] = wl3501_get_power,
1892 }; 1892 };
1893 1893
1894 static const struct iw_handler_def wl3501_han 1894 static const struct iw_handler_def wl3501_handler_def = {
1895 .num_standard = ARRAY_SIZE(wl3501_h 1895 .num_standard = ARRAY_SIZE(wl3501_handler),
1896 .standard = (iw_handler *)wl350 1896 .standard = (iw_handler *)wl3501_handler,
1897 .get_wireless_stats = wl3501_get_wire 1897 .get_wireless_stats = wl3501_get_wireless_stats,
1898 }; 1898 };
1899 1899
1900 /** 1900 /**
1901 * wl3501_attach - creates an "instance" of t 1901 * wl3501_attach - creates an "instance" of the driver
1902 * 1902 *
1903 * Creates an "instance" of the driver, alloc 1903 * Creates an "instance" of the driver, allocating local data structures for
1904 * one device. The device is registered with 1904 * one device. The device is registered with Card Services.
1905 * 1905 *
1906 * The dev_link structure is initialized, but 1906 * The dev_link structure is initialized, but we don't actually configure the
1907 * card at this point -- we wait until we rec 1907 * card at this point -- we wait until we receive a card insertion event.
1908 */ 1908 */
1909 static int wl3501_probe(struct pcmcia_device 1909 static int wl3501_probe(struct pcmcia_device *p_dev)
1910 { 1910 {
1911 struct net_device *dev; 1911 struct net_device *dev;
1912 struct wl3501_card *this; 1912 struct wl3501_card *this;
1913 1913
1914 /* The io structure describes IO port 1914 /* The io structure describes IO port mapping */
1915 p_dev->io.NumPorts1 = 16; 1915 p_dev->io.NumPorts1 = 16;
1916 p_dev->io.Attributes1 = IO_DATA_PAT 1916 p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
1917 p_dev->io.IOAddrLines = 5; 1917 p_dev->io.IOAddrLines = 5;
1918 1918
1919 /* Interrupt setup */ 1919 /* Interrupt setup */
1920 p_dev->irq.Attributes = IRQ_TYPE_EX 1920 p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE | IRQ_HANDLE_PRESENT;
1921 p_dev->irq.IRQInfo1 = IRQ_LEVEL_I 1921 p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
1922 p_dev->irq.Handler = wl3501_interrupt 1922 p_dev->irq.Handler = wl3501_interrupt;
1923 1923
1924 /* General socket configuration */ 1924 /* General socket configuration */
1925 p_dev->conf.Attributes = CONF_ENABLE 1925 p_dev->conf.Attributes = CONF_ENABLE_IRQ;
1926 p_dev->conf.IntType = INT_MEMORY_ 1926 p_dev->conf.IntType = INT_MEMORY_AND_IO;
1927 p_dev->conf.ConfigIndex = 1; 1927 p_dev->conf.ConfigIndex = 1;
1928 1928
1929 dev = alloc_etherdev(sizeof(struct wl 1929 dev = alloc_etherdev(sizeof(struct wl3501_card));
1930 if (!dev) 1930 if (!dev)
1931 goto out_link; 1931 goto out_link;
1932 dev->open = wl3501_open 1932 dev->open = wl3501_open;
1933 dev->stop = wl3501_clos 1933 dev->stop = wl3501_close;
1934 dev->hard_start_xmit = wl3501_hard 1934 dev->hard_start_xmit = wl3501_hard_start_xmit;
1935 dev->tx_timeout = wl3501_tx_t 1935 dev->tx_timeout = wl3501_tx_timeout;
1936 dev->watchdog_timeo = 5 * HZ; 1936 dev->watchdog_timeo = 5 * HZ;
1937 dev->get_stats = wl3501_get_ 1937 dev->get_stats = wl3501_get_stats;
1938 this = netdev_priv(dev); 1938 this = netdev_priv(dev);
1939 this->wireless_data.spy_data = &this- 1939 this->wireless_data.spy_data = &this->spy_data;
1940 this->p_dev = p_dev; 1940 this->p_dev = p_dev;
1941 dev->wireless_data = &this->wire 1941 dev->wireless_data = &this->wireless_data;
1942 dev->wireless_handlers = (struct iw_ 1942 dev->wireless_handlers = (struct iw_handler_def *)&wl3501_handler_def;
1943 SET_ETHTOOL_OPS(dev, &ops); 1943 SET_ETHTOOL_OPS(dev, &ops);
1944 netif_stop_queue(dev); 1944 netif_stop_queue(dev);
1945 p_dev->priv = p_dev->irq.Instance = d 1945 p_dev->priv = p_dev->irq.Instance = dev;
1946 1946
1947 return wl3501_config(p_dev); 1947 return wl3501_config(p_dev);
1948 out_link: 1948 out_link:
1949 return -ENOMEM; 1949 return -ENOMEM;
1950 } 1950 }
1951 1951
1952 #define CS_CHECK(fn, ret) \ 1952 #define CS_CHECK(fn, ret) \
1953 do { last_fn = (fn); if ((last_ret = (ret)) ! 1953 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
1954 1954
1955 /** 1955 /**
1956 * wl3501_config - configure the PCMCIA socke 1956 * wl3501_config - configure the PCMCIA socket and make eth device available
1957 * @link - FILL_IN 1957 * @link - FILL_IN
1958 * 1958 *
1959 * wl3501_config() is scheduled to run after 1959 * wl3501_config() is scheduled to run after a CARD_INSERTION event is
1960 * received, to configure the PCMCIA socket, 1960 * received, to configure the PCMCIA socket, and to make the ethernet device
1961 * available to the system. 1961 * available to the system.
1962 */ 1962 */
1963 static int wl3501_config(struct pcmcia_device 1963 static int wl3501_config(struct pcmcia_device *link)
1964 { 1964 {
1965 struct net_device *dev = link->priv; 1965 struct net_device *dev = link->priv;
1966 int i = 0, j, last_fn, last_ret; 1966 int i = 0, j, last_fn, last_ret;
1967 struct wl3501_card *this; 1967 struct wl3501_card *this;
1968 DECLARE_MAC_BUF(mac); 1968 DECLARE_MAC_BUF(mac);
1969 1969
1970 /* Try allocating IO ports. This tri 1970 /* Try allocating IO ports. This tries a few fixed addresses. If you
1971 * want, you can also read the card's 1971 * want, you can also read the card's config table to pick addresses --
1972 * see the serial driver for an examp 1972 * see the serial driver for an example. */
1973 1973
1974 for (j = 0x280; j < 0x400; j += 0x20) 1974 for (j = 0x280; j < 0x400; j += 0x20) {
1975 /* The '^0x300' is so that we 1975 /* The '^0x300' is so that we probe 0x300-0x3ff first, then
1976 * 0x200-0x2ff, and so on, be 1976 * 0x200-0x2ff, and so on, because this seems safer */
1977 link->io.BasePort1 = j; 1977 link->io.BasePort1 = j;
1978 link->io.BasePort2 = link->io 1978 link->io.BasePort2 = link->io.BasePort1 + 0x10;
1979 i = pcmcia_request_io(link, & 1979 i = pcmcia_request_io(link, &link->io);
1980 if (i == CS_SUCCESS) 1980 if (i == CS_SUCCESS)
1981 break; 1981 break;
1982 } 1982 }
1983 if (i != CS_SUCCESS) { 1983 if (i != CS_SUCCESS) {
1984 cs_error(link, RequestIO, i); 1984 cs_error(link, RequestIO, i);
1985 goto failed; 1985 goto failed;
1986 } 1986 }
1987 1987
1988 /* Now allocate an interrupt line. No 1988 /* Now allocate an interrupt line. Note that this does not actually
1989 * assign a handler to the interrupt. 1989 * assign a handler to the interrupt. */
1990 1990
1991 CS_CHECK(RequestIRQ, pcmcia_request_i 1991 CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
1992 1992
1993 /* This actually configures the PCMCI 1993 /* This actually configures the PCMCIA socket -- setting up the I/O
1994 * windows and the interrupt mapping. 1994 * windows and the interrupt mapping. */
1995 1995
1996 CS_CHECK(RequestConfiguration, pcmcia 1996 CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
1997 1997
1998 dev->irq = link->irq.AssignedIRQ; 1998 dev->irq = link->irq.AssignedIRQ;
1999 dev->base_addr = link->io.BasePort1; 1999 dev->base_addr = link->io.BasePort1;
2000 SET_NETDEV_DEV(dev, &handle_to_dev(li 2000 SET_NETDEV_DEV(dev, &handle_to_dev(link));
2001 if (register_netdev(dev)) { 2001 if (register_netdev(dev)) {
2002 printk(KERN_NOTICE "wl3501_cs 2002 printk(KERN_NOTICE "wl3501_cs: register_netdev() failed\n");
2003 goto failed; 2003 goto failed;
2004 } 2004 }
2005 2005
2006 this = netdev_priv(dev); 2006 this = netdev_priv(dev);
2007 /* 2007 /*
2008 * At this point, the dev_node_t stru 2008 * At this point, the dev_node_t structure(s) should be initialized and
2009 * arranged in a linked list at link- 2009 * arranged in a linked list at link->dev_node.
2010 */ 2010 */
2011 link->dev_node = &this->node; 2011 link->dev_node = &this->node;
2012 2012
2013 this->base_addr = dev->base_addr; 2013 this->base_addr = dev->base_addr;
2014 2014
2015 if (!wl3501_get_flash_mac_addr(this)) 2015 if (!wl3501_get_flash_mac_addr(this)) {
2016 printk(KERN_WARNING "%s: Cant 2016 printk(KERN_WARNING "%s: Cant read MAC addr in flash ROM?\n",
2017 dev->name); 2017 dev->name);
2018 goto failed; 2018 goto failed;
2019 } 2019 }
2020 strcpy(this->node.dev_name, dev->name 2020 strcpy(this->node.dev_name, dev->name);
2021 2021
2022 for (i = 0; i < 6; i++) 2022 for (i = 0; i < 6; i++)
2023 dev->dev_addr[i] = ((char *)& 2023 dev->dev_addr[i] = ((char *)&this->mac_addr)[i];
2024 2024
2025 /* print probe information */ 2025 /* print probe information */
2026 printk(KERN_INFO "%s: wl3501 @ 0x%3.3 2026 printk(KERN_INFO "%s: wl3501 @ 0x%3.3x, IRQ %d, "
2027 "MAC addr in flash ROM:%s\n", 2027 "MAC addr in flash ROM:%s\n",
2028 dev->name, this->base_addr, (i 2028 dev->name, this->base_addr, (int)dev->irq,
2029 print_mac(mac, dev->dev_addr)) 2029 print_mac(mac, dev->dev_addr));
2030 /* 2030 /*
2031 * Initialize card parameters - added 2031 * Initialize card parameters - added by jss
2032 */ 2032 */
2033 this->net_type = IW_MODE_INF 2033 this->net_type = IW_MODE_INFRA;
2034 this->bss_cnt = 0; 2034 this->bss_cnt = 0;
2035 this->join_sta_bss = 0; 2035 this->join_sta_bss = 0;
2036 this->adhoc_times = 0; 2036 this->adhoc_times = 0;
2037 iw_set_mgmt_info_element(IW_MGMT_INFO 2037 iw_set_mgmt_info_element(IW_MGMT_INFO_ELEMENT_SSID, &this->essid.el,
2038 "ANY", 3); 2038 "ANY", 3);
2039 this->card_name[0] = '\0'; 2039 this->card_name[0] = '\0';
2040 this->firmware_date[0] = '\0'; 2040 this->firmware_date[0] = '\0';
2041 this->rssi = 255; 2041 this->rssi = 255;
2042 this->chan = iw_default_ 2042 this->chan = iw_default_channel(this->reg_domain);
2043 strlcpy(this->nick, "Planet WL3501", 2043 strlcpy(this->nick, "Planet WL3501", sizeof(this->nick));
2044 spin_lock_init(&this->lock); 2044 spin_lock_init(&this->lock);
2045 init_waitqueue_head(&this->wait); 2045 init_waitqueue_head(&this->wait);
2046 netif_start_queue(dev); 2046 netif_start_queue(dev);
2047 return 0; 2047 return 0;
2048 2048
2049 cs_failed: 2049 cs_failed:
2050 cs_error(link, last_fn, last_ret); 2050 cs_error(link, last_fn, last_ret);
2051 failed: 2051 failed:
2052 wl3501_release(link); 2052 wl3501_release(link);
2053 return -ENODEV; 2053 return -ENODEV;
2054 } 2054 }
2055 2055
2056 /** 2056 /**
2057 * wl3501_release - unregister the net, relea 2057 * wl3501_release - unregister the net, release PCMCIA configuration
2058 * @arg - link 2058 * @arg - link
2059 * 2059 *
2060 * After a card is removed, wl3501_release() 2060 * After a card is removed, wl3501_release() will unregister the net device,
2061 * and release the PCMCIA configuration. If 2061 * and release the PCMCIA configuration. If the device is still open, this
2062 * will be postponed until it is closed. 2062 * will be postponed until it is closed.
2063 */ 2063 */
2064 static void wl3501_release(struct pcmcia_devi 2064 static void wl3501_release(struct pcmcia_device *link)
2065 { 2065 {
2066 struct net_device *dev = link->priv; 2066 struct net_device *dev = link->priv;
2067 2067
2068 /* Unlink the device chain */ 2068 /* Unlink the device chain */
2069 if (link->dev_node) 2069 if (link->dev_node)
2070 unregister_netdev(dev); 2070 unregister_netdev(dev);
2071 2071
2072 pcmcia_disable_device(link); 2072 pcmcia_disable_device(link);
2073 } 2073 }
2074 2074
2075 static int wl3501_suspend(struct pcmcia_devic 2075 static int wl3501_suspend(struct pcmcia_device *link)
2076 { 2076 {
2077 struct net_device *dev = link->priv; 2077 struct net_device *dev = link->priv;
2078 2078
2079 wl3501_pwr_mgmt(netdev_priv(dev), WL3 2079 wl3501_pwr_mgmt(netdev_priv(dev), WL3501_SUSPEND);
2080 if (link->open) 2080 if (link->open)
2081 netif_device_detach(dev); 2081 netif_device_detach(dev);
2082 2082
2083 return 0; 2083 return 0;
2084 } 2084 }
2085 2085
2086 static int wl3501_resume(struct pcmcia_device 2086 static int wl3501_resume(struct pcmcia_device *link)
2087 { 2087 {
2088 struct net_device *dev = link->priv; 2088 struct net_device *dev = link->priv;
2089 2089
2090 wl3501_pwr_mgmt(netdev_priv(dev), WL3 2090 wl3501_pwr_mgmt(netdev_priv(dev), WL3501_RESUME);
2091 if (link->open) { 2091 if (link->open) {
2092 wl3501_reset(dev); 2092 wl3501_reset(dev);
2093 netif_device_attach(dev); 2093 netif_device_attach(dev);
2094 } 2094 }
2095 2095
2096 return 0; 2096 return 0;
2097 } 2097 }
2098 2098
2099 2099
2100 static struct pcmcia_device_id wl3501_ids[] = 2100 static struct pcmcia_device_id wl3501_ids[] = {
2101 PCMCIA_DEVICE_MANF_CARD(0xd601, 0x000 2101 PCMCIA_DEVICE_MANF_CARD(0xd601, 0x0001),
2102 PCMCIA_DEVICE_NULL 2102 PCMCIA_DEVICE_NULL
2103 }; 2103 };
2104 MODULE_DEVICE_TABLE(pcmcia, wl3501_ids); 2104 MODULE_DEVICE_TABLE(pcmcia, wl3501_ids);
2105 2105
2106 static struct pcmcia_driver wl3501_driver = { 2106 static struct pcmcia_driver wl3501_driver = {
2107 .owner = THIS_MODULE, 2107 .owner = THIS_MODULE,
2108 .drv = { 2108 .drv = {
2109 .name = "wl3501_cs", 2109 .name = "wl3501_cs",
2110 }, 2110 },
2111 .probe = wl3501_probe, 2111 .probe = wl3501_probe,
2112 .remove = wl3501_detach, 2112 .remove = wl3501_detach,
2113 .id_table = wl3501_ids, 2113 .id_table = wl3501_ids,
2114 .suspend = wl3501_suspend, 2114 .suspend = wl3501_suspend,
2115 .resume = wl3501_resume, 2115 .resume = wl3501_resume,
2116 }; 2116 };
2117 2117
2118 static int __init wl3501_init_module(void) 2118 static int __init wl3501_init_module(void)
2119 { 2119 {
2120 return pcmcia_register_driver(&wl3501 2120 return pcmcia_register_driver(&wl3501_driver);
2121 } 2121 }
2122 2122
2123 static void __exit wl3501_exit_module(void) 2123 static void __exit wl3501_exit_module(void)
2124 { 2124 {
2125 pcmcia_unregister_driver(&wl3501_driv 2125 pcmcia_unregister_driver(&wl3501_driver);
2126 } 2126 }
2127 2127
2128 module_init(wl3501_init_module); 2128 module_init(wl3501_init_module);
2129 module_exit(wl3501_exit_module); 2129 module_exit(wl3501_exit_module);
2130 2130
2131 MODULE_AUTHOR("Fox Chen <mhchen@golf.ccl.itri 2131 MODULE_AUTHOR("Fox Chen <mhchen@golf.ccl.itri.org.tw>, "
2132 "Arnaldo Carvalho de Melo <acme 2132 "Arnaldo Carvalho de Melo <acme@conectiva.com.br>,"
2133 "Gustavo Niemeyer <niemeyer@con 2133 "Gustavo Niemeyer <niemeyer@conectiva.com>");
2134 MODULE_DESCRIPTION("Planet wl3501 wireless dr 2134 MODULE_DESCRIPTION("Planet wl3501 wireless driver");
2135 MODULE_LICENSE("GPL"); 2135 MODULE_LICENSE("GPL");
2136 2136
|
This page was automatically generated by the
LXR engine.
|