diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-09 16:58:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-09 16:58:40 -0500 |
commit | 7d1676629e9262f441540ecb0cde57e5cafc632f (patch) | |
tree | f60ad97a2253e76f2e2f04727f43beda787a309f | |
parent | 6707fbb56c8fd3121e334291d170934bcaca2e7f (diff) | |
parent | 6136ac86b719716694884a84cd9d403207cc52b9 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
Staging: panel: fix lcd panel driver build failure
Staging: android: fix up units in timed_gpio
Staging: android: ram_console: Disable ECC when early init is enabled and validate buffer size
Staging: at76_usb: Add support for OQO Model 01+
Staging: at76_usb: fix bugs introduced by "Staging: at76_usb: cleanup dma on stack issues"
Revert Staging: at76_usb: update drivers/staging/at76_usb w/ mac80211 port
-rw-r--r-- | drivers/staging/android/Kconfig | 1 | ||||
-rw-r--r-- | drivers/staging/android/ram_console.c | 14 | ||||
-rw-r--r-- | drivers/staging/android/timed_gpio.c | 2 | ||||
-rw-r--r-- | drivers/staging/at76_usb/Kconfig | 2 | ||||
-rw-r--r-- | drivers/staging/at76_usb/at76_usb.c | 4620 | ||||
-rw-r--r-- | drivers/staging/at76_usb/at76_usb.h | 227 | ||||
-rw-r--r-- | drivers/staging/panel/panel.c | 10 |
7 files changed, 3903 insertions, 973 deletions
diff --git a/drivers/staging/android/Kconfig b/drivers/staging/android/Kconfig index 6b996db0dd6a..604bd1e0d546 100644 --- a/drivers/staging/android/Kconfig +++ b/drivers/staging/android/Kconfig | |||
@@ -27,6 +27,7 @@ menuconfig ANDROID_RAM_CONSOLE_ERROR_CORRECTION | |||
27 | bool "Android RAM Console Enable error correction" | 27 | bool "Android RAM Console Enable error correction" |
28 | default n | 28 | default n |
29 | depends on ANDROID_RAM_CONSOLE | 29 | depends on ANDROID_RAM_CONSOLE |
30 | depends on !ANDROID_RAM_CONSOLE_EARLY_INIT | ||
30 | select REED_SOLOMON | 31 | select REED_SOLOMON |
31 | select REED_SOLOMON_ENC8 | 32 | select REED_SOLOMON_ENC8 |
32 | select REED_SOLOMON_DEC8 | 33 | select REED_SOLOMON_DEC8 |
diff --git a/drivers/staging/android/ram_console.c b/drivers/staging/android/ram_console.c index bf006857a87a..643ac5ce381d 100644 --- a/drivers/staging/android/ram_console.c +++ b/drivers/staging/android/ram_console.c | |||
@@ -224,9 +224,23 @@ static int __init ram_console_init(struct ram_console_buffer *buffer, | |||
224 | ram_console_buffer_size = | 224 | ram_console_buffer_size = |
225 | buffer_size - sizeof(struct ram_console_buffer); | 225 | buffer_size - sizeof(struct ram_console_buffer); |
226 | 226 | ||
227 | if (ram_console_buffer_size > buffer_size) { | ||
228 | pr_err("ram_console: buffer %p, invalid size %d, datasize %d\n", | ||
229 | buffer, buffer_size, ram_console_buffer_size); | ||
230 | return 0; | ||
231 | } | ||
232 | |||
227 | #ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION | 233 | #ifdef CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION |
228 | ram_console_buffer_size -= (DIV_ROUND_UP(ram_console_buffer_size, | 234 | ram_console_buffer_size -= (DIV_ROUND_UP(ram_console_buffer_size, |
229 | ECC_BLOCK_SIZE) + 1) * ECC_SIZE; | 235 | ECC_BLOCK_SIZE) + 1) * ECC_SIZE; |
236 | |||
237 | if (ram_console_buffer_size > buffer_size) { | ||
238 | pr_err("ram_console: buffer %p, invalid size %d, " | ||
239 | "non-ecc datasize %d\n", | ||
240 | buffer, buffer_size, ram_console_buffer_size); | ||
241 | return 0; | ||
242 | } | ||
243 | |||
230 | ram_console_par_buffer = buffer->data + ram_console_buffer_size; | 244 | ram_console_par_buffer = buffer->data + ram_console_buffer_size; |
231 | 245 | ||
232 | 246 | ||
diff --git a/drivers/staging/android/timed_gpio.c b/drivers/staging/android/timed_gpio.c index 903270cbbe02..33daff0481d2 100644 --- a/drivers/staging/android/timed_gpio.c +++ b/drivers/staging/android/timed_gpio.c | |||
@@ -50,7 +50,7 @@ static ssize_t gpio_enable_show(struct device *dev, struct device_attribute *att | |||
50 | if (hrtimer_active(&gpio_data->timer)) { | 50 | if (hrtimer_active(&gpio_data->timer)) { |
51 | ktime_t r = hrtimer_get_remaining(&gpio_data->timer); | 51 | ktime_t r = hrtimer_get_remaining(&gpio_data->timer); |
52 | struct timeval t = ktime_to_timeval(r); | 52 | struct timeval t = ktime_to_timeval(r); |
53 | remaining = t.tv_sec * 1000 + t.tv_usec; | 53 | remaining = t.tv_sec * 1000 + t.tv_usec / 1000; |
54 | } else | 54 | } else |
55 | remaining = 0; | 55 | remaining = 0; |
56 | 56 | ||
diff --git a/drivers/staging/at76_usb/Kconfig b/drivers/staging/at76_usb/Kconfig index 4c0e55e15448..8606f9621624 100644 --- a/drivers/staging/at76_usb/Kconfig +++ b/drivers/staging/at76_usb/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config USB_ATMEL | 1 | config USB_ATMEL |
2 | tristate "Atmel at76c503/at76c505/at76c505a USB cards" | 2 | tristate "Atmel at76c503/at76c505/at76c505a USB cards" |
3 | depends on MAC80211 && WLAN_80211 && USB | 3 | depends on WLAN_80211 && USB |
4 | default N | 4 | default N |
5 | select FW_LOADER | 5 | select FW_LOADER |
6 | ---help--- | 6 | ---help--- |
diff --git a/drivers/staging/at76_usb/at76_usb.c b/drivers/staging/at76_usb/at76_usb.c index 185533e54769..c8e4d31c7df2 100644 --- a/drivers/staging/at76_usb/at76_usb.c +++ b/drivers/staging/at76_usb/at76_usb.c | |||
@@ -6,7 +6,6 @@ | |||
6 | * Copyright (c) 2004 Nick Jones | 6 | * Copyright (c) 2004 Nick Jones |
7 | * Copyright (c) 2004 Balint Seeber <n0_5p4m_p13453@hotmail.com> | 7 | * Copyright (c) 2004 Balint Seeber <n0_5p4m_p13453@hotmail.com> |
8 | * Copyright (c) 2007 Guido Guenther <agx@sigxcpu.org> | 8 | * Copyright (c) 2007 Guido Guenther <agx@sigxcpu.org> |
9 | * Copyright (c) 2007 Kalle Valo <kalle.valo@iki.fi> | ||
10 | * | 9 | * |
11 | * This program is free software; you can redistribute it and/or | 10 | * This program is free software; you can redistribute it and/or |
12 | * modify it under the terms of the GNU General Public License as | 11 | * modify it under the terms of the GNU General Public License as |
@@ -17,13 +16,6 @@ | |||
17 | * Atmel AT76C503A/505/505A. | 16 | * Atmel AT76C503A/505/505A. |
18 | * | 17 | * |
19 | * Some iw_handler code was taken from airo.c, (C) 1999 Benjamin Reed | 18 | * Some iw_handler code was taken from airo.c, (C) 1999 Benjamin Reed |
20 | * | ||
21 | * TODO for the mac80211 port: | ||
22 | * o adhoc support | ||
23 | * o RTS/CTS support | ||
24 | * o Power Save Mode support | ||
25 | * o support for short/long preambles | ||
26 | * o export variables through debugfs/sysfs | ||
27 | */ | 19 | */ |
28 | 20 | ||
29 | #include <linux/init.h> | 21 | #include <linux/init.h> |
@@ -44,7 +36,7 @@ | |||
44 | #include <net/ieee80211_radiotap.h> | 36 | #include <net/ieee80211_radiotap.h> |
45 | #include <linux/firmware.h> | 37 | #include <linux/firmware.h> |
46 | #include <linux/leds.h> | 38 | #include <linux/leds.h> |
47 | #include <net/mac80211.h> | 39 | #include <net/ieee80211.h> |
48 | 40 | ||
49 | #include "at76_usb.h" | 41 | #include "at76_usb.h" |
50 | 42 | ||
@@ -84,43 +76,31 @@ | |||
84 | #define DBG_WE_EVENTS 0x08000000 /* dump wireless events */ | 76 | #define DBG_WE_EVENTS 0x08000000 /* dump wireless events */ |
85 | #define DBG_FW 0x10000000 /* firmware download */ | 77 | #define DBG_FW 0x10000000 /* firmware download */ |
86 | #define DBG_DFU 0x20000000 /* device firmware upgrade */ | 78 | #define DBG_DFU 0x20000000 /* device firmware upgrade */ |
87 | #define DBG_CMD 0x40000000 | ||
88 | #define DBG_MAC80211 0x80000000 | ||
89 | 79 | ||
90 | #define DBG_DEFAULTS 0 | 80 | #define DBG_DEFAULTS 0 |
91 | 81 | ||
92 | /* Use our own dbg macro */ | 82 | /* Use our own dbg macro */ |
93 | #define at76_dbg(bits, format, arg...) \ | 83 | #define at76_dbg(bits, format, arg...) \ |
94 | do { \ | 84 | do { \ |
95 | if (at76_debug & (bits)) \ | 85 | if (at76_debug & (bits)) \ |
96 | printk(KERN_DEBUG DRIVER_NAME ": " format "\n" , ## arg); \ | ||
97 | } while (0) | ||
98 | |||
99 | #define at76_dbg_dump(bits, buf, len, format, arg...) \ | ||
100 | do { \ | ||
101 | if (at76_debug & (bits)) { \ | ||
102 | printk(KERN_DEBUG DRIVER_NAME ": " format "\n" , ## arg); \ | 86 | printk(KERN_DEBUG DRIVER_NAME ": " format "\n" , ## arg); \ |
103 | print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, buf, len); \ | 87 | } while (0) |
104 | } \ | ||
105 | } while (0) | ||
106 | 88 | ||
107 | static int at76_debug = DBG_DEFAULTS; | 89 | static int at76_debug = DBG_DEFAULTS; |
108 | 90 | ||
109 | #define FIRMWARE_IS_WPA(ver) ((ver.major == 1) && (ver.minor == 103)) | ||
110 | |||
111 | /* Protect against concurrent firmware loading and parsing */ | 91 | /* Protect against concurrent firmware loading and parsing */ |
112 | static struct mutex fw_mutex; | 92 | static struct mutex fw_mutex; |
113 | 93 | ||
114 | static struct fwentry firmwares[] = { | 94 | static struct fwentry firmwares[] = { |
115 | [0] = { "" }, | 95 | [0] = {""}, |
116 | [BOARD_503_ISL3861] = { "atmel_at76c503-i3861.bin" }, | 96 | [BOARD_503_ISL3861] = {"atmel_at76c503-i3861.bin"}, |
117 | [BOARD_503_ISL3863] = { "atmel_at76c503-i3863.bin" }, | 97 | [BOARD_503_ISL3863] = {"atmel_at76c503-i3863.bin"}, |
118 | [BOARD_503] = { "atmel_at76c503-rfmd.bin" }, | 98 | [BOARD_503] = {"atmel_at76c503-rfmd.bin"}, |
119 | [BOARD_503_ACC] = { "atmel_at76c503-rfmd-acc.bin" }, | 99 | [BOARD_503_ACC] = {"atmel_at76c503-rfmd-acc.bin"}, |
120 | [BOARD_505] = { "atmel_at76c505-rfmd.bin" }, | 100 | [BOARD_505] = {"atmel_at76c505-rfmd.bin"}, |
121 | [BOARD_505_2958] = { "atmel_at76c505-rfmd2958.bin" }, | 101 | [BOARD_505_2958] = {"atmel_at76c505-rfmd2958.bin"}, |
122 | [BOARD_505A] = { "atmel_at76c505a-rfmd2958.bin" }, | 102 | [BOARD_505A] = {"atmel_at76c505a-rfmd2958.bin"}, |
123 | [BOARD_505AMX] = { "atmel_at76c505amx-rfmd.bin" }, | 103 | [BOARD_505AMX] = {"atmel_at76c505amx-rfmd.bin"}, |
124 | }; | 104 | }; |
125 | 105 | ||
126 | #define USB_DEVICE_DATA(__ops) .driver_info = (kernel_ulong_t)(__ops) | 106 | #define USB_DEVICE_DATA(__ops) .driver_info = (kernel_ulong_t)(__ops) |
@@ -130,133 +110,135 @@ static struct usb_device_id dev_table[] = { | |||
130 | * at76c503-i3861 | 110 | * at76c503-i3861 |
131 | */ | 111 | */ |
132 | /* Generic AT76C503/3861 device */ | 112 | /* Generic AT76C503/3861 device */ |
133 | { USB_DEVICE(0x03eb, 0x7603), USB_DEVICE_DATA(BOARD_503_ISL3861) }, | 113 | {USB_DEVICE(0x03eb, 0x7603), USB_DEVICE_DATA(BOARD_503_ISL3861)}, |
134 | /* Linksys WUSB11 v2.1/v2.6 */ | 114 | /* Linksys WUSB11 v2.1/v2.6 */ |
135 | { USB_DEVICE(0x066b, 0x2211), USB_DEVICE_DATA(BOARD_503_ISL3861) }, | 115 | {USB_DEVICE(0x066b, 0x2211), USB_DEVICE_DATA(BOARD_503_ISL3861)}, |
136 | /* Netgear MA101 rev. A */ | 116 | /* Netgear MA101 rev. A */ |
137 | { USB_DEVICE(0x0864, 0x4100), USB_DEVICE_DATA(BOARD_503_ISL3861) }, | 117 | {USB_DEVICE(0x0864, 0x4100), USB_DEVICE_DATA(BOARD_503_ISL3861)}, |
138 | /* Tekram U300C / Allnet ALL0193 */ | 118 | /* Tekram U300C / Allnet ALL0193 */ |
139 | { USB_DEVICE(0x0b3b, 0x1612), USB_DEVICE_DATA(BOARD_503_ISL3861) }, | 119 | {USB_DEVICE(0x0b3b, 0x1612), USB_DEVICE_DATA(BOARD_503_ISL3861)}, |
140 | /* HP HN210W J7801A */ | 120 | /* HP HN210W J7801A */ |
141 | { USB_DEVICE(0x03f0, 0x011c), USB_DEVICE_DATA(BOARD_503_ISL3861) }, | 121 | {USB_DEVICE(0x03f0, 0x011c), USB_DEVICE_DATA(BOARD_503_ISL3861)}, |
142 | /* Sitecom/Z-Com/Zyxel M4Y-750 */ | 122 | /* Sitecom/Z-Com/Zyxel M4Y-750 */ |
143 | { USB_DEVICE(0x0cde, 0x0001), USB_DEVICE_DATA(BOARD_503_ISL3861) }, | 123 | {USB_DEVICE(0x0cde, 0x0001), USB_DEVICE_DATA(BOARD_503_ISL3861)}, |
144 | /* Dynalink/Askey WLL013 (intersil) */ | 124 | /* Dynalink/Askey WLL013 (intersil) */ |
145 | { USB_DEVICE(0x069a, 0x0320), USB_DEVICE_DATA(BOARD_503_ISL3861) }, | 125 | {USB_DEVICE(0x069a, 0x0320), USB_DEVICE_DATA(BOARD_503_ISL3861)}, |
146 | /* EZ connect 11Mpbs Wireless USB Adapter SMC2662W v1 */ | 126 | /* EZ connect 11Mpbs Wireless USB Adapter SMC2662W v1 */ |
147 | { USB_DEVICE(0x0d5c, 0xa001), USB_DEVICE_DATA(BOARD_503_ISL3861) }, | 127 | {USB_DEVICE(0x0d5c, 0xa001), USB_DEVICE_DATA(BOARD_503_ISL3861)}, |
148 | /* BenQ AWL300 */ | 128 | /* BenQ AWL300 */ |
149 | { USB_DEVICE(0x04a5, 0x9000), USB_DEVICE_DATA(BOARD_503_ISL3861) }, | 129 | {USB_DEVICE(0x04a5, 0x9000), USB_DEVICE_DATA(BOARD_503_ISL3861)}, |
150 | /* Addtron AWU-120, Compex WLU11 */ | 130 | /* Addtron AWU-120, Compex WLU11 */ |
151 | { USB_DEVICE(0x05dd, 0xff31), USB_DEVICE_DATA(BOARD_503_ISL3861) }, | 131 | {USB_DEVICE(0x05dd, 0xff31), USB_DEVICE_DATA(BOARD_503_ISL3861)}, |
152 | /* Intel AP310 AnyPoint II USB */ | 132 | /* Intel AP310 AnyPoint II USB */ |
153 | { USB_DEVICE(0x8086, 0x0200), USB_DEVICE_DATA(BOARD_503_ISL3861) }, | 133 | {USB_DEVICE(0x8086, 0x0200), USB_DEVICE_DATA(BOARD_503_ISL3861)}, |
154 | /* Dynalink L11U */ | 134 | /* Dynalink L11U */ |
155 | { USB_DEVICE(0x0d8e, 0x7100), USB_DEVICE_DATA(BOARD_503_ISL3861) }, | 135 | {USB_DEVICE(0x0d8e, 0x7100), USB_DEVICE_DATA(BOARD_503_ISL3861)}, |
156 | /* Arescom WL-210, FCC id 07J-GL2411USB */ | 136 | /* Arescom WL-210, FCC id 07J-GL2411USB */ |
157 | { USB_DEVICE(0x0d8e, 0x7110), USB_DEVICE_DATA(BOARD_503_ISL3861) }, | 137 | {USB_DEVICE(0x0d8e, 0x7110), USB_DEVICE_DATA(BOARD_503_ISL3861)}, |
158 | /* I-O DATA WN-B11/USB */ | 138 | /* I-O DATA WN-B11/USB */ |
159 | { USB_DEVICE(0x04bb, 0x0919), USB_DEVICE_DATA(BOARD_503_ISL3861) }, | 139 | {USB_DEVICE(0x04bb, 0x0919), USB_DEVICE_DATA(BOARD_503_ISL3861)}, |
160 | /* BT Voyager 1010 */ | 140 | /* BT Voyager 1010 */ |
161 | { USB_DEVICE(0x069a, 0x0821), USB_DEVICE_DATA(BOARD_503_ISL3861) }, | 141 | {USB_DEVICE(0x069a, 0x0821), USB_DEVICE_DATA(BOARD_503_ISL3861)}, |
162 | /* | 142 | /* |
163 | * at76c503-i3863 | 143 | * at76c503-i3863 |
164 | */ | 144 | */ |
165 | /* Generic AT76C503/3863 device */ | 145 | /* Generic AT76C503/3863 device */ |
166 | { USB_DEVICE(0x03eb, 0x7604), USB_DEVICE_DATA(BOARD_503_ISL3863) }, | 146 | {USB_DEVICE(0x03eb, 0x7604), USB_DEVICE_DATA(BOARD_503_ISL3863)}, |
167 | /* Samsung SWL-2100U */ | 147 | /* Samsung SWL-2100U */ |
168 | { USB_DEVICE(0x055d, 0xa000), USB_DEVICE_DATA(BOARD_503_ISL3863) }, | 148 | {USB_DEVICE(0x055d, 0xa000), USB_DEVICE_DATA(BOARD_503_ISL3863)}, |
169 | /* | 149 | /* |
170 | * at76c503-rfmd | 150 | * at76c503-rfmd |
171 | */ | 151 | */ |
172 | /* Generic AT76C503/RFMD device */ | 152 | /* Generic AT76C503/RFMD device */ |
173 | { USB_DEVICE(0x03eb, 0x7605), USB_DEVICE_DATA(BOARD_503) }, | 153 | {USB_DEVICE(0x03eb, 0x7605), USB_DEVICE_DATA(BOARD_503)}, |
174 | /* Dynalink/Askey WLL013 (rfmd) */ | 154 | /* Dynalink/Askey WLL013 (rfmd) */ |
175 | { USB_DEVICE(0x069a, 0x0321), USB_DEVICE_DATA(BOARD_503) }, | 155 | {USB_DEVICE(0x069a, 0x0321), USB_DEVICE_DATA(BOARD_503)}, |
176 | /* Linksys WUSB11 v2.6 */ | 156 | /* Linksys WUSB11 v2.6 */ |
177 | { USB_DEVICE(0x077b, 0x2219), USB_DEVICE_DATA(BOARD_503) }, | 157 | {USB_DEVICE(0x077b, 0x2219), USB_DEVICE_DATA(BOARD_503)}, |
178 | /* Network Everywhere NWU11B */ | 158 | /* Network Everywhere NWU11B */ |
179 | { USB_DEVICE(0x077b, 0x2227), USB_DEVICE_DATA(BOARD_503) }, | 159 | {USB_DEVICE(0x077b, 0x2227), USB_DEVICE_DATA(BOARD_503)}, |
180 | /* Netgear MA101 rev. B */ | 160 | /* Netgear MA101 rev. B */ |
181 | { USB_DEVICE(0x0864, 0x4102), USB_DEVICE_DATA(BOARD_503) }, | 161 | {USB_DEVICE(0x0864, 0x4102), USB_DEVICE_DATA(BOARD_503)}, |
182 | /* D-Link DWL-120 rev. E */ | 162 | /* D-Link DWL-120 rev. E */ |
183 | { USB_DEVICE(0x2001, 0x3200), USB_DEVICE_DATA(BOARD_503) }, | 163 | {USB_DEVICE(0x2001, 0x3200), USB_DEVICE_DATA(BOARD_503)}, |
184 | /* Actiontec 802UAT1, HWU01150-01UK */ | 164 | /* Actiontec 802UAT1, HWU01150-01UK */ |
185 | { USB_DEVICE(0x1668, 0x7605), USB_DEVICE_DATA(BOARD_503) }, | 165 | {USB_DEVICE(0x1668, 0x7605), USB_DEVICE_DATA(BOARD_503)}, |
186 | /* AirVast W-Buddie WN210 */ | 166 | /* AirVast W-Buddie WN210 */ |
187 | { USB_DEVICE(0x03eb, 0x4102), USB_DEVICE_DATA(BOARD_503) }, | 167 | {USB_DEVICE(0x03eb, 0x4102), USB_DEVICE_DATA(BOARD_503)}, |
188 | /* Dick Smith Electronics XH1153 802.11b USB adapter */ | 168 | /* Dick Smith Electronics XH1153 802.11b USB adapter */ |
189 | { USB_DEVICE(0x1371, 0x5743), USB_DEVICE_DATA(BOARD_503) }, | 169 | {USB_DEVICE(0x1371, 0x5743), USB_DEVICE_DATA(BOARD_503)}, |
190 | /* CNet CNUSB611 */ | 170 | /* CNet CNUSB611 */ |
191 | { USB_DEVICE(0x1371, 0x0001), USB_DEVICE_DATA(BOARD_503) }, | 171 | {USB_DEVICE(0x1371, 0x0001), USB_DEVICE_DATA(BOARD_503)}, |
192 | /* FiberLine FL-WL200U */ | 172 | /* FiberLine FL-WL200U */ |
193 | { USB_DEVICE(0x1371, 0x0002), USB_DEVICE_DATA(BOARD_503) }, | 173 | {USB_DEVICE(0x1371, 0x0002), USB_DEVICE_DATA(BOARD_503)}, |
194 | /* BenQ AWL400 USB stick */ | 174 | /* BenQ AWL400 USB stick */ |
195 | { USB_DEVICE(0x04a5, 0x9001), USB_DEVICE_DATA(BOARD_503) }, | 175 | {USB_DEVICE(0x04a5, 0x9001), USB_DEVICE_DATA(BOARD_503)}, |
196 | /* 3Com 3CRSHEW696 */ | 176 | /* 3Com 3CRSHEW696 */ |
197 | { USB_DEVICE(0x0506, 0x0a01), USB_DEVICE_DATA(BOARD_503) }, | 177 | {USB_DEVICE(0x0506, 0x0a01), USB_DEVICE_DATA(BOARD_503)}, |
198 | /* Siemens Santis ADSL WLAN USB adapter WLL 013 */ | 178 | /* Siemens Santis ADSL WLAN USB adapter WLL 013 */ |
199 | { USB_DEVICE(0x0681, 0x001b), USB_DEVICE_DATA(BOARD_503) }, | 179 | {USB_DEVICE(0x0681, 0x001b), USB_DEVICE_DATA(BOARD_503)}, |
200 | /* Belkin F5D6050, version 2 */ | 180 | /* Belkin F5D6050, version 2 */ |
201 | { USB_DEVICE(0x050d, 0x0050), USB_DEVICE_DATA(BOARD_503) }, | 181 | {USB_DEVICE(0x050d, 0x0050), USB_DEVICE_DATA(BOARD_503)}, |
202 | /* iBlitzz, BWU613 (not *B or *SB) */ | 182 | /* iBlitzz, BWU613 (not *B or *SB) */ |
203 | { USB_DEVICE(0x07b8, 0xb000), USB_DEVICE_DATA(BOARD_503) }, | 183 | {USB_DEVICE(0x07b8, 0xb000), USB_DEVICE_DATA(BOARD_503)}, |
204 | /* Gigabyte GN-WLBM101 */ | 184 | /* Gigabyte GN-WLBM101 */ |
205 | { USB_DEVICE(0x1044, 0x8003), USB_DEVICE_DATA(BOARD_503) }, | 185 | {USB_DEVICE(0x1044, 0x8003), USB_DEVICE_DATA(BOARD_503)}, |
206 | /* Planex GW-US11S */ | 186 | /* Planex GW-US11S */ |
207 | { USB_DEVICE(0x2019, 0x3220), USB_DEVICE_DATA(BOARD_503) }, | 187 | {USB_DEVICE(0x2019, 0x3220), USB_DEVICE_DATA(BOARD_503)}, |
208 | /* Internal WLAN adapter in h5[4,5]xx series iPAQs */ | 188 | /* Internal WLAN adapter in h5[4,5]xx series iPAQs */ |
209 | { USB_DEVICE(0x049f, 0x0032), USB_DEVICE_DATA(BOARD_503) }, | 189 | {USB_DEVICE(0x049f, 0x0032), USB_DEVICE_DATA(BOARD_503)}, |
210 | /* Corega Wireless LAN USB-11 mini */ | 190 | /* Corega Wireless LAN USB-11 mini */ |
211 | { USB_DEVICE(0x07aa, 0x0011), USB_DEVICE_DATA(BOARD_503) }, | 191 | {USB_DEVICE(0x07aa, 0x0011), USB_DEVICE_DATA(BOARD_503)}, |
212 | /* Corega Wireless LAN USB-11 mini2 */ | 192 | /* Corega Wireless LAN USB-11 mini2 */ |
213 | { USB_DEVICE(0x07aa, 0x0018), USB_DEVICE_DATA(BOARD_503) }, | 193 | {USB_DEVICE(0x07aa, 0x0018), USB_DEVICE_DATA(BOARD_503)}, |
214 | /* Uniden PCW100 */ | 194 | /* Uniden PCW100 */ |
215 | { USB_DEVICE(0x05dd, 0xff35), USB_DEVICE_DATA(BOARD_503) }, | 195 | {USB_DEVICE(0x05dd, 0xff35), USB_DEVICE_DATA(BOARD_503)}, |
216 | /* | 196 | /* |
217 | * at76c503-rfmd-acc | 197 | * at76c503-rfmd-acc |
218 | */ | 198 | */ |
219 | /* SMC2664W */ | 199 | /* SMC2664W */ |
220 | { USB_DEVICE(0x083a, 0x3501), USB_DEVICE_DATA(BOARD_503_ACC) }, | 200 | {USB_DEVICE(0x083a, 0x3501), USB_DEVICE_DATA(BOARD_503_ACC)}, |
221 | /* Belkin F5D6050, SMC2662W v2, SMC2662W-AR */ | 201 | /* Belkin F5D6050, SMC2662W v2, SMC2662W-AR */ |
222 | { USB_DEVICE(0x0d5c, 0xa002), USB_DEVICE_DATA(BOARD_503_ACC) }, | 202 | {USB_DEVICE(0x0d5c, 0xa002), USB_DEVICE_DATA(BOARD_503_ACC)}, |
223 | /* | 203 | /* |
224 | * at76c505-rfmd | 204 | * at76c505-rfmd |
225 | */ | 205 | */ |
226 | /* Generic AT76C505/RFMD */ | 206 | /* Generic AT76C505/RFMD */ |
227 | { USB_DEVICE(0x03eb, 0x7606), USB_DEVICE_DATA(BOARD_505) }, | 207 | {USB_DEVICE(0x03eb, 0x7606), USB_DEVICE_DATA(BOARD_505)}, |
228 | /* | 208 | /* |
229 | * at76c505-rfmd2958 | 209 | * at76c505-rfmd2958 |
230 | */ | 210 | */ |
231 | /* Generic AT76C505/RFMD, OvisLink WL-1130USB */ | 211 | /* Generic AT76C505/RFMD, OvisLink WL-1130USB */ |
232 | { USB_DEVICE(0x03eb, 0x7613), USB_DEVICE_DATA(BOARD_505_2958) }, | 212 | {USB_DEVICE(0x03eb, 0x7613), USB_DEVICE_DATA(BOARD_505_2958)}, |
233 | /* Fiberline FL-WL240U */ | 213 | /* Fiberline FL-WL240U */ |
234 | { USB_DEVICE(0x1371, 0x0014), USB_DEVICE_DATA(BOARD_505_2958) }, | 214 | {USB_DEVICE(0x1371, 0x0014), USB_DEVICE_DATA(BOARD_505_2958)}, |
235 | /* CNet CNUSB-611G */ | 215 | /* CNet CNUSB-611G */ |
236 | { USB_DEVICE(0x1371, 0x0013), USB_DEVICE_DATA(BOARD_505_2958) }, | 216 | {USB_DEVICE(0x1371, 0x0013), USB_DEVICE_DATA(BOARD_505_2958)}, |
237 | /* Linksys WUSB11 v2.8 */ | 217 | /* Linksys WUSB11 v2.8 */ |
238 | { USB_DEVICE(0x1915, 0x2233), USB_DEVICE_DATA(BOARD_505_2958) }, | 218 | {USB_DEVICE(0x1915, 0x2233), USB_DEVICE_DATA(BOARD_505_2958)}, |
239 | /* Xterasys XN-2122B, IBlitzz BWU613B/BWU613SB */ | 219 | /* Xterasys XN-2122B, IBlitzz BWU613B/BWU613SB */ |
240 | { USB_DEVICE(0x12fd, 0x1001), USB_DEVICE_DATA(BOARD_505_2958) }, | 220 | {USB_DEVICE(0x12fd, 0x1001), USB_DEVICE_DATA(BOARD_505_2958)}, |
241 | /* Corega WLAN USB Stick 11 */ | 221 | /* Corega WLAN USB Stick 11 */ |
242 | { USB_DEVICE(0x07aa, 0x7613), USB_DEVICE_DATA(BOARD_505_2958) }, | 222 | {USB_DEVICE(0x07aa, 0x7613), USB_DEVICE_DATA(BOARD_505_2958)}, |
243 | /* Microstar MSI Box MS6978 */ | 223 | /* Microstar MSI Box MS6978 */ |
244 | { USB_DEVICE(0x0db0, 0x1020), USB_DEVICE_DATA(BOARD_505_2958) }, | 224 | {USB_DEVICE(0x0db0, 0x1020), USB_DEVICE_DATA(BOARD_505_2958)}, |
245 | /* | 225 | /* |
246 | * at76c505a-rfmd2958 | 226 | * at76c505a-rfmd2958 |
247 | */ | 227 | */ |
248 | /* Generic AT76C505A device */ | 228 | /* Generic AT76C505A device */ |
249 | { USB_DEVICE(0x03eb, 0x7614), USB_DEVICE_DATA(BOARD_505A) }, | 229 | {USB_DEVICE(0x03eb, 0x7614), USB_DEVICE_DATA(BOARD_505A)}, |
250 | /* Generic AT76C505AS device */ | 230 | /* Generic AT76C505AS device */ |
251 | { USB_DEVICE(0x03eb, 0x7617), USB_DEVICE_DATA(BOARD_505A) }, | 231 | {USB_DEVICE(0x03eb, 0x7617), USB_DEVICE_DATA(BOARD_505A)}, |
252 | /* Siemens Gigaset USB WLAN Adapter 11 */ | 232 | /* Siemens Gigaset USB WLAN Adapter 11 */ |
253 | { USB_DEVICE(0x1690, 0x0701), USB_DEVICE_DATA(BOARD_505A) }, | 233 | {USB_DEVICE(0x1690, 0x0701), USB_DEVICE_DATA(BOARD_505A)}, |
234 | /* OQO Model 01+ Internal Wi-Fi */ | ||
235 | {USB_DEVICE(0x1557, 0x0002), USB_DEVICE_DATA(BOARD_505A)}, | ||
254 | /* | 236 | /* |
255 | * at76c505amx-rfmd | 237 | * at76c505amx-rfmd |
256 | */ | 238 | */ |
257 | /* Generic AT76C505AMX device */ | 239 | /* Generic AT76C505AMX device */ |
258 | { USB_DEVICE(0x03eb, 0x7615), USB_DEVICE_DATA(BOARD_505AMX) }, | 240 | {USB_DEVICE(0x03eb, 0x7615), USB_DEVICE_DATA(BOARD_505AMX)}, |
259 | { } | 241 | {} |
260 | }; | 242 | }; |
261 | 243 | ||
262 | MODULE_DEVICE_TABLE(usb, dev_table); | 244 | MODULE_DEVICE_TABLE(usb, dev_table); |
@@ -264,8 +246,26 @@ MODULE_DEVICE_TABLE(usb, dev_table); | |||
264 | /* Supported rates of this hardware, bit 7 marks basic rates */ | 246 | /* Supported rates of this hardware, bit 7 marks basic rates */ |
265 | static const u8 hw_rates[] = { 0x82, 0x84, 0x0b, 0x16 }; | 247 | static const u8 hw_rates[] = { 0x82, 0x84, 0x0b, 0x16 }; |
266 | 248 | ||
249 | /* Frequency of each channel in MHz */ | ||
250 | static const long channel_frequency[] = { | ||
251 | 2412, 2417, 2422, 2427, 2432, 2437, 2442, | ||
252 | 2447, 2452, 2457, 2462, 2467, 2472, 2484 | ||
253 | }; | ||
254 | |||
255 | #define NUM_CHANNELS ARRAY_SIZE(channel_frequency) | ||
256 | |||
267 | static const char *const preambles[] = { "long", "short", "auto" }; | 257 | static const char *const preambles[] = { "long", "short", "auto" }; |
268 | 258 | ||
259 | static const char *const mac_states[] = { | ||
260 | [MAC_INIT] = "INIT", | ||
261 | [MAC_SCANNING] = "SCANNING", | ||
262 | [MAC_AUTH] = "AUTH", | ||
263 | [MAC_ASSOC] = "ASSOC", | ||
264 | [MAC_JOINING] = "JOINING", | ||
265 | [MAC_CONNECTED] = "CONNECTED", | ||
266 | [MAC_OWN_IBSS] = "OWN_IBSS" | ||
267 | }; | ||
268 | |||
269 | /* Firmware download */ | 269 | /* Firmware download */ |
270 | /* DFU states */ | 270 | /* DFU states */ |
271 | #define STATE_IDLE 0x00 | 271 | #define STATE_IDLE 0x00 |
@@ -300,30 +300,17 @@ struct dfu_status { | |||
300 | 300 | ||
301 | static inline int at76_is_intersil(enum board_type board) | 301 | static inline int at76_is_intersil(enum board_type board) |
302 | { | 302 | { |
303 | if (board == BOARD_503_ISL3861 || board == BOARD_503_ISL3863) | 303 | return (board == BOARD_503_ISL3861 || board == BOARD_503_ISL3863); |
304 | return 1; | ||
305 | return 0; | ||
306 | } | 304 | } |
307 | 305 | ||
308 | static inline int at76_is_503rfmd(enum board_type board) | 306 | static inline int at76_is_503rfmd(enum board_type board) |
309 | { | 307 | { |
310 | if (board == BOARD_503 || board == BOARD_503_ACC) | 308 | return (board == BOARD_503 || board == BOARD_503_ACC); |
311 | return 1; | ||
312 | return 0; | ||
313 | } | ||
314 | |||
315 | static inline int at76_is_505(enum board_type board) | ||
316 | { | ||
317 | if (board == BOARD_505 || board == BOARD_505_2958) | ||
318 | return 1; | ||
319 | return 0; | ||
320 | } | 309 | } |
321 | 310 | ||
322 | static inline int at76_is_505a(enum board_type board) | 311 | static inline int at76_is_505a(enum board_type board) |
323 | { | 312 | { |
324 | if (board == BOARD_505A || board == BOARD_505AMX) | 313 | return (board == BOARD_505A || board == BOARD_505AMX); |
325 | return 1; | ||
326 | return 0; | ||
327 | } | 314 | } |
328 | 315 | ||
329 | /* Load a block of the first (internal) part of the firmware */ | 316 | /* Load a block of the first (internal) part of the firmware */ |
@@ -504,6 +491,41 @@ exit: | |||
504 | return ret; | 491 | return ret; |
505 | } | 492 | } |
506 | 493 | ||
494 | /* Report that the scan results are ready */ | ||
495 | static inline void at76_iwevent_scan_complete(struct net_device *netdev) | ||
496 | { | ||
497 | union iwreq_data wrqu; | ||
498 | wrqu.data.length = 0; | ||
499 | wrqu.data.flags = 0; | ||
500 | wireless_send_event(netdev, SIOCGIWSCAN, &wrqu, NULL); | ||
501 | at76_dbg(DBG_WE_EVENTS, "%s: SIOCGIWSCAN sent", netdev->name); | ||
502 | } | ||
503 | |||
504 | static inline void at76_iwevent_bss_connect(struct net_device *netdev, | ||
505 | u8 *bssid) | ||
506 | { | ||
507 | union iwreq_data wrqu; | ||
508 | wrqu.data.length = 0; | ||
509 | wrqu.data.flags = 0; | ||
510 | memcpy(wrqu.ap_addr.sa_data, bssid, ETH_ALEN); | ||
511 | wrqu.ap_addr.sa_family = ARPHRD_ETHER; | ||
512 | wireless_send_event(netdev, SIOCGIWAP, &wrqu, NULL); | ||
513 | at76_dbg(DBG_WE_EVENTS, "%s: %s: SIOCGIWAP sent", netdev->name, | ||
514 | __func__); | ||
515 | } | ||
516 | |||
517 | static inline void at76_iwevent_bss_disconnect(struct net_device *netdev) | ||
518 | { | ||
519 | union iwreq_data wrqu; | ||
520 | wrqu.data.length = 0; | ||
521 | wrqu.data.flags = 0; | ||
522 | memset(wrqu.ap_addr.sa_data, 0, ETH_ALEN); | ||
523 | wrqu.ap_addr.sa_family = ARPHRD_ETHER; | ||
524 | wireless_send_event(netdev, SIOCGIWAP, &wrqu, NULL); | ||
525 | at76_dbg(DBG_WE_EVENTS, "%s: %s: SIOCGIWAP sent", netdev->name, | ||
526 | __func__); | ||
527 | } | ||
528 | |||
507 | #define HEX2STR_BUFFERS 4 | 529 | #define HEX2STR_BUFFERS 4 |
508 | #define HEX2STR_MAX_LEN 64 | 530 | #define HEX2STR_MAX_LEN 64 |
509 | #define BIN2HEX(x) ((x) < 10 ? '0' + (x) : (x) + 'A' - 10) | 531 | #define BIN2HEX(x) ((x) < 10 ? '0' + (x) : (x) + 'A' - 10) |
@@ -575,6 +597,37 @@ static void at76_ledtrig_tx_activity(void) | |||
575 | mod_timer(&ledtrig_tx_timer, jiffies + HZ / 4); | 597 | mod_timer(&ledtrig_tx_timer, jiffies + HZ / 4); |
576 | } | 598 | } |
577 | 599 | ||
600 | /* Check if the given ssid is hidden */ | ||
601 | static inline int at76_is_hidden_ssid(u8 *ssid, int length) | ||
602 | { | ||
603 | static const u8 zeros[32]; | ||
604 | |||
605 | if (length == 0) | ||
606 | return 1; | ||
607 | |||
608 | if (length == 1 && ssid[0] == ' ') | ||
609 | return 1; | ||
610 | |||
611 | return (memcmp(ssid, zeros, length) == 0); | ||
612 | } | ||
613 | |||
614 | static inline void at76_free_bss_list(struct at76_priv *priv) | ||
615 | { | ||
616 | struct list_head *next, *ptr; | ||
617 | unsigned long flags; | ||
618 | |||
619 | spin_lock_irqsave(&priv->bss_list_spinlock, flags); | ||
620 | |||
621 | priv->curr_bss = NULL; | ||
622 | |||
623 | list_for_each_safe(ptr, next, &priv->bss_list) { | ||
624 | list_del(ptr); | ||
625 | kfree(list_entry(ptr, struct bss_info, list)); | ||
626 | } | ||
627 | |||
628 | spin_unlock_irqrestore(&priv->bss_list_spinlock, flags); | ||
629 | } | ||
630 | |||
578 | static int at76_remap(struct usb_device *udev) | 631 | static int at76_remap(struct usb_device *udev) |
579 | { | 632 | { |
580 | int ret; | 633 | int ret; |
@@ -598,7 +651,7 @@ static int at76_get_op_mode(struct usb_device *udev) | |||
598 | return -ENOMEM; | 651 | return -ENOMEM; |
599 | ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x33, | 652 | ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x33, |
600 | USB_TYPE_VENDOR | USB_DIR_IN | | 653 | USB_TYPE_VENDOR | USB_DIR_IN | |
601 | USB_RECIP_INTERFACE, 0x01, 0, &op_mode, 1, | 654 | USB_RECIP_INTERFACE, 0x01, 0, op_mode, 1, |
602 | USB_CTRL_GET_TIMEOUT); | 655 | USB_CTRL_GET_TIMEOUT); |
603 | saved = *op_mode; | 656 | saved = *op_mode; |
604 | kfree(op_mode); | 657 | kfree(op_mode); |
@@ -676,7 +729,7 @@ exit: | |||
676 | kfree(hwcfg); | 729 | kfree(hwcfg); |
677 | if (ret < 0) | 730 | if (ret < 0) |
678 | printk(KERN_ERR "%s: cannot get HW Config (error %d)\n", | 731 | printk(KERN_ERR "%s: cannot get HW Config (error %d)\n", |
679 | wiphy_name(priv->hw->wiphy), ret); | 732 | priv->netdev->name, ret); |
680 | 733 | ||
681 | return ret; | 734 | return ret; |
682 | } | 735 | } |
@@ -685,15 +738,15 @@ static struct reg_domain const *at76_get_reg_domain(u16 code) | |||
685 | { | 738 | { |
686 | int i; | 739 | int i; |
687 | static struct reg_domain const fd_tab[] = { | 740 | static struct reg_domain const fd_tab[] = { |
688 | { 0x10, "FCC (USA)", 0x7ff }, /* ch 1-11 */ | 741 | {0x10, "FCC (USA)", 0x7ff}, /* ch 1-11 */ |
689 | { 0x20, "IC (Canada)", 0x7ff }, /* ch 1-11 */ | 742 | {0x20, "IC (Canada)", 0x7ff}, /* ch 1-11 */ |
690 | { 0x30, "ETSI (most of Europe)", 0x1fff }, /* ch 1-13 */ | 743 | {0x30, "ETSI (most of Europe)", 0x1fff}, /* ch 1-13 */ |
691 | { 0x31, "Spain", 0x600 }, /* ch 10-11 */ | 744 | {0x31, "Spain", 0x600}, /* ch 10-11 */ |
692 | { 0x32, "France", 0x1e00 }, /* ch 10-13 */ | 745 | {0x32, "France", 0x1e00}, /* ch 10-13 */ |
693 | { 0x40, "MKK (Japan)", 0x2000 }, /* ch 14 */ | 746 | {0x40, "MKK (Japan)", 0x2000}, /* ch 14 */ |
694 | { 0x41, "MKK1 (Japan)", 0x3fff }, /* ch 1-14 */ | 747 | {0x41, "MKK1 (Japan)", 0x3fff}, /* ch 1-14 */ |
695 | { 0x50, "Israel", 0x3fc }, /* ch 3-9 */ | 748 | {0x50, "Israel", 0x3fc}, /* ch 3-9 */ |
696 | { 0x00, "<unknown>", 0xffffffff } /* ch 1-32 */ | 749 | {0x00, "<unknown>", 0xffffffff} /* ch 1-32 */ |
697 | }; | 750 | }; |
698 | 751 | ||
699 | /* Last entry is fallback for unknown domain code */ | 752 | /* Last entry is fallback for unknown domain code */ |
@@ -731,7 +784,7 @@ static inline int at76_get_cmd_status(struct usb_device *udev, u8 cmd) | |||
731 | ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x22, | 784 | ret = usb_control_msg(udev, usb_rcvctrlpipe(udev, 0), 0x22, |
732 | USB_TYPE_VENDOR | USB_DIR_IN | | 785 | USB_TYPE_VENDOR | USB_DIR_IN | |
733 | USB_RECIP_INTERFACE, cmd, 0, stat_buf, | 786 | USB_RECIP_INTERFACE, cmd, 0, stat_buf, |
734 | sizeof(stat_buf), USB_CTRL_GET_TIMEOUT); | 787 | 40, USB_CTRL_GET_TIMEOUT); |
735 | if (ret >= 0) | 788 | if (ret >= 0) |
736 | ret = stat_buf[5]; | 789 | ret = stat_buf[5]; |
737 | kfree(stat_buf); | 790 | kfree(stat_buf); |
@@ -739,24 +792,6 @@ static inline int at76_get_cmd_status(struct usb_device *udev, u8 cmd) | |||
739 | return ret; | 792 | return ret; |
740 | } | 793 | } |
741 | 794 | ||
742 | #define MAKE_CMD_CASE(c) case (c): return #c | ||
743 | |||
744 | static const char *at76_get_cmd_string(u8 cmd_status) | ||
745 | { | ||
746 | switch (cmd_status) { | ||
747 | MAKE_CMD_CASE(CMD_SET_MIB); | ||
748 | MAKE_CMD_CASE(CMD_GET_MIB); | ||
749 | MAKE_CMD_CASE(CMD_SCAN); | ||
750 | MAKE_CMD_CASE(CMD_JOIN); | ||
751 | MAKE_CMD_CASE(CMD_START_IBSS); | ||
752 | MAKE_CMD_CASE(CMD_RADIO_ON); | ||
753 | MAKE_CMD_CASE(CMD_RADIO_OFF); | ||
754 | MAKE_CMD_CASE(CMD_STARTUP); | ||
755 | } | ||
756 | |||
757 | return "UNKNOWN"; | ||
758 | } | ||
759 | |||
760 | static int at76_set_card_command(struct usb_device *udev, u8 cmd, void *buf, | 795 | static int at76_set_card_command(struct usb_device *udev, u8 cmd, void *buf, |
761 | int buf_size) | 796 | int buf_size) |
762 | { | 797 | { |
@@ -772,10 +807,6 @@ static int at76_set_card_command(struct usb_device *udev, u8 cmd, void *buf, | |||
772 | cmd_buf->size = cpu_to_le16(buf_size); | 807 | cmd_buf->size = cpu_to_le16(buf_size); |
773 | memcpy(cmd_buf->data, buf, buf_size); | 808 | memcpy(cmd_buf->data, buf, buf_size); |
774 | 809 | ||
775 | at76_dbg_dump(DBG_CMD, cmd_buf, sizeof(struct at76_command) + buf_size, | ||
776 | "issuing command %s (0x%02x)", | ||
777 | at76_get_cmd_string(cmd), cmd); | ||
778 | |||
779 | ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x0e, | 810 | ret = usb_control_msg(udev, usb_sndctrlpipe(udev, 0), 0x0e, |
780 | USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE, | 811 | USB_TYPE_VENDOR | USB_DIR_OUT | USB_RECIP_DEVICE, |
781 | 0, 0, cmd_buf, | 812 | 0, 0, cmd_buf, |
@@ -813,13 +844,13 @@ static int at76_wait_completion(struct at76_priv *priv, int cmd) | |||
813 | status = at76_get_cmd_status(priv->udev, cmd); | 844 | status = at76_get_cmd_status(priv->udev, cmd); |
814 | if (status < 0) { | 845 | if (status < 0) { |
815 | printk(KERN_ERR "%s: at76_get_cmd_status failed: %d\n", | 846 | printk(KERN_ERR "%s: at76_get_cmd_status failed: %d\n", |
816 | wiphy_name(priv->hw->wiphy), status); | 847 | priv->netdev->name, status); |
817 | break; | 848 | break; |
818 | } | 849 | } |
819 | 850 | ||
820 | at76_dbg(DBG_WAIT_COMPLETE, | 851 | at76_dbg(DBG_WAIT_COMPLETE, |
821 | "%s: Waiting on cmd %d, status = %d (%s)", | 852 | "%s: Waiting on cmd %d, status = %d (%s)", |
822 | wiphy_name(priv->hw->wiphy), cmd, status, | 853 | priv->netdev->name, cmd, status, |
823 | at76_get_cmd_status_string(status)); | 854 | at76_get_cmd_status_string(status)); |
824 | 855 | ||
825 | if (status != CMD_STATUS_IN_PROGRESS | 856 | if (status != CMD_STATUS_IN_PROGRESS |
@@ -830,7 +861,7 @@ static int at76_wait_completion(struct at76_priv *priv, int cmd) | |||
830 | if (time_after(jiffies, timeout)) { | 861 | if (time_after(jiffies, timeout)) { |
831 | printk(KERN_ERR | 862 | printk(KERN_ERR |
832 | "%s: completion timeout for command %d\n", | 863 | "%s: completion timeout for command %d\n", |
833 | wiphy_name(priv->hw->wiphy), cmd); | 864 | priv->netdev->name, cmd); |
834 | status = -ETIMEDOUT; | 865 | status = -ETIMEDOUT; |
835 | break; | 866 | break; |
836 | } | 867 | } |
@@ -853,7 +884,7 @@ static int at76_set_mib(struct at76_priv *priv, struct set_mib_buffer *buf) | |||
853 | if (ret != CMD_STATUS_COMPLETE) { | 884 | if (ret != CMD_STATUS_COMPLETE) { |
854 | printk(KERN_INFO | 885 | printk(KERN_INFO |
855 | "%s: set_mib: at76_wait_completion failed " | 886 | "%s: set_mib: at76_wait_completion failed " |
856 | "with %d\n", wiphy_name(priv->hw->wiphy), ret); | 887 | "with %d\n", priv->netdev->name, ret); |
857 | ret = -EIO; | 888 | ret = -EIO; |
858 | } | 889 | } |
859 | 890 | ||
@@ -874,7 +905,7 @@ static int at76_set_radio(struct at76_priv *priv, int enable) | |||
874 | ret = at76_set_card_command(priv->udev, cmd, NULL, 0); | 905 | ret = at76_set_card_command(priv->udev, cmd, NULL, 0); |
875 | if (ret < 0) | 906 | if (ret < 0) |
876 | printk(KERN_ERR "%s: at76_set_card_command(%d) failed: %d\n", | 907 | printk(KERN_ERR "%s: at76_set_card_command(%d) failed: %d\n", |
877 | wiphy_name(priv->hw->wiphy), cmd, ret); | 908 | priv->netdev->name, cmd, ret); |
878 | else | 909 | else |
879 | ret = 1; | 910 | ret = 1; |
880 | 911 | ||
@@ -895,7 +926,44 @@ static int at76_set_pm_mode(struct at76_priv *priv) | |||
895 | ret = at76_set_mib(priv, &priv->mib_buf); | 926 | ret = at76_set_mib(priv, &priv->mib_buf); |
896 | if (ret < 0) | 927 | if (ret < 0) |
897 | printk(KERN_ERR "%s: set_mib (pm_mode) failed: %d\n", | 928 | printk(KERN_ERR "%s: set_mib (pm_mode) failed: %d\n", |
898 | wiphy_name(priv->hw->wiphy), ret); | 929 | priv->netdev->name, ret); |
930 | |||
931 | return ret; | ||
932 | } | ||
933 | |||
934 | /* Set the association id for power save mode */ | ||
935 | static int at76_set_associd(struct at76_priv *priv, u16 id) | ||
936 | { | ||
937 | int ret = 0; | ||
938 | |||
939 | priv->mib_buf.type = MIB_MAC_MGMT; | ||
940 | priv->mib_buf.size = 2; | ||
941 | priv->mib_buf.index = offsetof(struct mib_mac_mgmt, station_id); | ||
942 | priv->mib_buf.data.word = cpu_to_le16(id); | ||
943 | |||
944 | ret = at76_set_mib(priv, &priv->mib_buf); | ||
945 | if (ret < 0) | ||
946 | printk(KERN_ERR "%s: set_mib (associd) failed: %d\n", | ||
947 | priv->netdev->name, ret); | ||
948 | |||
949 | return ret; | ||
950 | } | ||
951 | |||
952 | /* Set the listen interval for power save mode */ | ||
953 | static int at76_set_listen_interval(struct at76_priv *priv, u16 interval) | ||
954 | { | ||
955 | int ret = 0; | ||
956 | |||
957 | priv->mib_buf.type = MIB_MAC; | ||
958 | priv->mib_buf.size = 2; | ||
959 | priv->mib_buf.index = offsetof(struct mib_mac, listen_interval); | ||
960 | priv->mib_buf.data.word = cpu_to_le16(interval); | ||
961 | |||
962 | ret = at76_set_mib(priv, &priv->mib_buf); | ||
963 | if (ret < 0) | ||
964 | printk(KERN_ERR | ||
965 | "%s: set_mib (listen_interval) failed: %d\n", | ||
966 | priv->netdev->name, ret); | ||
899 | 967 | ||
900 | return ret; | 968 | return ret; |
901 | } | 969 | } |
@@ -912,7 +980,7 @@ static int at76_set_preamble(struct at76_priv *priv, u8 type) | |||
912 | ret = at76_set_mib(priv, &priv->mib_buf); | 980 | ret = at76_set_mib(priv, &priv->mib_buf); |
913 | if (ret < 0) | 981 | if (ret < 0) |
914 | printk(KERN_ERR "%s: set_mib (preamble) failed: %d\n", | 982 | printk(KERN_ERR "%s: set_mib (preamble) failed: %d\n", |
915 | wiphy_name(priv->hw->wiphy), ret); | 983 | priv->netdev->name, ret); |
916 | 984 | ||
917 | return ret; | 985 | return ret; |
918 | } | 986 | } |
@@ -929,7 +997,7 @@ static int at76_set_frag(struct at76_priv *priv, u16 size) | |||
929 | ret = at76_set_mib(priv, &priv->mib_buf); | 997 | ret = at76_set_mib(priv, &priv->mib_buf); |
930 | if (ret < 0) | 998 | if (ret < 0) |
931 | printk(KERN_ERR "%s: set_mib (frag threshold) failed: %d\n", | 999 | printk(KERN_ERR "%s: set_mib (frag threshold) failed: %d\n", |
932 | wiphy_name(priv->hw->wiphy), ret); | 1000 | priv->netdev->name, ret); |
933 | 1001 | ||
934 | return ret; | 1002 | return ret; |
935 | } | 1003 | } |
@@ -946,7 +1014,7 @@ static int at76_set_rts(struct at76_priv *priv, u16 size) | |||
946 | ret = at76_set_mib(priv, &priv->mib_buf); | 1014 | ret = at76_set_mib(priv, &priv->mib_buf); |
947 | if (ret < 0) | 1015 | if (ret < 0) |
948 | printk(KERN_ERR "%s: set_mib (rts) failed: %d\n", | 1016 | printk(KERN_ERR "%s: set_mib (rts) failed: %d\n", |
949 | wiphy_name(priv->hw->wiphy), ret); | 1017 | priv->netdev->name, ret); |
950 | 1018 | ||
951 | return ret; | 1019 | return ret; |
952 | } | 1020 | } |
@@ -963,41 +1031,24 @@ static int at76_set_autorate_fallback(struct at76_priv *priv, int onoff) | |||
963 | ret = at76_set_mib(priv, &priv->mib_buf); | 1031 | ret = at76_set_mib(priv, &priv->mib_buf); |
964 | if (ret < 0) | 1032 | if (ret < 0) |
965 | printk(KERN_ERR "%s: set_mib (autorate fallback) failed: %d\n", | 1033 | printk(KERN_ERR "%s: set_mib (autorate fallback) failed: %d\n", |
966 | wiphy_name(priv->hw->wiphy), ret); | 1034 | priv->netdev->name, ret); |
967 | 1035 | ||
968 | return ret; | 1036 | return ret; |
969 | } | 1037 | } |
970 | 1038 | ||
971 | static int at76_set_tkip_bssid(struct at76_priv *priv, const void *addr) | 1039 | static int at76_add_mac_address(struct at76_priv *priv, void *addr) |
972 | { | 1040 | { |
973 | int ret = 0; | 1041 | int ret = 0; |
974 | 1042 | ||
975 | priv->mib_buf.type = MIB_MAC_ENCRYPTION; | 1043 | priv->mib_buf.type = MIB_MAC_ADDR; |
976 | priv->mib_buf.size = ETH_ALEN; | 1044 | priv->mib_buf.size = ETH_ALEN; |
977 | priv->mib_buf.index = offsetof(struct mib_mac_encryption, tkip_bssid); | 1045 | priv->mib_buf.index = offsetof(struct mib_mac_addr, mac_addr); |
978 | memcpy(priv->mib_buf.data.addr, addr, ETH_ALEN); | 1046 | memcpy(priv->mib_buf.data.addr, addr, ETH_ALEN); |
979 | 1047 | ||
980 | ret = at76_set_mib(priv, &priv->mib_buf); | 1048 | ret = at76_set_mib(priv, &priv->mib_buf); |
981 | if (ret < 0) | 1049 | if (ret < 0) |
982 | printk(KERN_ERR "%s: set_mib (MAC_ENCRYPTION, tkip_bssid) failed: %d\n", | 1050 | printk(KERN_ERR "%s: set_mib (MAC_ADDR, mac_addr) failed: %d\n", |
983 | wiphy_name(priv->hw->wiphy), ret); | 1051 | priv->netdev->name, ret); |
984 | |||
985 | return ret; | ||
986 | } | ||
987 | |||
988 | static int at76_reset_rsc(struct at76_priv *priv) | ||
989 | { | ||
990 | int ret = 0; | ||
991 | |||
992 | priv->mib_buf.type = MIB_MAC_ENCRYPTION; | ||
993 | priv->mib_buf.size = 4 * 8; | ||
994 | priv->mib_buf.index = offsetof(struct mib_mac_encryption, key_rsc); | ||
995 | memset(priv->mib_buf.data.data, 0 , priv->mib_buf.size); | ||
996 | |||
997 | ret = at76_set_mib(priv, &priv->mib_buf); | ||
998 | if (ret < 0) | ||
999 | printk(KERN_ERR "%s: set_mib (MAC_ENCRYPTION, key_rsc) failed: %d\n", | ||
1000 | wiphy_name(priv->hw->wiphy), ret); | ||
1001 | 1052 | ||
1002 | return ret; | 1053 | return ret; |
1003 | } | 1054 | } |
@@ -1016,16 +1067,16 @@ static void at76_dump_mib_mac_addr(struct at76_priv *priv) | |||
1016 | sizeof(struct mib_mac_addr)); | 1067 | sizeof(struct mib_mac_addr)); |
1017 | if (ret < 0) { | 1068 | if (ret < 0) { |
1018 | printk(KERN_ERR "%s: at76_get_mib (MAC_ADDR) failed: %d\n", | 1069 | printk(KERN_ERR "%s: at76_get_mib (MAC_ADDR) failed: %d\n", |
1019 | wiphy_name(priv->hw->wiphy), ret); | 1070 | priv->netdev->name, ret); |
1020 | goto exit; | 1071 | goto exit; |
1021 | } | 1072 | } |
1022 | 1073 | ||
1023 | at76_dbg(DBG_MIB, "%s: MIB MAC_ADDR: mac_addr %s res 0x%x 0x%x", | 1074 | at76_dbg(DBG_MIB, "%s: MIB MAC_ADDR: mac_addr %s res 0x%x 0x%x", |
1024 | wiphy_name(priv->hw->wiphy), | 1075 | priv->netdev->name, |
1025 | mac2str(m->mac_addr), m->res[0], m->res[1]); | 1076 | mac2str(m->mac_addr), m->res[0], m->res[1]); |
1026 | for (i = 0; i < ARRAY_SIZE(m->group_addr); i++) | 1077 | for (i = 0; i < ARRAY_SIZE(m->group_addr); i++) |
1027 | at76_dbg(DBG_MIB, "%s: MIB MAC_ADDR: group addr %d: %s, " | 1078 | at76_dbg(DBG_MIB, "%s: MIB MAC_ADDR: group addr %d: %s, " |
1028 | "status %d", wiphy_name(priv->hw->wiphy), i, | 1079 | "status %d", priv->netdev->name, i, |
1029 | mac2str(m->group_addr[i]), m->group_addr_status[i]); | 1080 | mac2str(m->group_addr[i]), m->group_addr_status[i]); |
1030 | exit: | 1081 | exit: |
1031 | kfree(m); | 1082 | kfree(m); |
@@ -1045,13 +1096,13 @@ static void at76_dump_mib_mac_wep(struct at76_priv *priv) | |||
1045 | sizeof(struct mib_mac_wep)); | 1096 | sizeof(struct mib_mac_wep)); |
1046 | if (ret < 0) { | 1097 | if (ret < 0) { |
1047 | printk(KERN_ERR "%s: at76_get_mib (MAC_WEP) failed: %d\n", | 1098 | printk(KERN_ERR "%s: at76_get_mib (MAC_WEP) failed: %d\n", |
1048 | wiphy_name(priv->hw->wiphy), ret); | 1099 | priv->netdev->name, ret); |
1049 | goto exit; | 1100 | goto exit; |
1050 | } | 1101 | } |
1051 | 1102 | ||
1052 | at76_dbg(DBG_MIB, "%s: MIB MAC_WEP: priv_invoked %u def_key_id %u " | 1103 | at76_dbg(DBG_MIB, "%s: MIB MAC_WEP: priv_invoked %u def_key_id %u " |
1053 | "key_len %u excl_unencr %u wep_icv_err %u wep_excluded %u " | 1104 | "key_len %u excl_unencr %u wep_icv_err %u wep_excluded %u " |
1054 | "encr_level %u key %d", wiphy_name(priv->hw->wiphy), | 1105 | "encr_level %u key %d", priv->netdev->name, |
1055 | m->privacy_invoked, m->wep_default_key_id, | 1106 | m->privacy_invoked, m->wep_default_key_id, |
1056 | m->wep_key_mapping_len, m->exclude_unencrypted, | 1107 | m->wep_key_mapping_len, m->exclude_unencrypted, |
1057 | le32_to_cpu(m->wep_icv_error_count), | 1108 | le32_to_cpu(m->wep_icv_error_count), |
@@ -1063,55 +1114,12 @@ static void at76_dump_mib_mac_wep(struct at76_priv *priv) | |||
1063 | 1114 | ||
1064 | for (i = 0; i < WEP_KEYS; i++) | 1115 | for (i = 0; i < WEP_KEYS; i++) |
1065 | at76_dbg(DBG_MIB, "%s: MIB MAC_WEP: key %d: %s", | 1116 | at76_dbg(DBG_MIB, "%s: MIB MAC_WEP: key %d: %s", |
1066 | wiphy_name(priv->hw->wiphy), i, | 1117 | priv->netdev->name, i, |
1067 | hex2str(m->wep_default_keyvalue[i], key_len)); | 1118 | hex2str(m->wep_default_keyvalue[i], key_len)); |
1068 | exit: | 1119 | exit: |
1069 | kfree(m); | 1120 | kfree(m); |
1070 | } | 1121 | } |
1071 | 1122 | ||
1072 | static void at76_dump_mib_mac_encryption(struct at76_priv *priv) | ||
1073 | { | ||
1074 | int i; | ||
1075 | int ret; | ||
1076 | /*int key_len;*/ | ||
1077 | struct mib_mac_encryption *m; | ||
1078 | |||
1079 | m = kmalloc(sizeof(struct mib_mac_encryption), GFP_KERNEL); | ||
1080 | if (!m) | ||
1081 | return; | ||
1082 | |||
1083 | ret = at76_get_mib(priv->udev, MIB_MAC_ENCRYPTION, m, | ||
1084 | sizeof(struct mib_mac_encryption)); | ||
1085 | if (ret < 0) { | ||
1086 | dev_err(&priv->udev->dev, | ||
1087 | "%s: at76_get_mib (MAC_ENCRYPTION) failed: %d\n", | ||
1088 | wiphy_name(priv->hw->wiphy), ret); | ||
1089 | goto exit; | ||
1090 | } | ||
1091 | |||
1092 | at76_dbg(DBG_MIB, | ||
1093 | "%s: MIB MAC_ENCRYPTION: tkip_bssid %s priv_invoked %u " | ||
1094 | "ciph_key_id %u grp_key_id %u excl_unencr %u " | ||
1095 | "ckip_key_perm %u wep_icv_err %u wep_excluded %u", | ||
1096 | wiphy_name(priv->hw->wiphy), mac2str(m->tkip_bssid), | ||
1097 | m->privacy_invoked, m->cipher_default_key_id, | ||
1098 | m->cipher_default_group_key_id, m->exclude_unencrypted, | ||
1099 | m->ckip_key_permutation, | ||
1100 | le32_to_cpu(m->wep_icv_error_count), | ||
1101 | le32_to_cpu(m->wep_excluded_count)); | ||
1102 | |||
1103 | /*key_len = (m->encryption_level == 1) ? | ||
1104 | WEP_SMALL_KEY_LEN : WEP_LARGE_KEY_LEN;*/ | ||
1105 | |||
1106 | for (i = 0; i < CIPHER_KEYS; i++) | ||
1107 | at76_dbg(DBG_MIB, "%s: MIB MAC_ENCRYPTION: key %d: %s", | ||
1108 | wiphy_name(priv->hw->wiphy), i, | ||
1109 | hex2str(m->cipher_default_keyvalue[i], | ||
1110 | CIPHER_KEY_LEN)); | ||
1111 | exit: | ||
1112 | kfree(m); | ||
1113 | } | ||
1114 | |||
1115 | static void at76_dump_mib_mac_mgmt(struct at76_priv *priv) | 1123 | static void at76_dump_mib_mac_mgmt(struct at76_priv *priv) |
1116 | { | 1124 | { |
1117 | int ret; | 1125 | int ret; |
@@ -1125,7 +1133,7 @@ static void at76_dump_mib_mac_mgmt(struct at76_priv *priv) | |||
1125 | sizeof(struct mib_mac_mgmt)); | 1133 | sizeof(struct mib_mac_mgmt)); |
1126 | if (ret < 0) { | 1134 | if (ret < 0) { |
1127 | printk(KERN_ERR "%s: at76_get_mib (MAC_MGMT) failed: %d\n", | 1135 | printk(KERN_ERR "%s: at76_get_mib (MAC_MGMT) failed: %d\n", |
1128 | wiphy_name(priv->hw->wiphy), ret); | 1136 | priv->netdev->name, ret); |
1129 | goto exit; | 1137 | goto exit; |
1130 | } | 1138 | } |
1131 | 1139 | ||
@@ -1136,7 +1144,7 @@ static void at76_dump_mib_mac_mgmt(struct at76_priv *priv) | |||
1136 | "pm_mode %d ibss_change %d res %d " | 1144 | "pm_mode %d ibss_change %d res %d " |
1137 | "multi_domain_capability_implemented %d " | 1145 | "multi_domain_capability_implemented %d " |
1138 | "international_roaming %d country_string %.3s", | 1146 | "international_roaming %d country_string %.3s", |
1139 | wiphy_name(priv->hw->wiphy), le16_to_cpu(m->beacon_period), | 1147 | priv->netdev->name, le16_to_cpu(m->beacon_period), |
1140 | le16_to_cpu(m->CFP_max_duration), | 1148 | le16_to_cpu(m->CFP_max_duration), |
1141 | le16_to_cpu(m->medium_occupancy_limit), | 1149 | le16_to_cpu(m->medium_occupancy_limit), |
1142 | le16_to_cpu(m->station_id), le16_to_cpu(m->ATIM_window), | 1150 | le16_to_cpu(m->station_id), le16_to_cpu(m->ATIM_window), |
@@ -1161,7 +1169,7 @@ static void at76_dump_mib_mac(struct at76_priv *priv) | |||
1161 | ret = at76_get_mib(priv->udev, MIB_MAC, m, sizeof(struct mib_mac)); | 1169 | ret = at76_get_mib(priv->udev, MIB_MAC, m, sizeof(struct mib_mac)); |
1162 | if (ret < 0) { | 1170 | if (ret < 0) { |
1163 | printk(KERN_ERR "%s: at76_get_mib (MAC) failed: %d\n", | 1171 | printk(KERN_ERR "%s: at76_get_mib (MAC) failed: %d\n", |
1164 | wiphy_name(priv->hw->wiphy), ret); | 1172 | priv->netdev->name, ret); |
1165 | goto exit; | 1173 | goto exit; |
1166 | } | 1174 | } |
1167 | 1175 | ||
@@ -1171,8 +1179,7 @@ static void at76_dump_mib_mac(struct at76_priv *priv) | |||
1171 | "scan_type %d scan_channel %d probe_delay %u " | 1179 | "scan_type %d scan_channel %d probe_delay %u " |
1172 | "min_channel_time %d max_channel_time %d listen_int %d " | 1180 | "min_channel_time %d max_channel_time %d listen_int %d " |
1173 | "desired_ssid %s desired_bssid %s desired_bsstype %d", | 1181 | "desired_ssid %s desired_bssid %s desired_bsstype %d", |
1174 | wiphy_name(priv->hw->wiphy), | 1182 | priv->netdev->name, le32_to_cpu(m->max_tx_msdu_lifetime), |
1175 | le32_to_cpu(m->max_tx_msdu_lifetime), | ||
1176 | le32_to_cpu(m->max_rx_lifetime), | 1183 | le32_to_cpu(m->max_rx_lifetime), |
1177 | le16_to_cpu(m->frag_threshold), le16_to_cpu(m->rts_threshold), | 1184 | le16_to_cpu(m->frag_threshold), le16_to_cpu(m->rts_threshold), |
1178 | le16_to_cpu(m->cwmin), le16_to_cpu(m->cwmax), | 1185 | le16_to_cpu(m->cwmin), le16_to_cpu(m->cwmax), |
@@ -1198,7 +1205,7 @@ static void at76_dump_mib_phy(struct at76_priv *priv) | |||
1198 | ret = at76_get_mib(priv->udev, MIB_PHY, m, sizeof(struct mib_phy)); | 1205 | ret = at76_get_mib(priv->udev, MIB_PHY, m, sizeof(struct mib_phy)); |
1199 | if (ret < 0) { | 1206 | if (ret < 0) { |
1200 | printk(KERN_ERR "%s: at76_get_mib (PHY) failed: %d\n", | 1207 | printk(KERN_ERR "%s: at76_get_mib (PHY) failed: %d\n", |
1201 | wiphy_name(priv->hw->wiphy), ret); | 1208 | priv->netdev->name, ret); |
1202 | goto exit; | 1209 | goto exit; |
1203 | } | 1210 | } |
1204 | 1211 | ||
@@ -1207,7 +1214,7 @@ static void at76_dump_mib_phy(struct at76_priv *priv) | |||
1207 | "mpdu_max_length %d cca_mode_supported %d operation_rate_set " | 1214 | "mpdu_max_length %d cca_mode_supported %d operation_rate_set " |
1208 | "0x%x 0x%x 0x%x 0x%x channel_id %d current_cca_mode %d " | 1215 | "0x%x 0x%x 0x%x 0x%x channel_id %d current_cca_mode %d " |
1209 | "phy_type %d current_reg_domain %d", | 1216 | "phy_type %d current_reg_domain %d", |
1210 | wiphy_name(priv->hw->wiphy), le32_to_cpu(m->ed_threshold), | 1217 | priv->netdev->name, le32_to_cpu(m->ed_threshold), |
1211 | le16_to_cpu(m->slot_time), le16_to_cpu(m->sifs_time), | 1218 | le16_to_cpu(m->slot_time), le16_to_cpu(m->sifs_time), |
1212 | le16_to_cpu(m->preamble_length), | 1219 | le16_to_cpu(m->preamble_length), |
1213 | le16_to_cpu(m->plcp_header_length), | 1220 | le16_to_cpu(m->plcp_header_length), |
@@ -1231,14 +1238,13 @@ static void at76_dump_mib_local(struct at76_priv *priv) | |||
1231 | ret = at76_get_mib(priv->udev, MIB_LOCAL, m, sizeof(struct mib_local)); | 1238 | ret = at76_get_mib(priv->udev, MIB_LOCAL, m, sizeof(struct mib_local)); |
1232 | if (ret < 0) { | 1239 | if (ret < 0) { |
1233 | printk(KERN_ERR "%s: at76_get_mib (LOCAL) failed: %d\n", | 1240 | printk(KERN_ERR "%s: at76_get_mib (LOCAL) failed: %d\n", |
1234 | wiphy_name(priv->hw->wiphy), ret); | 1241 | priv->netdev->name, ret); |
1235 | goto exit; | 1242 | goto exit; |
1236 | } | 1243 | } |
1237 | 1244 | ||
1238 | at76_dbg(DBG_MIB, "%s: MIB LOCAL: beacon_enable %d " | 1245 | at76_dbg(DBG_MIB, "%s: MIB LOCAL: beacon_enable %d " |
1239 | "txautorate_fallback %d ssid_size %d promiscuous_mode %d " | 1246 | "txautorate_fallback %d ssid_size %d promiscuous_mode %d " |
1240 | "preamble_type %d", wiphy_name(priv->hw->wiphy), | 1247 | "preamble_type %d", priv->netdev->name, m->beacon_enable, |
1241 | m->beacon_enable, | ||
1242 | m->txautorate_fallback, m->ssid_size, m->promiscuous_mode, | 1248 | m->txautorate_fallback, m->ssid_size, m->promiscuous_mode, |
1243 | m->preamble_type); | 1249 | m->preamble_type); |
1244 | exit: | 1250 | exit: |
@@ -1257,21 +1263,118 @@ static void at76_dump_mib_mdomain(struct at76_priv *priv) | |||
1257 | sizeof(struct mib_mdomain)); | 1263 | sizeof(struct mib_mdomain)); |
1258 | if (ret < 0) { | 1264 | if (ret < 0) { |
1259 | printk(KERN_ERR "%s: at76_get_mib (MDOMAIN) failed: %d\n", | 1265 | printk(KERN_ERR "%s: at76_get_mib (MDOMAIN) failed: %d\n", |
1260 | wiphy_name(priv->hw->wiphy), ret); | 1266 | priv->netdev->name, ret); |
1261 | goto exit; | 1267 | goto exit; |
1262 | } | 1268 | } |
1263 | 1269 | ||
1264 | at76_dbg(DBG_MIB, "%s: MIB MDOMAIN: channel_list %s", | 1270 | at76_dbg(DBG_MIB, "%s: MIB MDOMAIN: channel_list %s", |
1265 | wiphy_name(priv->hw->wiphy), | 1271 | priv->netdev->name, |
1266 | hex2str(m->channel_list, sizeof(m->channel_list))); | 1272 | hex2str(m->channel_list, sizeof(m->channel_list))); |
1267 | 1273 | ||
1268 | at76_dbg(DBG_MIB, "%s: MIB MDOMAIN: tx_powerlevel %s", | 1274 | at76_dbg(DBG_MIB, "%s: MIB MDOMAIN: tx_powerlevel %s", |
1269 | wiphy_name(priv->hw->wiphy), | 1275 | priv->netdev->name, |
1270 | hex2str(m->tx_powerlevel, sizeof(m->tx_powerlevel))); | 1276 | hex2str(m->tx_powerlevel, sizeof(m->tx_powerlevel))); |
1271 | exit: | 1277 | exit: |
1272 | kfree(m); | 1278 | kfree(m); |
1273 | } | 1279 | } |
1274 | 1280 | ||
1281 | static int at76_get_current_bssid(struct at76_priv *priv) | ||
1282 | { | ||
1283 | int ret = 0; | ||
1284 | struct mib_mac_mgmt *mac_mgmt = | ||
1285 | kmalloc(sizeof(struct mib_mac_mgmt), GFP_KERNEL); | ||
1286 | |||
1287 | if (!mac_mgmt) { | ||
1288 | ret = -ENOMEM; | ||
1289 | goto exit; | ||
1290 | } | ||
1291 | |||
1292 | ret = at76_get_mib(priv->udev, MIB_MAC_MGMT, mac_mgmt, | ||
1293 | sizeof(struct mib_mac_mgmt)); | ||
1294 | if (ret < 0) { | ||
1295 | printk(KERN_ERR "%s: at76_get_mib failed: %d\n", | ||
1296 | priv->netdev->name, ret); | ||
1297 | goto error; | ||
1298 | } | ||
1299 | memcpy(priv->bssid, mac_mgmt->current_bssid, ETH_ALEN); | ||
1300 | printk(KERN_INFO "%s: using BSSID %s\n", priv->netdev->name, | ||
1301 | mac2str(priv->bssid)); | ||
1302 | error: | ||
1303 | kfree(mac_mgmt); | ||
1304 | exit: | ||
1305 | return ret; | ||
1306 | } | ||
1307 | |||
1308 | static int at76_get_current_channel(struct at76_priv *priv) | ||
1309 | { | ||
1310 | int ret = 0; | ||
1311 | struct mib_phy *phy = kmalloc(sizeof(struct mib_phy), GFP_KERNEL); | ||
1312 | |||
1313 | if (!phy) { | ||
1314 | ret = -ENOMEM; | ||
1315 | goto exit; | ||
1316 | } | ||
1317 | ret = at76_get_mib(priv->udev, MIB_PHY, phy, sizeof(struct mib_phy)); | ||
1318 | if (ret < 0) { | ||
1319 | printk(KERN_ERR "%s: at76_get_mib(MIB_PHY) failed: %d\n", | ||
1320 | priv->netdev->name, ret); | ||
1321 | goto error; | ||
1322 | } | ||
1323 | priv->channel = phy->channel_id; | ||
1324 | error: | ||
1325 | kfree(phy); | ||
1326 | exit: | ||
1327 | return ret; | ||
1328 | } | ||
1329 | |||
1330 | /** | ||
1331 | * at76_start_scan - start a scan | ||
1332 | * | ||
1333 | * @use_essid - use the configured ESSID in non passive mode | ||
1334 | */ | ||
1335 | static int at76_start_scan(struct at76_priv *priv, int use_essid) | ||
1336 | { | ||
1337 | struct at76_req_scan scan; | ||
1338 | |||
1339 | memset(&scan, 0, sizeof(struct at76_req_scan)); | ||
1340 | memset(scan.bssid, 0xff, ETH_ALEN); | ||
1341 | |||
1342 | if (use_essid) { | ||
1343 | memcpy(scan.essid, priv->essid, IW_ESSID_MAX_SIZE); | ||
1344 | scan.essid_size = priv->essid_size; | ||
1345 | } else | ||
1346 | scan.essid_size = 0; | ||
1347 | |||
1348 | /* jal: why should we start at a certain channel? we do scan the whole | ||
1349 | range allowed by reg domain. */ | ||
1350 | scan.channel = priv->channel; | ||
1351 | |||
1352 | /* atmelwlandriver differs between scan type 0 and 1 (active/passive) | ||
1353 | For ad-hoc mode, it uses type 0 only. */ | ||
1354 | scan.scan_type = priv->scan_mode; | ||
1355 | |||
1356 | /* INFO: For probe_delay, not multiplying by 1024 as this will be | ||
1357 | slightly less than min_channel_time | ||
1358 | (per spec: probe delay < min. channel time) */ | ||
1359 | scan.min_channel_time = cpu_to_le16(priv->scan_min_time); | ||
1360 | scan.max_channel_time = cpu_to_le16(priv->scan_max_time); | ||
1361 | scan.probe_delay = cpu_to_le16(priv->scan_min_time * 1000); | ||
1362 | scan.international_scan = 0; | ||
1363 | |||
1364 | /* other values are set to 0 for type 0 */ | ||
1365 | |||
1366 | at76_dbg(DBG_PROGRESS, "%s: start_scan (use_essid = %d, intl = %d, " | ||
1367 | "channel = %d, probe_delay = %d, scan_min_time = %d, " | ||
1368 | "scan_max_time = %d)", | ||
1369 | priv->netdev->name, use_essid, | ||
1370 | scan.international_scan, scan.channel, | ||
1371 | le16_to_cpu(scan.probe_delay), | ||
1372 | le16_to_cpu(scan.min_channel_time), | ||
1373 | le16_to_cpu(scan.max_channel_time)); | ||
1374 | |||
1375 | return at76_set_card_command(priv->udev, CMD_SCAN, &scan, sizeof(scan)); | ||
1376 | } | ||
1377 | |||
1275 | /* Enable monitor mode */ | 1378 | /* Enable monitor mode */ |
1276 | static int at76_start_monitor(struct at76_priv *priv) | 1379 | static int at76_start_monitor(struct at76_priv *priv) |
1277 | { | 1380 | { |
@@ -1292,6 +1395,86 @@ static int at76_start_monitor(struct at76_priv *priv) | |||
1292 | return ret; | 1395 | return ret; |
1293 | } | 1396 | } |
1294 | 1397 | ||
1398 | static int at76_start_ibss(struct at76_priv *priv) | ||
1399 | { | ||
1400 | struct at76_req_ibss bss; | ||
1401 | int ret; | ||
1402 | |||
1403 | WARN_ON(priv->mac_state != MAC_OWN_IBSS); | ||
1404 | if (priv->mac_state != MAC_OWN_IBSS) | ||
1405 | return -EBUSY; | ||
1406 | |||
1407 | memset(&bss, 0, sizeof(struct at76_req_ibss)); | ||
1408 | memset(bss.bssid, 0xff, ETH_ALEN); | ||
1409 | memcpy(bss.essid, priv->essid, IW_ESSID_MAX_SIZE); | ||
1410 | bss.essid_size = priv->essid_size; | ||
1411 | bss.bss_type = ADHOC_MODE; | ||
1412 | bss.channel = priv->channel; | ||
1413 | |||
1414 | ret = at76_set_card_command(priv->udev, CMD_START_IBSS, &bss, | ||
1415 | sizeof(struct at76_req_ibss)); | ||
1416 | if (ret < 0) { | ||
1417 | printk(KERN_ERR "%s: start_ibss failed: %d\n", | ||
1418 | priv->netdev->name, ret); | ||
1419 | return ret; | ||
1420 | } | ||
1421 | |||
1422 | ret = at76_wait_completion(priv, CMD_START_IBSS); | ||
1423 | if (ret != CMD_STATUS_COMPLETE) { | ||
1424 | printk(KERN_ERR "%s: start_ibss failed to complete, %d\n", | ||
1425 | priv->netdev->name, ret); | ||
1426 | return ret; | ||
1427 | } | ||
1428 | |||
1429 | ret = at76_get_current_bssid(priv); | ||
1430 | if (ret < 0) | ||
1431 | return ret; | ||
1432 | |||
1433 | ret = at76_get_current_channel(priv); | ||
1434 | if (ret < 0) | ||
1435 | return ret; | ||
1436 | |||
1437 | /* not sure what this is good for ??? */ | ||
1438 | priv->mib_buf.type = MIB_MAC_MGMT; | ||
1439 | priv->mib_buf.size = 1; | ||
1440 | priv->mib_buf.index = offsetof(struct mib_mac_mgmt, ibss_change); | ||
1441 | priv->mib_buf.data.byte = 0; | ||
1442 | |||
1443 | ret = at76_set_mib(priv, &priv->mib_buf); | ||
1444 | if (ret < 0) { | ||
1445 | printk(KERN_ERR "%s: set_mib (ibss change ok) failed: %d\n", | ||
1446 | priv->netdev->name, ret); | ||
1447 | return ret; | ||
1448 | } | ||
1449 | |||
1450 | netif_carrier_on(priv->netdev); | ||
1451 | netif_start_queue(priv->netdev); | ||
1452 | return 0; | ||
1453 | } | ||
1454 | |||
1455 | /* Request card to join BSS in managed or ad-hoc mode */ | ||
1456 | static int at76_join_bss(struct at76_priv *priv, struct bss_info *ptr) | ||
1457 | { | ||
1458 | struct at76_req_join join; | ||
1459 | |||
1460 | BUG_ON(!ptr); | ||
1461 | |||
1462 | memset(&join, 0, sizeof(struct at76_req_join)); | ||
1463 | memcpy(join.bssid, ptr->bssid, ETH_ALEN); | ||
1464 | memcpy(join.essid, ptr->ssid, ptr->ssid_len); | ||
1465 | join.essid_size = ptr->ssid_len; | ||
1466 | join.bss_type = (priv->iw_mode == IW_MODE_ADHOC ? 1 : 2); | ||
1467 | join.channel = ptr->channel; | ||
1468 | join.timeout = cpu_to_le16(2000); | ||
1469 | |||
1470 | at76_dbg(DBG_PROGRESS, | ||
1471 | "%s join addr %s ssid %s type %d ch %d timeout %d", | ||
1472 | priv->netdev->name, mac2str(join.bssid), join.essid, | ||
1473 | join.bss_type, join.channel, le16_to_cpu(join.timeout)); | ||
1474 | return at76_set_card_command(priv->udev, CMD_JOIN, &join, | ||
1475 | sizeof(struct at76_req_join)); | ||
1476 | } | ||
1477 | |||
1295 | /* Calculate padding from txbuf->wlength (which excludes the USB TX header), | 1478 | /* Calculate padding from txbuf->wlength (which excludes the USB TX header), |
1296 | likely to compensate a flaw in the AT76C503A USB part ... */ | 1479 | likely to compensate a flaw in the AT76C503A USB part ... */ |
1297 | static inline int at76_calc_padding(int wlen) | 1480 | static inline int at76_calc_padding(int wlen) |
@@ -1310,6 +1493,14 @@ static inline int at76_calc_padding(int wlen) | |||
1310 | return 0; | 1493 | return 0; |
1311 | } | 1494 | } |
1312 | 1495 | ||
1496 | /* We are doing a lot of things here in an interrupt. Need | ||
1497 | a bh handler (Watching TV with a TV card is probably | ||
1498 | a good test: if you see flickers, we are doing too much. | ||
1499 | Currently I do see flickers... even with our tasklet :-( ) | ||
1500 | Maybe because the bttv driver and usb-uhci use the same interrupt | ||
1501 | */ | ||
1502 | /* Or maybe because our BH handler is preempting bttv's BH handler.. BHs don't | ||
1503 | * solve everything.. (alex) */ | ||
1313 | static void at76_rx_callback(struct urb *urb) | 1504 | static void at76_rx_callback(struct urb *urb) |
1314 | { | 1505 | { |
1315 | struct at76_priv *priv = urb->context; | 1506 | struct at76_priv *priv = urb->context; |
@@ -1319,6 +1510,1758 @@ static void at76_rx_callback(struct urb *urb) | |||
1319 | return; | 1510 | return; |
1320 | } | 1511 | } |
1321 | 1512 | ||
1513 | static void at76_tx_callback(struct urb *urb) | ||
1514 | { | ||
1515 | struct at76_priv *priv = urb->context; | ||
1516 | struct net_device_stats *stats = &priv->stats; | ||
1517 | unsigned long flags; | ||
1518 | struct at76_tx_buffer *mgmt_buf; | ||
1519 | int ret; | ||
1520 | |||
1521 | switch (urb->status) { | ||
1522 | case 0: | ||
1523 | stats->tx_packets++; | ||
1524 | break; | ||
1525 | case -ENOENT: | ||
1526 | case -ECONNRESET: | ||
1527 | /* urb has been unlinked */ | ||
1528 | return; | ||
1529 | default: | ||
1530 | at76_dbg(DBG_URB, "%s - nonzero tx status received: %d", | ||
1531 | __func__, urb->status); | ||
1532 | stats->tx_errors++; | ||
1533 | break; | ||
1534 | } | ||
1535 | |||
1536 | spin_lock_irqsave(&priv->mgmt_spinlock, flags); | ||
1537 | mgmt_buf = priv->next_mgmt_bulk; | ||
1538 | priv->next_mgmt_bulk = NULL; | ||
1539 | spin_unlock_irqrestore(&priv->mgmt_spinlock, flags); | ||
1540 | |||
1541 | if (!mgmt_buf) { | ||
1542 | netif_wake_queue(priv->netdev); | ||
1543 | return; | ||
1544 | } | ||
1545 | |||
1546 | /* we don't copy the padding bytes, but add them | ||
1547 | to the length */ | ||
1548 | memcpy(priv->bulk_out_buffer, mgmt_buf, | ||
1549 | le16_to_cpu(mgmt_buf->wlength) + AT76_TX_HDRLEN); | ||
1550 | usb_fill_bulk_urb(priv->tx_urb, priv->udev, priv->tx_pipe, | ||
1551 | priv->bulk_out_buffer, | ||
1552 | le16_to_cpu(mgmt_buf->wlength) + mgmt_buf->padding + | ||
1553 | AT76_TX_HDRLEN, at76_tx_callback, priv); | ||
1554 | ret = usb_submit_urb(priv->tx_urb, GFP_ATOMIC); | ||
1555 | if (ret) | ||
1556 | printk(KERN_ERR "%s: error in tx submit urb: %d\n", | ||
1557 | priv->netdev->name, ret); | ||
1558 | |||
1559 | kfree(mgmt_buf); | ||
1560 | } | ||
1561 | |||
1562 | /* Send a management frame on bulk-out. txbuf->wlength must be set */ | ||
1563 | static int at76_tx_mgmt(struct at76_priv *priv, struct at76_tx_buffer *txbuf) | ||
1564 | { | ||
1565 | unsigned long flags; | ||
1566 | int ret; | ||
1567 | int urb_status; | ||
1568 | void *oldbuf = NULL; | ||
1569 | |||
1570 | netif_carrier_off(priv->netdev); /* stop netdev watchdog */ | ||
1571 | netif_stop_queue(priv->netdev); /* stop tx data packets */ | ||
1572 | |||
1573 | spin_lock_irqsave(&priv->mgmt_spinlock, flags); | ||
1574 | |||
1575 | urb_status = priv->tx_urb->status; | ||
1576 | if (urb_status == -EINPROGRESS) { | ||
1577 | /* cannot transmit now, put in the queue */ | ||
1578 | oldbuf = priv->next_mgmt_bulk; | ||
1579 | priv->next_mgmt_bulk = txbuf; | ||
1580 | } | ||
1581 | spin_unlock_irqrestore(&priv->mgmt_spinlock, flags); | ||
1582 | |||
1583 | if (oldbuf) { | ||
1584 | /* a data/mgmt tx is already pending in the URB - | ||
1585 | if this is no error in some situations we must | ||
1586 | implement a queue or silently modify the old msg */ | ||
1587 | printk(KERN_ERR "%s: removed pending mgmt buffer %s\n", | ||
1588 | priv->netdev->name, hex2str(oldbuf, 64)); | ||
1589 | kfree(oldbuf); | ||
1590 | return 0; | ||
1591 | } | ||
1592 | |||
1593 | txbuf->tx_rate = TX_RATE_1MBIT; | ||
1594 | txbuf->padding = at76_calc_padding(le16_to_cpu(txbuf->wlength)); | ||
1595 | memset(txbuf->reserved, 0, sizeof(txbuf->reserved)); | ||
1596 | |||
1597 | if (priv->next_mgmt_bulk) | ||
1598 | printk(KERN_ERR "%s: URB status %d, but mgmt is pending\n", | ||
1599 | priv->netdev->name, urb_status); | ||
1600 | |||
1601 | at76_dbg(DBG_TX_MGMT, | ||
1602 | "%s: tx mgmt: wlen %d tx_rate %d pad %d %s", | ||
1603 | priv->netdev->name, le16_to_cpu(txbuf->wlength), | ||
1604 | txbuf->tx_rate, txbuf->padding, | ||
1605 | hex2str(txbuf->packet, le16_to_cpu(txbuf->wlength))); | ||
1606 | |||
1607 | /* txbuf was not consumed above -> send mgmt msg immediately */ | ||
1608 | memcpy(priv->bulk_out_buffer, txbuf, | ||
1609 | le16_to_cpu(txbuf->wlength) + AT76_TX_HDRLEN); | ||
1610 | usb_fill_bulk_urb(priv->tx_urb, priv->udev, priv->tx_pipe, | ||
1611 | priv->bulk_out_buffer, | ||
1612 | le16_to_cpu(txbuf->wlength) + txbuf->padding + | ||
1613 | AT76_TX_HDRLEN, at76_tx_callback, priv); | ||
1614 | ret = usb_submit_urb(priv->tx_urb, GFP_ATOMIC); | ||
1615 | if (ret) | ||
1616 | printk(KERN_ERR "%s: error in tx submit urb: %d\n", | ||
1617 | priv->netdev->name, ret); | ||
1618 | |||
1619 | kfree(txbuf); | ||
1620 | |||
1621 | return ret; | ||
1622 | } | ||
1623 | |||
1624 | /* Go to the next information element */ | ||
1625 | static inline void next_ie(struct ieee80211_info_element **ie) | ||
1626 | { | ||
1627 | *ie = (struct ieee80211_info_element *)(&(*ie)->data[(*ie)->len]); | ||
1628 | } | ||
1629 | |||
1630 | /* Challenge is the challenge string (in TLV format) | ||
1631 | we got with seq_nr 2 for shared secret authentication only and | ||
1632 | send in seq_nr 3 WEP encrypted to prove we have the correct WEP key; | ||
1633 | otherwise it is NULL */ | ||
1634 | static int at76_auth_req(struct at76_priv *priv, struct bss_info *bss, | ||
1635 | int seq_nr, struct ieee80211_info_element *challenge) | ||
1636 | { | ||
1637 | struct at76_tx_buffer *tx_buffer; | ||
1638 | struct ieee80211_hdr_3addr *mgmt; | ||
1639 | struct ieee80211_auth *req; | ||
1640 | int buf_len = (seq_nr != 3 ? AUTH_FRAME_SIZE : | ||
1641 | AUTH_FRAME_SIZE + 1 + 1 + challenge->len); | ||
1642 | |||
1643 | BUG_ON(!bss); | ||
1644 | BUG_ON(seq_nr == 3 && !challenge); | ||
1645 | tx_buffer = kmalloc(buf_len + MAX_PADDING_SIZE, GFP_ATOMIC); | ||
1646 | if (!tx_buffer) | ||
1647 | return -ENOMEM; | ||
1648 | |||
1649 | req = (struct ieee80211_auth *)tx_buffer->packet; | ||
1650 | mgmt = &req->header; | ||
1651 | |||
1652 | /* make wireless header */ | ||
1653 | /* first auth msg is not encrypted, only the second (seq_nr == 3) */ | ||
1654 | mgmt->frame_ctl = | ||
1655 | cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_AUTH | | ||
1656 | (seq_nr == 3 ? IEEE80211_FCTL_PROTECTED : 0)); | ||
1657 | |||
1658 | mgmt->duration_id = cpu_to_le16(0x8000); | ||
1659 | memcpy(mgmt->addr1, bss->bssid, ETH_ALEN); | ||
1660 | memcpy(mgmt->addr2, priv->netdev->dev_addr, ETH_ALEN); | ||
1661 | memcpy(mgmt->addr3, bss->bssid, ETH_ALEN); | ||
1662 | mgmt->seq_ctl = cpu_to_le16(0); | ||
1663 | |||
1664 | req->algorithm = cpu_to_le16(priv->auth_mode); | ||
1665 | req->transaction = cpu_to_le16(seq_nr); | ||
1666 | req->status = cpu_to_le16(0); | ||
1667 | |||
1668 | if (seq_nr == 3) | ||
1669 | memcpy(req->info_element, challenge, 1 + 1 + challenge->len); | ||
1670 | |||
1671 | /* init. at76_priv tx header */ | ||
1672 | tx_buffer->wlength = cpu_to_le16(buf_len - AT76_TX_HDRLEN); | ||
1673 | at76_dbg(DBG_TX_MGMT, "%s: AuthReq bssid %s alg %d seq_nr %d", | ||
1674 | priv->netdev->name, mac2str(mgmt->addr3), | ||
1675 | le16_to_cpu(req->algorithm), le16_to_cpu(req->transaction)); | ||
1676 | if (seq_nr == 3) | ||
1677 | at76_dbg(DBG_TX_MGMT, "%s: AuthReq challenge: %s ...", | ||
1678 | priv->netdev->name, hex2str(req->info_element, 18)); | ||
1679 | |||
1680 | /* either send immediately (if no data tx is pending | ||
1681 | or put it in pending list */ | ||
1682 | return at76_tx_mgmt(priv, tx_buffer); | ||
1683 | } | ||
1684 | |||
1685 | static int at76_assoc_req(struct at76_priv *priv, struct bss_info *bss) | ||
1686 | { | ||
1687 | struct at76_tx_buffer *tx_buffer; | ||
1688 | struct ieee80211_hdr_3addr *mgmt; | ||
1689 | struct ieee80211_assoc_request *req; | ||
1690 | struct ieee80211_info_element *ie; | ||
1691 | char *essid; | ||
1692 | int essid_len; | ||
1693 | u16 capa; | ||
1694 | |||
1695 | BUG_ON(!bss); | ||
1696 | |||
1697 | tx_buffer = kmalloc(ASSOCREQ_MAX_SIZE + MAX_PADDING_SIZE, GFP_ATOMIC); | ||
1698 | if (!tx_buffer) | ||
1699 | return -ENOMEM; | ||
1700 | |||
1701 | req = (struct ieee80211_assoc_request *)tx_buffer->packet; | ||
1702 | mgmt = &req->header; | ||
1703 | ie = req->info_element; | ||
1704 | |||
1705 | /* make wireless header */ | ||
1706 | mgmt->frame_ctl = cpu_to_le16(IEEE80211_FTYPE_MGMT | | ||
1707 | IEEE80211_STYPE_ASSOC_REQ); | ||
1708 | |||
1709 | mgmt->duration_id = cpu_to_le16(0x8000); | ||
1710 | memcpy(mgmt->addr1, bss->bssid, ETH_ALEN); | ||
1711 | memcpy(mgmt->addr2, priv->netdev->dev_addr, ETH_ALEN); | ||
1712 | memcpy(mgmt->addr3, bss->bssid, ETH_ALEN); | ||
1713 | mgmt->seq_ctl = cpu_to_le16(0); | ||
1714 | |||
1715 | /* we must set the Privacy bit in the capabilities to assure an | ||
1716 | Agere-based AP with optional WEP transmits encrypted frames | ||
1717 | to us. AP only set the Privacy bit in their capabilities | ||
1718 | if WEP is mandatory in the BSS! */ | ||
1719 | capa = bss->capa; | ||
1720 | if (priv->wep_enabled) | ||
1721 | capa |= WLAN_CAPABILITY_PRIVACY; | ||
1722 | if (priv->preamble_type != PREAMBLE_TYPE_LONG) | ||
1723 | capa |= WLAN_CAPABILITY_SHORT_PREAMBLE; | ||
1724 | req->capability = cpu_to_le16(capa); | ||
1725 | |||
1726 | req->listen_interval = cpu_to_le16(2 * bss->beacon_interval); | ||
1727 | |||
1728 | /* write TLV data elements */ | ||
1729 | |||
1730 | ie->id = MFIE_TYPE_SSID; | ||
1731 | ie->len = bss->ssid_len; | ||
1732 | memcpy(ie->data, bss->ssid, bss->ssid_len); | ||
1733 | next_ie(&ie); | ||
1734 | |||
1735 | ie->id = MFIE_TYPE_RATES; | ||
1736 | ie->len = sizeof(hw_rates); | ||
1737 | memcpy(ie->data, hw_rates, sizeof(hw_rates)); | ||
1738 | next_ie(&ie); /* ie points behind the supp_rates field */ | ||
1739 | |||
1740 | /* init. at76_priv tx header */ | ||
1741 | tx_buffer->wlength = cpu_to_le16((u8 *)ie - (u8 *)mgmt); | ||
1742 | |||
1743 | ie = req->info_element; | ||
1744 | essid = ie->data; | ||
1745 | essid_len = min_t(int, IW_ESSID_MAX_SIZE, ie->len); | ||
1746 | |||
1747 | next_ie(&ie); /* points to IE of rates now */ | ||
1748 | at76_dbg(DBG_TX_MGMT, | ||
1749 | "%s: AssocReq bssid %s capa 0x%04x ssid %.*s rates %s", | ||
1750 | priv->netdev->name, mac2str(mgmt->addr3), | ||
1751 | le16_to_cpu(req->capability), essid_len, essid, | ||
1752 | hex2str(ie->data, ie->len)); | ||
1753 | |||
1754 | /* either send immediately (if no data tx is pending | ||
1755 | or put it in pending list */ | ||
1756 | return at76_tx_mgmt(priv, tx_buffer); | ||
1757 | } | ||
1758 | |||
1759 | /* We got to check the bss_list for old entries */ | ||
1760 | static void at76_bss_list_timeout(unsigned long par) | ||
1761 | { | ||
1762 | struct at76_priv *priv = (struct at76_priv *)par; | ||
1763 | unsigned long flags; | ||
1764 | struct list_head *lptr, *nptr; | ||
1765 | struct bss_info *ptr; | ||
1766 | |||
1767 | spin_lock_irqsave(&priv->bss_list_spinlock, flags); | ||
1768 | |||
1769 | list_for_each_safe(lptr, nptr, &priv->bss_list) { | ||
1770 | |||
1771 | ptr = list_entry(lptr, struct bss_info, list); | ||
1772 | |||
1773 | if (ptr != priv->curr_bss | ||
1774 | && time_after(jiffies, ptr->last_rx + BSS_LIST_TIMEOUT)) { | ||
1775 | at76_dbg(DBG_BSS_TABLE_RM, | ||
1776 | "%s: bss_list: removing old BSS %s ch %d", | ||
1777 | priv->netdev->name, mac2str(ptr->bssid), | ||
1778 | ptr->channel); | ||
1779 | list_del(&ptr->list); | ||
1780 | kfree(ptr); | ||
1781 | } | ||
1782 | } | ||
1783 | spin_unlock_irqrestore(&priv->bss_list_spinlock, flags); | ||
1784 | /* restart the timer */ | ||
1785 | mod_timer(&priv->bss_list_timer, jiffies + BSS_LIST_TIMEOUT); | ||
1786 | } | ||
1787 | |||
1788 | static inline void at76_set_mac_state(struct at76_priv *priv, | ||
1789 | enum mac_state mac_state) | ||
1790 | { | ||
1791 | at76_dbg(DBG_MAC_STATE, "%s state: %s", priv->netdev->name, | ||
1792 | mac_states[mac_state]); | ||
1793 | priv->mac_state = mac_state; | ||
1794 | } | ||
1795 | |||
1796 | static void at76_dump_bss_table(struct at76_priv *priv) | ||
1797 | { | ||
1798 | struct bss_info *ptr; | ||
1799 | unsigned long flags; | ||
1800 | struct list_head *lptr; | ||
1801 | |||
1802 | spin_lock_irqsave(&priv->bss_list_spinlock, flags); | ||
1803 | |||
1804 | at76_dbg(DBG_BSS_TABLE, "%s BSS table (curr=%p):", priv->netdev->name, | ||
1805 | priv->curr_bss); | ||
1806 | |||
1807 | list_for_each(lptr, &priv->bss_list) { | ||
1808 | ptr = list_entry(lptr, struct bss_info, list); | ||
1809 | at76_dbg(DBG_BSS_TABLE, "0x%p: bssid %s channel %d ssid %.*s " | ||
1810 | "(%s) capa 0x%04x rates %s rssi %d link %d noise %d", | ||
1811 | ptr, mac2str(ptr->bssid), ptr->channel, ptr->ssid_len, | ||
1812 | ptr->ssid, hex2str(ptr->ssid, ptr->ssid_len), | ||
1813 | ptr->capa, hex2str(ptr->rates, ptr->rates_len), | ||
1814 | ptr->rssi, ptr->link_qual, ptr->noise_level); | ||
1815 | } | ||
1816 | spin_unlock_irqrestore(&priv->bss_list_spinlock, flags); | ||
1817 | } | ||
1818 | |||
1819 | /* Called upon successful association to mark interface as connected */ | ||
1820 | static void at76_work_assoc_done(struct work_struct *work) | ||
1821 | { | ||
1822 | struct at76_priv *priv = container_of(work, struct at76_priv, | ||
1823 | work_assoc_done); | ||
1824 | |||
1825 | mutex_lock(&priv->mtx); | ||
1826 | |||
1827 | WARN_ON(priv->mac_state != MAC_ASSOC); | ||
1828 | WARN_ON(!priv->curr_bss); | ||
1829 | if (priv->mac_state != MAC_ASSOC || !priv->curr_bss) | ||
1830 | goto exit; | ||
1831 | |||
1832 | if (priv->iw_mode == IW_MODE_INFRA) { | ||
1833 | if (priv->pm_mode != AT76_PM_OFF) { | ||
1834 | /* calculate the listen interval in units of | ||
1835 | beacon intervals of the curr_bss */ | ||
1836 | u32 pm_period_beacon = (priv->pm_period >> 10) / | ||
1837 | priv->curr_bss->beacon_interval; | ||
1838 | |||
1839 | pm_period_beacon = max(pm_period_beacon, 2u); | ||
1840 | pm_period_beacon = min(pm_period_beacon, 0xffffu); | ||
1841 | |||
1842 | at76_dbg(DBG_PM, | ||
1843 | "%s: pm_mode %d assoc id 0x%x listen int %d", | ||
1844 | priv->netdev->name, priv->pm_mode, | ||
1845 | priv->assoc_id, pm_period_beacon); | ||
1846 | |||
1847 | at76_set_associd(priv, priv->assoc_id); | ||
1848 | at76_set_listen_interval(priv, (u16)pm_period_beacon); | ||
1849 | } | ||
1850 | schedule_delayed_work(&priv->dwork_beacon, BEACON_TIMEOUT); | ||
1851 | } | ||
1852 | at76_set_pm_mode(priv); | ||
1853 | |||
1854 | netif_carrier_on(priv->netdev); | ||
1855 | netif_wake_queue(priv->netdev); | ||
1856 | at76_set_mac_state(priv, MAC_CONNECTED); | ||
1857 | at76_iwevent_bss_connect(priv->netdev, priv->curr_bss->bssid); | ||
1858 | at76_dbg(DBG_PROGRESS, "%s: connected to BSSID %s", | ||
1859 | priv->netdev->name, mac2str(priv->curr_bss->bssid)); | ||
1860 | |||
1861 | exit: | ||
1862 | mutex_unlock(&priv->mtx); | ||
1863 | } | ||
1864 | |||
1865 | /* We only store the new mac address in netdev struct, | ||
1866 | it gets set when the netdev is opened. */ | ||
1867 | static int at76_set_mac_address(struct net_device *netdev, void *addr) | ||
1868 | { | ||
1869 | struct sockaddr *mac = addr; | ||
1870 | memcpy(netdev->dev_addr, mac->sa_data, ETH_ALEN); | ||
1871 | return 1; | ||
1872 | } | ||
1873 | |||
1874 | static struct net_device_stats *at76_get_stats(struct net_device *netdev) | ||
1875 | { | ||
1876 | struct at76_priv *priv = netdev_priv(netdev); | ||
1877 | return &priv->stats; | ||
1878 | } | ||
1879 | |||
1880 | static struct iw_statistics *at76_get_wireless_stats(struct net_device *netdev) | ||
1881 | { | ||
1882 | struct at76_priv *priv = netdev_priv(netdev); | ||
1883 | |||
1884 | at76_dbg(DBG_IOCTL, "RETURN qual %d level %d noise %d updated %d", | ||
1885 | priv->wstats.qual.qual, priv->wstats.qual.level, | ||
1886 | priv->wstats.qual.noise, priv->wstats.qual.updated); | ||
1887 | |||
1888 | return &priv->wstats; | ||
1889 | } | ||
1890 | |||
1891 | static void at76_set_multicast(struct net_device *netdev) | ||
1892 | { | ||
1893 | struct at76_priv *priv = netdev_priv(netdev); | ||
1894 | int promisc; | ||
1895 | |||
1896 | promisc = ((netdev->flags & IFF_PROMISC) != 0); | ||
1897 | if (promisc != priv->promisc) { | ||
1898 | /* This gets called in interrupt, must reschedule */ | ||
1899 | priv->promisc = promisc; | ||
1900 | schedule_work(&priv->work_set_promisc); | ||
1901 | } | ||
1902 | } | ||
1903 | |||
1904 | /* Stop all network activity, flush all pending tasks */ | ||
1905 | static void at76_quiesce(struct at76_priv *priv) | ||
1906 | { | ||
1907 | unsigned long flags; | ||
1908 | |||
1909 | netif_stop_queue(priv->netdev); | ||
1910 | netif_carrier_off(priv->netdev); | ||
1911 | |||
1912 | at76_set_mac_state(priv, MAC_INIT); | ||
1913 | |||
1914 | cancel_delayed_work(&priv->dwork_get_scan); | ||
1915 | cancel_delayed_work(&priv->dwork_beacon); | ||
1916 | cancel_delayed_work(&priv->dwork_auth); | ||
1917 | cancel_delayed_work(&priv->dwork_assoc); | ||
1918 | cancel_delayed_work(&priv->dwork_restart); | ||
1919 | |||
1920 | spin_lock_irqsave(&priv->mgmt_spinlock, flags); | ||
1921 | kfree(priv->next_mgmt_bulk); | ||
1922 | priv->next_mgmt_bulk = NULL; | ||
1923 | spin_unlock_irqrestore(&priv->mgmt_spinlock, flags); | ||
1924 | } | ||
1925 | |||
1926 | /******************************************************************************* | ||
1927 | * at76_priv implementations of iw_handler functions: | ||
1928 | */ | ||
1929 | static int at76_iw_handler_commit(struct net_device *netdev, | ||
1930 | struct iw_request_info *info, | ||
1931 | void *null, char *extra) | ||
1932 | { | ||
1933 | struct at76_priv *priv = netdev_priv(netdev); | ||
1934 | |||
1935 | at76_dbg(DBG_IOCTL, "%s %s: restarting the device", netdev->name, | ||
1936 | __func__); | ||
1937 | |||
1938 | if (priv->mac_state != MAC_INIT) | ||
1939 | at76_quiesce(priv); | ||
1940 | |||
1941 | /* Wait half second before the restart to process subsequent | ||
1942 | * requests from the same iwconfig in a single restart */ | ||
1943 | schedule_delayed_work(&priv->dwork_restart, HZ / 2); | ||
1944 | |||
1945 | return 0; | ||
1946 | } | ||
1947 | |||
1948 | static int at76_iw_handler_get_name(struct net_device *netdev, | ||
1949 | struct iw_request_info *info, | ||
1950 | char *name, char *extra) | ||
1951 | { | ||
1952 | strcpy(name, "IEEE 802.11b"); | ||
1953 | at76_dbg(DBG_IOCTL, "%s: SIOCGIWNAME - name %s", netdev->name, name); | ||
1954 | return 0; | ||
1955 | } | ||
1956 | |||
1957 | static int at76_iw_handler_set_freq(struct net_device *netdev, | ||
1958 | struct iw_request_info *info, | ||
1959 | struct iw_freq *freq, char *extra) | ||
1960 | { | ||
1961 | struct at76_priv *priv = netdev_priv(netdev); | ||
1962 | int chan = -1; | ||
1963 | int ret = -EIWCOMMIT; | ||
1964 | at76_dbg(DBG_IOCTL, "%s: SIOCSIWFREQ - freq.m %d freq.e %d", | ||
1965 | netdev->name, freq->m, freq->e); | ||
1966 | |||
1967 | if ((freq->e == 0) && (freq->m <= 1000)) | ||
1968 | /* Setting by channel number */ | ||
1969 | chan = freq->m; | ||
1970 | else { | ||
1971 | /* Setting by frequency - search the table */ | ||
1972 | int mult = 1; | ||
1973 | int i; | ||
1974 | |||
1975 | for (i = 0; i < (6 - freq->e); i++) | ||
1976 | mult *= 10; | ||
1977 | |||
1978 | for (i = 0; i < NUM_CHANNELS; i++) { | ||
1979 | if (freq->m == (channel_frequency[i] * mult)) | ||
1980 | chan = i + 1; | ||
1981 | } | ||
1982 | } | ||
1983 | |||
1984 | if (chan < 1 || !priv->domain) | ||
1985 | /* non-positive channels are invalid | ||
1986 | * we need a domain info to set the channel | ||
1987 | * either that or an invalid frequency was | ||
1988 | * provided by the user */ | ||
1989 | ret = -EINVAL; | ||
1990 | else if (!(priv->domain->channel_map & (1 << (chan - 1)))) { | ||
1991 | printk(KERN_INFO "%s: channel %d not allowed for domain %s\n", | ||
1992 | priv->netdev->name, chan, priv->domain->name); | ||
1993 | ret = -EINVAL; | ||
1994 | } | ||
1995 | |||
1996 | if (ret == -EIWCOMMIT) { | ||
1997 | priv->channel = chan; | ||
1998 | at76_dbg(DBG_IOCTL, "%s: SIOCSIWFREQ - ch %d", netdev->name, | ||
1999 | chan); | ||
2000 | } | ||
2001 | |||
2002 | return ret; | ||
2003 | } | ||
2004 | |||
2005 | static int at76_iw_handler_get_freq(struct net_device *netdev, | ||
2006 | struct iw_request_info *info, | ||
2007 | struct iw_freq *freq, char *extra) | ||
2008 | { | ||
2009 | struct at76_priv *priv = netdev_priv(netdev); | ||
2010 | |||
2011 | freq->m = priv->channel; | ||
2012 | freq->e = 0; | ||
2013 | |||
2014 | if (priv->channel) | ||
2015 | at76_dbg(DBG_IOCTL, "%s: SIOCGIWFREQ - freq %ld x 10e%d", | ||
2016 | netdev->name, channel_frequency[priv->channel - 1], 6); | ||
2017 | |||
2018 | at76_dbg(DBG_IOCTL, "%s: SIOCGIWFREQ - ch %d", netdev->name, | ||
2019 | priv->channel); | ||
2020 | |||
2021 | return 0; | ||
2022 | } | ||
2023 | |||
2024 | static int at76_iw_handler_set_mode(struct net_device *netdev, | ||
2025 | struct iw_request_info *info, | ||
2026 | __u32 *mode, char *extra) | ||
2027 | { | ||
2028 | struct at76_priv *priv = netdev_priv(netdev); | ||
2029 | |||
2030 | at76_dbg(DBG_IOCTL, "%s: SIOCSIWMODE - %d", netdev->name, *mode); | ||
2031 | |||
2032 | if ((*mode != IW_MODE_ADHOC) && (*mode != IW_MODE_INFRA) && | ||
2033 | (*mode != IW_MODE_MONITOR)) | ||
2034 | return -EINVAL; | ||
2035 | |||
2036 | priv->iw_mode = *mode; | ||
2037 | if (priv->iw_mode != IW_MODE_INFRA) | ||
2038 | priv->pm_mode = AT76_PM_OFF; | ||
2039 | |||
2040 | return -EIWCOMMIT; | ||
2041 | } | ||
2042 | |||
2043 | static int at76_iw_handler_get_mode(struct net_device *netdev, | ||
2044 | struct iw_request_info *info, | ||
2045 | __u32 *mode, char *extra) | ||
2046 | { | ||
2047 | struct at76_priv *priv = netdev_priv(netdev); | ||
2048 | |||
2049 | *mode = priv->iw_mode; | ||
2050 | |||
2051 | at76_dbg(DBG_IOCTL, "%s: SIOCGIWMODE - %d", netdev->name, *mode); | ||
2052 | |||
2053 | return 0; | ||
2054 | } | ||
2055 | |||
2056 | static int at76_iw_handler_get_range(struct net_device *netdev, | ||
2057 | struct iw_request_info *info, | ||
2058 | struct iw_point *data, char *extra) | ||
2059 | { | ||
2060 | /* inspired by atmel.c */ | ||
2061 | struct at76_priv *priv = netdev_priv(netdev); | ||
2062 | struct iw_range *range = (struct iw_range *)extra; | ||
2063 | int i; | ||
2064 | |||
2065 | data->length = sizeof(struct iw_range); | ||
2066 | memset(range, 0, sizeof(struct iw_range)); | ||
2067 | |||
2068 | /* TODO: range->throughput = xxxxxx; */ | ||
2069 | |||
2070 | range->min_nwid = 0x0000; | ||
2071 | range->max_nwid = 0x0000; | ||
2072 | |||
2073 | /* this driver doesn't maintain sensitivity information */ | ||
2074 | range->sensitivity = 0; | ||
2075 | |||
2076 | range->max_qual.qual = 100; | ||
2077 | range->max_qual.level = 100; | ||
2078 | range->max_qual.noise = 0; | ||
2079 | range->max_qual.updated = IW_QUAL_NOISE_INVALID; | ||
2080 | |||
2081 | range->avg_qual.qual = 50; | ||
2082 | range->avg_qual.level = 50; | ||
2083 | range->avg_qual.noise = 0; | ||
2084 | range->avg_qual.updated = IW_QUAL_NOISE_INVALID; | ||
2085 | |||
2086 | range->bitrate[0] = 1000000; | ||
2087 | range->bitrate[1] = 2000000; | ||
2088 | range->bitrate[2] = 5500000; | ||
2089 | range->bitrate[3] = 11000000; | ||
2090 | range->num_bitrates = 4; | ||
2091 | |||
2092 | range->min_rts = 0; | ||
2093 | range->max_rts = MAX_RTS_THRESHOLD; | ||
2094 | |||
2095 | range->min_frag = MIN_FRAG_THRESHOLD; | ||
2096 | range->max_frag = MAX_FRAG_THRESHOLD; | ||
2097 | |||
2098 | range->pmp_flags = IW_POWER_PERIOD; | ||
2099 | range->pmt_flags = IW_POWER_ON; | ||
2100 | range->pm_capa = IW_POWER_PERIOD | IW_POWER_ALL_R; | ||
2101 | |||
2102 | range->encoding_size[0] = WEP_SMALL_KEY_LEN; | ||
2103 | range->encoding_size[1] = WEP_LARGE_KEY_LEN; | ||
2104 | range->num_encoding_sizes = 2; | ||
2105 | range->max_encoding_tokens = WEP_KEYS; | ||
2106 | |||
2107 | /* both WL-240U and Linksys WUSB11 v2.6 specify 15 dBm as output power | ||
2108 | - take this for all (ignore antenna gains) */ | ||
2109 | range->txpower[0] = 15; | ||
2110 | range->num_txpower = 1; | ||
2111 | range->txpower_capa = IW_TXPOW_DBM; | ||
2112 | |||
2113 | range->we_version_source = WIRELESS_EXT; | ||
2114 | range->we_version_compiled = WIRELESS_EXT; | ||
2115 | |||
2116 | /* same as the values used in atmel.c */ | ||
2117 | range->retry_capa = IW_RETRY_LIMIT; | ||
2118 | range->retry_flags = IW_RETRY_LIMIT; | ||
2119 | range->r_time_flags = 0; | ||
2120 | range->min_retry = 1; | ||
2121 | range->max_retry = 255; | ||
2122 | |||
2123 | range->num_channels = NUM_CHANNELS; | ||
2124 | range->num_frequency = 0; | ||
2125 | |||
2126 | for (i = 0; i < NUM_CHANNELS; i++) { | ||
2127 | /* test if channel map bit is raised */ | ||
2128 | if (priv->domain->channel_map & (0x1 << i)) { | ||
2129 | range->num_frequency += 1; | ||
2130 | |||
2131 | range->freq[i].i = i + 1; | ||
2132 | range->freq[i].m = channel_frequency[i] * 100000; | ||
2133 | range->freq[i].e = 1; /* freq * 10^1 */ | ||
2134 | } | ||
2135 | } | ||
2136 | |||
2137 | at76_dbg(DBG_IOCTL, "%s: SIOCGIWRANGE", netdev->name); | ||
2138 | |||
2139 | return 0; | ||
2140 | } | ||
2141 | |||
2142 | static int at76_iw_handler_set_spy(struct net_device *netdev, | ||
2143 | struct iw_request_info *info, | ||
2144 | struct iw_point *data, char *extra) | ||
2145 | { | ||
2146 | struct at76_priv *priv = netdev_priv(netdev); | ||
2147 | int ret = 0; | ||
2148 | |||
2149 | at76_dbg(DBG_IOCTL, "%s: SIOCSIWSPY - number of addresses %d", | ||
2150 | netdev->name, data->length); | ||
2151 | |||
2152 | spin_lock_bh(&priv->spy_spinlock); | ||
2153 | ret = iw_handler_set_spy(priv->netdev, info, (union iwreq_data *)data, | ||
2154 | extra); | ||
2155 | spin_unlock_bh(&priv->spy_spinlock); | ||
2156 | |||
2157 | return ret; | ||
2158 | } | ||
2159 | |||
2160 | static int at76_iw_handler_get_spy(struct net_device *netdev, | ||
2161 | struct iw_request_info *info, | ||
2162 | struct iw_point *data, char *extra) | ||
2163 | { | ||
2164 | |||
2165 | struct at76_priv *priv = netdev_priv(netdev); | ||
2166 | int ret = 0; | ||
2167 | |||
2168 | spin_lock_bh(&priv->spy_spinlock); | ||
2169 | ret = iw_handler_get_spy(priv->netdev, info, | ||
2170 | (union iwreq_data *)data, extra); | ||
2171 | spin_unlock_bh(&priv->spy_spinlock); | ||
2172 | |||
2173 | at76_dbg(DBG_IOCTL, "%s: SIOCGIWSPY - number of addresses %d", | ||
2174 | netdev->name, data->length); | ||
2175 | |||
2176 | return ret; | ||
2177 | } | ||
2178 | |||
2179 | static int at76_iw_handler_set_thrspy(struct net_device *netdev, | ||
2180 | struct iw_request_info *info, | ||
2181 | struct iw_point *data, char *extra) | ||
2182 | { | ||
2183 | struct at76_priv *priv = netdev_priv(netdev); | ||
2184 | int ret; | ||
2185 | |||
2186 | at76_dbg(DBG_IOCTL, "%s: SIOCSIWTHRSPY - number of addresses %d)", | ||
2187 | netdev->name, data->length); | ||
2188 | |||
2189 | spin_lock_bh(&priv->spy_spinlock); | ||
2190 | ret = iw_handler_set_thrspy(netdev, info, (union iwreq_data *)data, | ||
2191 | extra); | ||
2192 | spin_unlock_bh(&priv->spy_spinlock); | ||
2193 | |||
2194 | return ret; | ||
2195 | } | ||
2196 | |||
2197 | static int at76_iw_handler_get_thrspy(struct net_device *netdev, | ||
2198 | struct iw_request_info *info, | ||
2199 | struct iw_point *data, char *extra) | ||
2200 | { | ||
2201 | struct at76_priv *priv = netdev_priv(netdev); | ||
2202 | int ret; | ||
2203 | |||
2204 | spin_lock_bh(&priv->spy_spinlock); | ||
2205 | ret = iw_handler_get_thrspy(netdev, info, (union iwreq_data *)data, | ||
2206 | extra); | ||
2207 | spin_unlock_bh(&priv->spy_spinlock); | ||
2208 | |||
2209 | at76_dbg(DBG_IOCTL, "%s: SIOCGIWTHRSPY - number of addresses %d)", | ||
2210 | netdev->name, data->length); | ||
2211 | |||
2212 | return ret; | ||
2213 | } | ||
2214 | |||
2215 | static int at76_iw_handler_set_wap(struct net_device *netdev, | ||
2216 | struct iw_request_info *info, | ||
2217 | struct sockaddr *ap_addr, char *extra) | ||
2218 | { | ||
2219 | struct at76_priv *priv = netdev_priv(netdev); | ||
2220 | |||
2221 | at76_dbg(DBG_IOCTL, "%s: SIOCSIWAP - wap/bssid %s", netdev->name, | ||
2222 | mac2str(ap_addr->sa_data)); | ||
2223 | |||
2224 | /* if the incoming address == ff:ff:ff:ff:ff:ff, the user has | ||
2225 | chosen any or auto AP preference */ | ||
2226 | if (is_broadcast_ether_addr(ap_addr->sa_data) | ||
2227 | || is_zero_ether_addr(ap_addr->sa_data)) | ||
2228 | priv->wanted_bssid_valid = 0; | ||
2229 | else { | ||
2230 | /* user wants to set a preferred AP address */ | ||
2231 | priv->wanted_bssid_valid = 1; | ||
2232 | memcpy(priv->wanted_bssid, ap_addr->sa_data, ETH_ALEN); | ||
2233 | } | ||
2234 | |||
2235 | return -EIWCOMMIT; | ||
2236 | } | ||
2237 | |||
2238 | static int at76_iw_handler_get_wap(struct net_device *netdev, | ||
2239 | struct iw_request_info *info, | ||
2240 | struct sockaddr *ap_addr, char *extra) | ||
2241 | { | ||
2242 | struct at76_priv *priv = netdev_priv(netdev); | ||
2243 | |||
2244 | ap_addr->sa_family = ARPHRD_ETHER; | ||
2245 | memcpy(ap_addr->sa_data, priv->bssid, ETH_ALEN); | ||
2246 | |||
2247 | at76_dbg(DBG_IOCTL, "%s: SIOCGIWAP - wap/bssid %s", netdev->name, | ||
2248 | mac2str(ap_addr->sa_data)); | ||
2249 | |||
2250 | return 0; | ||
2251 | } | ||
2252 | |||
2253 | static int at76_iw_handler_set_scan(struct net_device *netdev, | ||
2254 | struct iw_request_info *info, | ||
2255 | union iwreq_data *wrqu, char *extra) | ||
2256 | { | ||
2257 | struct at76_priv *priv = netdev_priv(netdev); | ||
2258 | int ret = 0; | ||
2259 | |||
2260 | at76_dbg(DBG_IOCTL, "%s: SIOCSIWSCAN", netdev->name); | ||
2261 | |||
2262 | if (mutex_lock_interruptible(&priv->mtx)) | ||
2263 | return -EINTR; | ||
2264 | |||
2265 | if (!netif_running(netdev)) { | ||
2266 | ret = -ENETDOWN; | ||
2267 | goto exit; | ||
2268 | } | ||
2269 | |||
2270 | /* jal: we don't allow "iwlist ethX scan" while we are | ||
2271 | in monitor mode */ | ||
2272 | if (priv->iw_mode == IW_MODE_MONITOR) { | ||
2273 | ret = -EBUSY; | ||
2274 | goto exit; | ||
2275 | } | ||
2276 | |||
2277 | /* Discard old scan results */ | ||
2278 | if ((jiffies - priv->last_scan) > (20 * HZ)) | ||
2279 | priv->scan_state = SCAN_IDLE; | ||
2280 | priv->last_scan = jiffies; | ||
2281 | |||
2282 | /* Initiate a scan command */ | ||
2283 | if (priv->scan_state == SCAN_IN_PROGRESS) { | ||
2284 | ret = -EBUSY; | ||
2285 | goto exit; | ||
2286 | } | ||
2287 | |||
2288 | priv->scan_state = SCAN_IN_PROGRESS; | ||
2289 | |||
2290 | at76_quiesce(priv); | ||
2291 | |||
2292 | /* Try to do passive or active scan if WE asks as. */ | ||
2293 | if (wrqu->data.length | ||
2294 | && wrqu->data.length == sizeof(struct iw_scan_req)) { | ||
2295 | struct iw_scan_req *req = (struct iw_scan_req *)extra; | ||
2296 | |||
2297 | if (req->scan_type == IW_SCAN_TYPE_PASSIVE) | ||
2298 | priv->scan_mode = SCAN_TYPE_PASSIVE; | ||
2299 | else if (req->scan_type == IW_SCAN_TYPE_ACTIVE) | ||
2300 | priv->scan_mode = SCAN_TYPE_ACTIVE; | ||
2301 | |||
2302 | /* Sanity check values? */ | ||
2303 | if (req->min_channel_time > 0) | ||
2304 | priv->scan_min_time = req->min_channel_time; | ||
2305 | |||
2306 | if (req->max_channel_time > 0) | ||
2307 | priv->scan_max_time = req->max_channel_time; | ||
2308 | } | ||
2309 | |||
2310 | /* change to scanning state */ | ||
2311 | at76_set_mac_state(priv, MAC_SCANNING); | ||
2312 | schedule_work(&priv->work_start_scan); | ||
2313 | |||
2314 | exit: | ||
2315 | mutex_unlock(&priv->mtx); | ||
2316 | return ret; | ||
2317 | } | ||
2318 | |||
2319 | static int at76_iw_handler_get_scan(struct net_device *netdev, | ||
2320 | struct iw_request_info *info, | ||
2321 | struct iw_point *data, char *extra) | ||
2322 | { | ||
2323 | struct at76_priv *priv = netdev_priv(netdev); | ||
2324 | unsigned long flags; | ||
2325 | struct list_head *lptr, *nptr; | ||
2326 | struct bss_info *curr_bss; | ||
2327 | struct iw_event *iwe = kmalloc(sizeof(struct iw_event), GFP_KERNEL); | ||
2328 | char *curr_val, *curr_pos = extra; | ||
2329 | int i; | ||
2330 | |||
2331 | at76_dbg(DBG_IOCTL, "%s: SIOCGIWSCAN", netdev->name); | ||
2332 | |||
2333 | if (!iwe) | ||
2334 | return -ENOMEM; | ||
2335 | |||
2336 | if (priv->scan_state != SCAN_COMPLETED) { | ||
2337 | /* scan not yet finished */ | ||
2338 | kfree(iwe); | ||
2339 | return -EAGAIN; | ||
2340 | } | ||
2341 | |||
2342 | spin_lock_irqsave(&priv->bss_list_spinlock, flags); | ||
2343 | |||
2344 | list_for_each_safe(lptr, nptr, &priv->bss_list) { | ||
2345 | curr_bss = list_entry(lptr, struct bss_info, list); | ||
2346 | |||
2347 | iwe->cmd = SIOCGIWAP; | ||
2348 | iwe->u.ap_addr.sa_family = ARPHRD_ETHER; | ||
2349 | memcpy(iwe->u.ap_addr.sa_data, curr_bss->bssid, 6); | ||
2350 | curr_pos = iwe_stream_add_event(info, curr_pos, | ||
2351 | extra + IW_SCAN_MAX_DATA, iwe, | ||
2352 | IW_EV_ADDR_LEN); | ||
2353 | |||
2354 | iwe->u.data.length = curr_bss->ssid_len; | ||
2355 | iwe->cmd = SIOCGIWESSID; | ||
2356 | iwe->u.data.flags = 1; | ||
2357 | |||
2358 | curr_pos = iwe_stream_add_point(info, curr_pos, | ||
2359 | extra + IW_SCAN_MAX_DATA, iwe, | ||
2360 | curr_bss->ssid); | ||
2361 | |||
2362 | iwe->cmd = SIOCGIWMODE; | ||
2363 | iwe->u.mode = (curr_bss->capa & WLAN_CAPABILITY_IBSS) ? | ||
2364 | IW_MODE_ADHOC : | ||
2365 | (curr_bss->capa & WLAN_CAPABILITY_ESS) ? | ||
2366 | IW_MODE_MASTER : IW_MODE_AUTO; | ||
2367 | /* IW_MODE_AUTO = 0 which I thought is | ||
2368 | * the most logical value to return in this case */ | ||
2369 | curr_pos = iwe_stream_add_event(info, curr_pos, | ||
2370 | extra + IW_SCAN_MAX_DATA, iwe, | ||
2371 | IW_EV_UINT_LEN); | ||
2372 | |||
2373 | iwe->cmd = SIOCGIWFREQ; | ||
2374 | iwe->u.freq.m = curr_bss->channel; | ||
2375 | iwe->u.freq.e = 0; | ||
2376 | curr_pos = iwe_stream_add_event(info, curr_pos, | ||
2377 | extra + IW_SCAN_MAX_DATA, iwe, | ||
2378 | IW_EV_FREQ_LEN); | ||
2379 | |||
2380 | iwe->cmd = SIOCGIWENCODE; | ||
2381 | if (curr_bss->capa & WLAN_CAPABILITY_PRIVACY) | ||
2382 | iwe->u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY; | ||
2383 | else | ||
2384 | iwe->u.data.flags = IW_ENCODE_DISABLED; | ||
2385 | |||
2386 | iwe->u.data.length = 0; | ||
2387 | curr_pos = iwe_stream_add_point(info, curr_pos, | ||
2388 | extra + IW_SCAN_MAX_DATA, iwe, | ||
2389 | NULL); | ||
2390 | |||
2391 | /* Add quality statistics */ | ||
2392 | iwe->cmd = IWEVQUAL; | ||
2393 | iwe->u.qual.noise = 0; | ||
2394 | iwe->u.qual.updated = | ||
2395 | IW_QUAL_NOISE_INVALID | IW_QUAL_LEVEL_UPDATED; | ||
2396 | iwe->u.qual.level = (curr_bss->rssi * 100 / 42); | ||
2397 | if (iwe->u.qual.level > 100) | ||
2398 | iwe->u.qual.level = 100; | ||
2399 | if (at76_is_intersil(priv->board_type)) | ||
2400 | iwe->u.qual.qual = curr_bss->link_qual; | ||
2401 | else { | ||
2402 | iwe->u.qual.qual = 0; | ||
2403 | iwe->u.qual.updated |= IW_QUAL_QUAL_INVALID; | ||
2404 | } | ||
2405 | /* Add new value to event */ | ||
2406 | curr_pos = iwe_stream_add_event(info, curr_pos, | ||
2407 | extra + IW_SCAN_MAX_DATA, iwe, | ||
2408 | IW_EV_QUAL_LEN); | ||
2409 | |||
2410 | /* Rate: stuffing multiple values in a single event requires | ||
2411 | * a bit more of magic - Jean II */ | ||
2412 | curr_val = curr_pos + IW_EV_LCP_LEN; | ||
2413 | |||
2414 | iwe->cmd = SIOCGIWRATE; | ||
2415 | /* Those two flags are ignored... */ | ||
2416 | iwe->u.bitrate.fixed = 0; | ||
2417 | iwe->u.bitrate.disabled = 0; | ||
2418 | /* Max 8 values */ | ||
2419 | for (i = 0; i < curr_bss->rates_len; i++) { | ||
2420 | /* Bit rate given in 500 kb/s units (+ 0x80) */ | ||
2421 | iwe->u.bitrate.value = | ||
2422 | ((curr_bss->rates[i] & 0x7f) * 500000); | ||
2423 | /* Add new value to event */ | ||
2424 | curr_val = iwe_stream_add_value(info, curr_pos, | ||
2425 | curr_val, | ||
2426 | extra + | ||
2427 | IW_SCAN_MAX_DATA, iwe, | ||
2428 | IW_EV_PARAM_LEN); | ||
2429 | } | ||
2430 | |||
2431 | /* Check if we added any event */ | ||
2432 | if ((curr_val - curr_pos) > IW_EV_LCP_LEN) | ||
2433 | curr_pos = curr_val; | ||
2434 | |||
2435 | /* more information may be sent back using IWECUSTOM */ | ||
2436 | |||
2437 | } | ||
2438 | |||
2439 | spin_unlock_irqrestore(&priv->bss_list_spinlock, flags); | ||
2440 | |||
2441 | data->length = (curr_pos - extra); | ||
2442 | data->flags = 0; | ||
2443 | |||
2444 | kfree(iwe); | ||
2445 | return 0; | ||
2446 | } | ||
2447 | |||
2448 | static int at76_iw_handler_set_essid(struct net_device *netdev, | ||
2449 | struct iw_request_info *info, | ||
2450 | struct iw_point *data, char *extra) | ||
2451 | { | ||
2452 | struct at76_priv *priv = netdev_priv(netdev); | ||
2453 | |||
2454 | at76_dbg(DBG_IOCTL, "%s: SIOCSIWESSID - %s", netdev->name, extra); | ||
2455 | |||
2456 | if (data->flags) { | ||
2457 | memcpy(priv->essid, extra, data->length); | ||
2458 | priv->essid_size = data->length; | ||
2459 | } else | ||
2460 | priv->essid_size = 0; /* Use any SSID */ | ||
2461 | |||
2462 | return -EIWCOMMIT; | ||
2463 | } | ||
2464 | |||
2465 | static int at76_iw_handler_get_essid(struct net_device *netdev, | ||
2466 | struct iw_request_info *info, | ||
2467 | struct iw_point *data, char *extra) | ||
2468 | { | ||
2469 | struct at76_priv *priv = netdev_priv(netdev); | ||
2470 | |||
2471 | if (priv->essid_size) { | ||
2472 | /* not the ANY ssid in priv->essid */ | ||
2473 | data->flags = 1; | ||
2474 | data->length = priv->essid_size; | ||
2475 | memcpy(extra, priv->essid, data->length); | ||
2476 | } else { | ||
2477 | /* the ANY ssid was specified */ | ||
2478 | if (priv->mac_state == MAC_CONNECTED && priv->curr_bss) { | ||
2479 | /* report the SSID we have found */ | ||
2480 | data->flags = 1; | ||
2481 | data->length = priv->curr_bss->ssid_len; | ||
2482 | memcpy(extra, priv->curr_bss->ssid, data->length); | ||
2483 | } else { | ||
2484 | /* report ANY back */ | ||
2485 | data->flags = 0; | ||
2486 | data->length = 0; | ||
2487 | } | ||
2488 | } | ||
2489 | |||
2490 | at76_dbg(DBG_IOCTL, "%s: SIOCGIWESSID - %.*s", netdev->name, | ||
2491 | data->length, extra); | ||
2492 | |||
2493 | return 0; | ||
2494 | } | ||
2495 | |||
2496 | static int at76_iw_handler_set_rate(struct net_device *netdev, | ||
2497 | struct iw_request_info *info, | ||
2498 | struct iw_param *bitrate, char *extra) | ||
2499 | { | ||
2500 | struct at76_priv *priv = netdev_priv(netdev); | ||
2501 | int ret = -EIWCOMMIT; | ||
2502 | |||
2503 | at76_dbg(DBG_IOCTL, "%s: SIOCSIWRATE - %d", netdev->name, | ||
2504 | bitrate->value); | ||
2505 | |||
2506 | switch (bitrate->value) { | ||
2507 | case -1: | ||
2508 | priv->txrate = TX_RATE_AUTO; | ||
2509 | break; /* auto rate */ | ||
2510 | case 1000000: | ||
2511 | priv->txrate = TX_RATE_1MBIT; | ||
2512 | break; | ||
2513 | case 2000000: | ||
2514 | priv->txrate = TX_RATE_2MBIT; | ||
2515 | break; | ||
2516 | case 5500000: | ||
2517 | priv->txrate = TX_RATE_5_5MBIT; | ||
2518 | break; | ||
2519 | case 11000000: | ||
2520 | priv->txrate = TX_RATE_11MBIT; | ||
2521 | break; | ||
2522 | default: | ||
2523 | ret = -EINVAL; | ||
2524 | } | ||
2525 | |||
2526 | return ret; | ||
2527 | } | ||
2528 | |||
2529 | static int at76_iw_handler_get_rate(struct net_device *netdev, | ||
2530 | struct iw_request_info *info, | ||
2531 | struct iw_param *bitrate, char *extra) | ||
2532 | { | ||
2533 | struct at76_priv *priv = netdev_priv(netdev); | ||
2534 | int ret = 0; | ||
2535 | |||
2536 | switch (priv->txrate) { | ||
2537 | /* return max rate if RATE_AUTO */ | ||
2538 | case TX_RATE_AUTO: | ||
2539 | bitrate->value = 11000000; | ||
2540 | break; | ||
2541 | case TX_RATE_1MBIT: | ||
2542 | bitrate->value = 1000000; | ||
2543 | break; | ||
2544 | case TX_RATE_2MBIT: | ||
2545 | bitrate->value = 2000000; | ||
2546 | break; | ||
2547 | case TX_RATE_5_5MBIT: | ||
2548 | bitrate->value = 5500000; | ||
2549 | break; | ||
2550 | case TX_RATE_11MBIT: | ||
2551 | bitrate->value = 11000000; | ||
2552 | break; | ||
2553 | default: | ||
2554 | ret = -EINVAL; | ||
2555 | } | ||
2556 | |||
2557 | bitrate->fixed = (priv->txrate != TX_RATE_AUTO); | ||
2558 | bitrate->disabled = 0; | ||
2559 | |||
2560 | at76_dbg(DBG_IOCTL, "%s: SIOCGIWRATE - %d", netdev->name, | ||
2561 | bitrate->value); | ||
2562 | |||
2563 | return ret; | ||
2564 | } | ||
2565 | |||
2566 | static int at76_iw_handler_set_rts(struct net_device *netdev, | ||
2567 | struct iw_request_info *info, | ||
2568 | struct iw_param *rts, char *extra) | ||
2569 | { | ||
2570 | struct at76_priv *priv = netdev_priv(netdev); | ||
2571 | int ret = -EIWCOMMIT; | ||
2572 | int rthr = rts->value; | ||
2573 | |||
2574 | at76_dbg(DBG_IOCTL, "%s: SIOCSIWRTS - value %d disabled %s", | ||
2575 | netdev->name, rts->value, (rts->disabled) ? "true" : "false"); | ||
2576 | |||
2577 | if (rts->disabled) | ||
2578 | rthr = MAX_RTS_THRESHOLD; | ||
2579 | |||
2580 | if ((rthr < 0) || (rthr > MAX_RTS_THRESHOLD)) | ||
2581 | ret = -EINVAL; | ||
2582 | else | ||
2583 | priv->rts_threshold = rthr; | ||
2584 | |||
2585 | return ret; | ||
2586 | } | ||
2587 | |||
2588 | static int at76_iw_handler_get_rts(struct net_device *netdev, | ||
2589 | struct iw_request_info *info, | ||
2590 | struct iw_param *rts, char *extra) | ||
2591 | { | ||
2592 | struct at76_priv *priv = netdev_priv(netdev); | ||
2593 | |||
2594 | rts->value = priv->rts_threshold; | ||
2595 | rts->disabled = (rts->value >= MAX_RTS_THRESHOLD); | ||
2596 | rts->fixed = 1; | ||
2597 | |||
2598 | at76_dbg(DBG_IOCTL, "%s: SIOCGIWRTS - value %d disabled %s", | ||
2599 | netdev->name, rts->value, (rts->disabled) ? "true" : "false"); | ||
2600 | |||
2601 | return 0; | ||
2602 | } | ||
2603 | |||
2604 | static int at76_iw_handler_set_frag(struct net_device *netdev, | ||
2605 | struct iw_request_info *info, | ||
2606 | struct iw_param *frag, char *extra) | ||
2607 | { | ||
2608 | struct at76_priv *priv = netdev_priv(netdev); | ||
2609 | int ret = -EIWCOMMIT; | ||
2610 | int fthr = frag->value; | ||
2611 | |||
2612 | at76_dbg(DBG_IOCTL, "%s: SIOCSIWFRAG - value %d, disabled %s", | ||
2613 | netdev->name, frag->value, | ||
2614 | (frag->disabled) ? "true" : "false"); | ||
2615 | |||
2616 | if (frag->disabled) | ||
2617 | fthr = MAX_FRAG_THRESHOLD; | ||
2618 | |||
2619 | if ((fthr < MIN_FRAG_THRESHOLD) || (fthr > MAX_FRAG_THRESHOLD)) | ||
2620 | ret = -EINVAL; | ||
2621 | else | ||
2622 | priv->frag_threshold = fthr & ~0x1; /* get an even value */ | ||
2623 | |||
2624 | return ret; | ||
2625 | } | ||
2626 | |||
2627 | static int at76_iw_handler_get_frag(struct net_device *netdev, | ||
2628 | struct iw_request_info *info, | ||
2629 | struct iw_param *frag, char *extra) | ||
2630 | { | ||
2631 | struct at76_priv *priv = netdev_priv(netdev); | ||
2632 | |||
2633 | frag->value = priv->frag_threshold; | ||
2634 | frag->disabled = (frag->value >= MAX_FRAG_THRESHOLD); | ||
2635 | frag->fixed = 1; | ||
2636 | |||
2637 | at76_dbg(DBG_IOCTL, "%s: SIOCGIWFRAG - value %d, disabled %s", | ||
2638 | netdev->name, frag->value, | ||
2639 | (frag->disabled) ? "true" : "false"); | ||
2640 | |||
2641 | return 0; | ||
2642 | } | ||
2643 | |||
2644 | static int at76_iw_handler_get_txpow(struct net_device *netdev, | ||
2645 | struct iw_request_info *info, | ||
2646 | struct iw_param *power, char *extra) | ||
2647 | { | ||
2648 | power->value = 15; | ||
2649 | power->fixed = 1; /* No power control */ | ||
2650 | power->disabled = 0; | ||
2651 | power->flags = IW_TXPOW_DBM; | ||
2652 | |||
2653 | at76_dbg(DBG_IOCTL, "%s: SIOCGIWTXPOW - txpow %d dBm", netdev->name, | ||
2654 | power->value); | ||
2655 | |||
2656 | return 0; | ||
2657 | } | ||
2658 | |||
2659 | /* jal: short retry is handled by the firmware (at least 0.90.x), | ||
2660 | while long retry is not (?) */ | ||
2661 | static int at76_iw_handler_set_retry(struct net_device *netdev, | ||
2662 | struct iw_request_info *info, | ||
2663 | struct iw_param *retry, char *extra) | ||
2664 | { | ||
2665 | struct at76_priv *priv = netdev_priv(netdev); | ||
2666 | int ret = -EIWCOMMIT; | ||
2667 | |||
2668 | at76_dbg(DBG_IOCTL, "%s: SIOCSIWRETRY disabled %d flags 0x%x val %d", | ||
2669 | netdev->name, retry->disabled, retry->flags, retry->value); | ||
2670 | |||
2671 | if (!retry->disabled && (retry->flags & IW_RETRY_LIMIT)) { | ||
2672 | if ((retry->flags & IW_RETRY_MIN) || | ||
2673 | !(retry->flags & IW_RETRY_MAX)) | ||
2674 | priv->short_retry_limit = retry->value; | ||
2675 | else | ||
2676 | ret = -EINVAL; | ||
2677 | } else | ||
2678 | ret = -EINVAL; | ||
2679 | |||
2680 | return ret; | ||
2681 | } | ||
2682 | |||
2683 | /* Adapted (ripped) from atmel.c */ | ||
2684 | static int at76_iw_handler_get_retry(struct net_device *netdev, | ||
2685 | struct iw_request_info *info, | ||
2686 | struct iw_param *retry, char *extra) | ||
2687 | { | ||
2688 | struct at76_priv *priv = netdev_priv(netdev); | ||
2689 | |||
2690 | at76_dbg(DBG_IOCTL, "%s: SIOCGIWRETRY", netdev->name); | ||
2691 | |||
2692 | retry->disabled = 0; /* Can't be disabled */ | ||
2693 | retry->flags = IW_RETRY_LIMIT; | ||
2694 | retry->value = priv->short_retry_limit; | ||
2695 | |||
2696 | return 0; | ||
2697 | } | ||
2698 | |||
2699 | static int at76_iw_handler_set_encode(struct net_device *netdev, | ||
2700 | struct iw_request_info *info, | ||
2701 | struct iw_point *encoding, char *extra) | ||
2702 | { | ||
2703 | struct at76_priv *priv = netdev_priv(netdev); | ||
2704 | int index = (encoding->flags & IW_ENCODE_INDEX) - 1; | ||
2705 | int len = encoding->length; | ||
2706 | |||
2707 | at76_dbg(DBG_IOCTL, "%s: SIOCSIWENCODE - enc.flags %08x " | ||
2708 | "pointer %p len %d", netdev->name, encoding->flags, | ||
2709 | encoding->pointer, encoding->length); | ||
2710 | at76_dbg(DBG_IOCTL, | ||
2711 | "%s: SIOCSIWENCODE - old wepstate: enabled %s key_id %d " | ||
2712 | "auth_mode %s", netdev->name, | ||
2713 | (priv->wep_enabled) ? "true" : "false", priv->wep_key_id, | ||
2714 | (priv->auth_mode == | ||
2715 | WLAN_AUTH_SHARED_KEY) ? "restricted" : "open"); | ||
2716 | |||
2717 | /* take the old default key if index is invalid */ | ||
2718 | if ((index < 0) || (index >= WEP_KEYS)) | ||
2719 | index = priv->wep_key_id; | ||
2720 | |||
2721 | if (len > 0) { | ||
2722 | if (len > WEP_LARGE_KEY_LEN) | ||
2723 | len = WEP_LARGE_KEY_LEN; | ||
2724 | |||
2725 | memset(priv->wep_keys[index], 0, WEP_KEY_LEN); | ||
2726 | memcpy(priv->wep_keys[index], extra, len); | ||
2727 | priv->wep_keys_len[index] = (len <= WEP_SMALL_KEY_LEN) ? | ||
2728 | WEP_SMALL_KEY_LEN : WEP_LARGE_KEY_LEN; | ||
2729 | priv->wep_enabled = 1; | ||
2730 | } | ||
2731 | |||
2732 | priv->wep_key_id = index; | ||
2733 | priv->wep_enabled = ((encoding->flags & IW_ENCODE_DISABLED) == 0); | ||
2734 | |||
2735 | if (encoding->flags & IW_ENCODE_RESTRICTED) | ||
2736 | priv->auth_mode = WLAN_AUTH_SHARED_KEY; | ||
2737 | if (encoding->flags & IW_ENCODE_OPEN) | ||
2738 | priv->auth_mode = WLAN_AUTH_OPEN; | ||
2739 | |||
2740 | at76_dbg(DBG_IOCTL, | ||
2741 | "%s: SIOCSIWENCODE - new wepstate: enabled %s key_id %d " | ||
2742 | "key_len %d auth_mode %s", netdev->name, | ||
2743 | (priv->wep_enabled) ? "true" : "false", priv->wep_key_id + 1, | ||
2744 | priv->wep_keys_len[priv->wep_key_id], | ||
2745 | (priv->auth_mode == | ||
2746 | WLAN_AUTH_SHARED_KEY) ? "restricted" : "open"); | ||
2747 | |||
2748 | return -EIWCOMMIT; | ||
2749 | } | ||
2750 | |||
2751 | static int at76_iw_handler_get_encode(struct net_device *netdev, | ||
2752 | struct iw_request_info *info, | ||
2753 | struct iw_point *encoding, char *extra) | ||
2754 | { | ||
2755 | struct at76_priv *priv = netdev_priv(netdev); | ||
2756 | int index = (encoding->flags & IW_ENCODE_INDEX) - 1; | ||
2757 | |||
2758 | if ((index < 0) || (index >= WEP_KEYS)) | ||
2759 | index = priv->wep_key_id; | ||
2760 | |||
2761 | encoding->flags = | ||
2762 | (priv->auth_mode == WLAN_AUTH_SHARED_KEY) ? | ||
2763 | IW_ENCODE_RESTRICTED : IW_ENCODE_OPEN; | ||
2764 | |||
2765 | if (!priv->wep_enabled) | ||
2766 | encoding->flags |= IW_ENCODE_DISABLED; | ||
2767 | |||
2768 | if (encoding->pointer) { | ||
2769 | encoding->length = priv->wep_keys_len[index]; | ||
2770 | |||
2771 | memcpy(extra, priv->wep_keys[index], priv->wep_keys_len[index]); | ||
2772 | |||
2773 | encoding->flags |= (index + 1); | ||
2774 | } | ||
2775 | |||
2776 | at76_dbg(DBG_IOCTL, "%s: SIOCGIWENCODE - enc.flags %08x " | ||
2777 | "pointer %p len %d", netdev->name, encoding->flags, | ||
2778 | encoding->pointer, encoding->length); | ||
2779 | at76_dbg(DBG_IOCTL, | ||
2780 | "%s: SIOCGIWENCODE - wepstate: enabled %s key_id %d " | ||
2781 | "key_len %d auth_mode %s", netdev->name, | ||
2782 | (priv->wep_enabled) ? "true" : "false", priv->wep_key_id + 1, | ||
2783 | priv->wep_keys_len[priv->wep_key_id], | ||
2784 | (priv->auth_mode == | ||
2785 | WLAN_AUTH_SHARED_KEY) ? "restricted" : "open"); | ||
2786 | |||
2787 | return 0; | ||
2788 | } | ||
2789 | |||
2790 | static int at76_iw_handler_set_power(struct net_device *netdev, | ||
2791 | struct iw_request_info *info, | ||
2792 | struct iw_param *prq, char *extra) | ||
2793 | { | ||
2794 | int err = -EIWCOMMIT; | ||
2795 | struct at76_priv *priv = netdev_priv(netdev); | ||
2796 | |||
2797 | at76_dbg(DBG_IOCTL, | ||
2798 | "%s: SIOCSIWPOWER - disabled %s flags 0x%x value 0x%x", | ||
2799 | netdev->name, (prq->disabled) ? "true" : "false", prq->flags, | ||
2800 | prq->value); | ||
2801 | |||
2802 | if (prq->disabled) | ||
2803 | priv->pm_mode = AT76_PM_OFF; | ||
2804 | else { | ||
2805 | switch (prq->flags & IW_POWER_MODE) { | ||
2806 | case IW_POWER_ALL_R: | ||
2807 | case IW_POWER_ON: | ||
2808 | break; | ||
2809 | default: | ||
2810 | err = -EINVAL; | ||
2811 | goto exit; | ||
2812 | } | ||
2813 | if (prq->flags & IW_POWER_PERIOD) | ||
2814 | priv->pm_period = prq->value; | ||
2815 | |||
2816 | if (prq->flags & IW_POWER_TIMEOUT) { | ||
2817 | err = -EINVAL; | ||
2818 | goto exit; | ||
2819 | } | ||
2820 | priv->pm_mode = AT76_PM_ON; | ||
2821 | } | ||
2822 | exit: | ||
2823 | return err; | ||
2824 | } | ||
2825 | |||
2826 | static int at76_iw_handler_get_power(struct net_device *netdev, | ||
2827 | struct iw_request_info *info, | ||
2828 | struct iw_param *power, char *extra) | ||
2829 | { | ||
2830 | struct at76_priv *priv = netdev_priv(netdev); | ||
2831 | |||
2832 | power->disabled = (priv->pm_mode == AT76_PM_OFF); | ||
2833 | if (!power->disabled) { | ||
2834 | power->flags = IW_POWER_PERIOD | IW_POWER_ALL_R; | ||
2835 | power->value = priv->pm_period; | ||
2836 | } | ||
2837 | |||
2838 | at76_dbg(DBG_IOCTL, "%s: SIOCGIWPOWER - %s flags 0x%x value 0x%x", | ||
2839 | netdev->name, power->disabled ? "disabled" : "enabled", | ||
2840 | power->flags, power->value); | ||
2841 | |||
2842 | return 0; | ||
2843 | } | ||
2844 | |||
2845 | /******************************************************************************* | ||
2846 | * Private IOCTLS | ||
2847 | */ | ||
2848 | static int at76_iw_set_short_preamble(struct net_device *netdev, | ||
2849 | struct iw_request_info *info, char *name, | ||
2850 | char *extra) | ||
2851 | { | ||
2852 | struct at76_priv *priv = netdev_priv(netdev); | ||
2853 | int val = *((int *)name); | ||
2854 | int ret = -EIWCOMMIT; | ||
2855 | |||
2856 | at76_dbg(DBG_IOCTL, "%s: AT76_SET_SHORT_PREAMBLE, %d", | ||
2857 | netdev->name, val); | ||
2858 | |||
2859 | if (val < PREAMBLE_TYPE_LONG || val > PREAMBLE_TYPE_AUTO) | ||
2860 | ret = -EINVAL; | ||
2861 | else | ||
2862 | priv->preamble_type = val; | ||
2863 | |||
2864 | return ret; | ||
2865 | } | ||
2866 | |||
2867 | static int at76_iw_get_short_preamble(struct net_device *netdev, | ||
2868 | struct iw_request_info *info, | ||
2869 | union iwreq_data *wrqu, char *extra) | ||
2870 | { | ||
2871 | struct at76_priv *priv = netdev_priv(netdev); | ||
2872 | |||
2873 | snprintf(wrqu->name, sizeof(wrqu->name), "%s (%d)", | ||
2874 | preambles[priv->preamble_type], priv->preamble_type); | ||
2875 | return 0; | ||
2876 | } | ||
2877 | |||
2878 | static int at76_iw_set_debug(struct net_device *netdev, | ||
2879 | struct iw_request_info *info, | ||
2880 | struct iw_point *data, char *extra) | ||
2881 | { | ||
2882 | char *ptr; | ||
2883 | u32 val; | ||
2884 | |||
2885 | if (data->length > 0) { | ||
2886 | val = simple_strtol(extra, &ptr, 0); | ||
2887 | |||
2888 | if (ptr == extra) | ||
2889 | val = DBG_DEFAULTS; | ||
2890 | |||
2891 | at76_dbg(DBG_IOCTL, "%s: AT76_SET_DEBUG input %d: %s -> 0x%x", | ||
2892 | netdev->name, data->length, extra, val); | ||
2893 | } else | ||
2894 | val = DBG_DEFAULTS; | ||
2895 | |||
2896 | at76_dbg(DBG_IOCTL, "%s: AT76_SET_DEBUG, old 0x%x, new 0x%x", | ||
2897 | netdev->name, at76_debug, val); | ||
2898 | |||
2899 | /* jal: some more output to pin down lockups */ | ||
2900 | at76_dbg(DBG_IOCTL, "%s: netif running %d queue_stopped %d " | ||
2901 | "carrier_ok %d", netdev->name, netif_running(netdev), | ||
2902 | netif_queue_stopped(netdev), netif_carrier_ok(netdev)); | ||
2903 | |||
2904 | at76_debug = val; | ||
2905 | |||
2906 | return 0; | ||
2907 | } | ||
2908 | |||
2909 | static int at76_iw_get_debug(struct net_device *netdev, | ||
2910 | struct iw_request_info *info, | ||
2911 | union iwreq_data *wrqu, char *extra) | ||
2912 | { | ||
2913 | snprintf(wrqu->name, sizeof(wrqu->name), "0x%08x", at76_debug); | ||
2914 | return 0; | ||
2915 | } | ||
2916 | |||
2917 | static int at76_iw_set_powersave_mode(struct net_device *netdev, | ||
2918 | struct iw_request_info *info, char *name, | ||
2919 | char *extra) | ||
2920 | { | ||
2921 | struct at76_priv *priv = netdev_priv(netdev); | ||
2922 | int val = *((int *)name); | ||
2923 | int ret = -EIWCOMMIT; | ||
2924 | |||
2925 | at76_dbg(DBG_IOCTL, "%s: AT76_SET_POWERSAVE_MODE, %d (%s)", | ||
2926 | netdev->name, val, | ||
2927 | val == AT76_PM_OFF ? "active" : val == AT76_PM_ON ? "save" : | ||
2928 | val == AT76_PM_SMART ? "smart save" : "<invalid>"); | ||
2929 | if (val < AT76_PM_OFF || val > AT76_PM_SMART) | ||
2930 | ret = -EINVAL; | ||
2931 | else | ||
2932 | priv->pm_mode = val; | ||
2933 | |||
2934 | return ret; | ||
2935 | } | ||
2936 | |||
2937 | static int at76_iw_get_powersave_mode(struct net_device *netdev, | ||
2938 | struct iw_request_info *info, | ||
2939 | union iwreq_data *wrqu, char *extra) | ||
2940 | { | ||
2941 | struct at76_priv *priv = netdev_priv(netdev); | ||
2942 | int *param = (int *)extra; | ||
2943 | |||
2944 | param[0] = priv->pm_mode; | ||
2945 | return 0; | ||
2946 | } | ||
2947 | |||
2948 | static int at76_iw_set_scan_times(struct net_device *netdev, | ||
2949 | struct iw_request_info *info, char *name, | ||
2950 | char *extra) | ||
2951 | { | ||
2952 | struct at76_priv *priv = netdev_priv(netdev); | ||
2953 | int mint = *((int *)name); | ||
2954 | int maxt = *((int *)name + 1); | ||
2955 | int ret = -EIWCOMMIT; | ||
2956 | |||
2957 | at76_dbg(DBG_IOCTL, "%s: AT76_SET_SCAN_TIMES - min %d max %d", | ||
2958 | netdev->name, mint, maxt); | ||
2959 | if (mint <= 0 || maxt <= 0 || mint > maxt) | ||
2960 | ret = -EINVAL; | ||
2961 | else { | ||
2962 | priv->scan_min_time = mint; | ||
2963 | priv->scan_max_time = maxt; | ||
2964 | } | ||
2965 | |||
2966 | return ret; | ||
2967 | } | ||
2968 | |||
2969 | static int at76_iw_get_scan_times(struct net_device *netdev, | ||
2970 | struct iw_request_info *info, | ||
2971 | union iwreq_data *wrqu, char *extra) | ||
2972 | { | ||
2973 | struct at76_priv *priv = netdev_priv(netdev); | ||
2974 | int *param = (int *)extra; | ||
2975 | |||
2976 | param[0] = priv->scan_min_time; | ||
2977 | param[1] = priv->scan_max_time; | ||
2978 | return 0; | ||
2979 | } | ||
2980 | |||
2981 | static int at76_iw_set_scan_mode(struct net_device *netdev, | ||
2982 | struct iw_request_info *info, char *name, | ||
2983 | char *extra) | ||
2984 | { | ||
2985 | struct at76_priv *priv = netdev_priv(netdev); | ||
2986 | int val = *((int *)name); | ||
2987 | int ret = -EIWCOMMIT; | ||
2988 | |||
2989 | at76_dbg(DBG_IOCTL, "%s: AT76_SET_SCAN_MODE - mode %s", | ||
2990 | netdev->name, (val = SCAN_TYPE_ACTIVE) ? "active" : | ||
2991 | (val = SCAN_TYPE_PASSIVE) ? "passive" : "<invalid>"); | ||
2992 | |||
2993 | if (val != SCAN_TYPE_ACTIVE && val != SCAN_TYPE_PASSIVE) | ||
2994 | ret = -EINVAL; | ||
2995 | else | ||
2996 | priv->scan_mode = val; | ||
2997 | |||
2998 | return ret; | ||
2999 | } | ||
3000 | |||
3001 | static int at76_iw_get_scan_mode(struct net_device *netdev, | ||
3002 | struct iw_request_info *info, | ||
3003 | union iwreq_data *wrqu, char *extra) | ||
3004 | { | ||
3005 | struct at76_priv *priv = netdev_priv(netdev); | ||
3006 | int *param = (int *)extra; | ||
3007 | |||
3008 | param[0] = priv->scan_mode; | ||
3009 | return 0; | ||
3010 | } | ||
3011 | |||
3012 | #define AT76_SET_HANDLER(h, f) [h - SIOCIWFIRST] = (iw_handler) f | ||
3013 | |||
3014 | /* Standard wireless handlers */ | ||
3015 | static const iw_handler at76_handlers[] = { | ||
3016 | AT76_SET_HANDLER(SIOCSIWCOMMIT, at76_iw_handler_commit), | ||
3017 | AT76_SET_HANDLER(SIOCGIWNAME, at76_iw_handler_get_name), | ||
3018 | AT76_SET_HANDLER(SIOCSIWFREQ, at76_iw_handler_set_freq), | ||
3019 | AT76_SET_HANDLER(SIOCGIWFREQ, at76_iw_handler_get_freq), | ||
3020 | AT76_SET_HANDLER(SIOCSIWMODE, at76_iw_handler_set_mode), | ||
3021 | AT76_SET_HANDLER(SIOCGIWMODE, at76_iw_handler_get_mode), | ||
3022 | AT76_SET_HANDLER(SIOCGIWRANGE, at76_iw_handler_get_range), | ||
3023 | AT76_SET_HANDLER(SIOCSIWSPY, at76_iw_handler_set_spy), | ||
3024 | AT76_SET_HANDLER(SIOCGIWSPY, at76_iw_handler_get_spy), | ||
3025 | AT76_SET_HANDLER(SIOCSIWTHRSPY, at76_iw_handler_set_thrspy), | ||
3026 | AT76_SET_HANDLER(SIOCGIWTHRSPY, at76_iw_handler_get_thrspy), | ||
3027 | AT76_SET_HANDLER(SIOCSIWAP, at76_iw_handler_set_wap), | ||
3028 | AT76_SET_HANDLER(SIOCGIWAP, at76_iw_handler_get_wap), | ||
3029 | AT76_SET_HANDLER(SIOCSIWSCAN, at76_iw_handler_set_scan), | ||
3030 | AT76_SET_HANDLER(SIOCGIWSCAN, at76_iw_handler_get_scan), | ||
3031 | AT76_SET_HANDLER(SIOCSIWESSID, at76_iw_handler_set_essid), | ||
3032 | AT76_SET_HANDLER(SIOCGIWESSID, at76_iw_handler_get_essid), | ||
3033 | AT76_SET_HANDLER(SIOCSIWRATE, at76_iw_handler_set_rate), | ||
3034 | AT76_SET_HANDLER(SIOCGIWRATE, at76_iw_handler_get_rate), | ||
3035 | AT76_SET_HANDLER(SIOCSIWRTS, at76_iw_handler_set_rts), | ||
3036 | AT76_SET_HANDLER(SIOCGIWRTS, at76_iw_handler_get_rts), | ||
3037 | AT76_SET_HANDLER(SIOCSIWFRAG, at76_iw_handler_set_frag), | ||
3038 | AT76_SET_HANDLER(SIOCGIWFRAG, at76_iw_handler_get_frag), | ||
3039 | AT76_SET_HANDLER(SIOCGIWTXPOW, at76_iw_handler_get_txpow), | ||
3040 | AT76_SET_HANDLER(SIOCSIWRETRY, at76_iw_handler_set_retry), | ||
3041 | AT76_SET_HANDLER(SIOCGIWRETRY, at76_iw_handler_get_retry), | ||
3042 | AT76_SET_HANDLER(SIOCSIWENCODE, at76_iw_handler_set_encode), | ||
3043 | AT76_SET_HANDLER(SIOCGIWENCODE, at76_iw_handler_get_encode), | ||
3044 | AT76_SET_HANDLER(SIOCSIWPOWER, at76_iw_handler_set_power), | ||
3045 | AT76_SET_HANDLER(SIOCGIWPOWER, at76_iw_handler_get_power) | ||
3046 | }; | ||
3047 | |||
3048 | #define AT76_SET_PRIV(h, f) [h - SIOCIWFIRSTPRIV] = (iw_handler) f | ||
3049 | |||
3050 | /* Private wireless handlers */ | ||
3051 | static const iw_handler at76_priv_handlers[] = { | ||
3052 | AT76_SET_PRIV(AT76_SET_SHORT_PREAMBLE, at76_iw_set_short_preamble), | ||
3053 | AT76_SET_PRIV(AT76_GET_SHORT_PREAMBLE, at76_iw_get_short_preamble), | ||
3054 | AT76_SET_PRIV(AT76_SET_DEBUG, at76_iw_set_debug), | ||
3055 | AT76_SET_PRIV(AT76_GET_DEBUG, at76_iw_get_debug), | ||
3056 | AT76_SET_PRIV(AT76_SET_POWERSAVE_MODE, at76_iw_set_powersave_mode), | ||
3057 | AT76_SET_PRIV(AT76_GET_POWERSAVE_MODE, at76_iw_get_powersave_mode), | ||
3058 | AT76_SET_PRIV(AT76_SET_SCAN_TIMES, at76_iw_set_scan_times), | ||
3059 | AT76_SET_PRIV(AT76_GET_SCAN_TIMES, at76_iw_get_scan_times), | ||
3060 | AT76_SET_PRIV(AT76_SET_SCAN_MODE, at76_iw_set_scan_mode), | ||
3061 | AT76_SET_PRIV(AT76_GET_SCAN_MODE, at76_iw_get_scan_mode), | ||
3062 | }; | ||
3063 | |||
3064 | /* Names and arguments of private wireless handlers */ | ||
3065 | static const struct iw_priv_args at76_priv_args[] = { | ||
3066 | /* 0 - long, 1 - short */ | ||
3067 | {AT76_SET_SHORT_PREAMBLE, | ||
3068 | IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_preamble"}, | ||
3069 | |||
3070 | {AT76_GET_SHORT_PREAMBLE, | ||
3071 | 0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 10, "get_preamble"}, | ||
3072 | |||
3073 | /* we must pass the new debug mask as a string, because iwpriv cannot | ||
3074 | * parse hex numbers starting with 0x :-( */ | ||
3075 | {AT76_SET_DEBUG, | ||
3076 | IW_PRIV_TYPE_CHAR | 10, 0, "set_debug"}, | ||
3077 | |||
3078 | {AT76_GET_DEBUG, | ||
3079 | 0, IW_PRIV_TYPE_CHAR | IW_PRIV_SIZE_FIXED | 10, "get_debug"}, | ||
3080 | |||
3081 | /* 1 - active, 2 - power save, 3 - smart power save */ | ||
3082 | {AT76_SET_POWERSAVE_MODE, | ||
3083 | IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_powersave"}, | ||
3084 | |||
3085 | {AT76_GET_POWERSAVE_MODE, | ||
3086 | 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_powersave"}, | ||
3087 | |||
3088 | /* min_channel_time, max_channel_time */ | ||
3089 | {AT76_SET_SCAN_TIMES, | ||
3090 | IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, 0, "set_scan_times"}, | ||
3091 | |||
3092 | {AT76_GET_SCAN_TIMES, | ||
3093 | 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 2, "get_scan_times"}, | ||
3094 | |||
3095 | /* 0 - active, 1 - passive scan */ | ||
3096 | {AT76_SET_SCAN_MODE, | ||
3097 | IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, 0, "set_scan_mode"}, | ||
3098 | |||
3099 | {AT76_GET_SCAN_MODE, | ||
3100 | 0, IW_PRIV_TYPE_INT | IW_PRIV_SIZE_FIXED | 1, "get_scan_mode"}, | ||
3101 | }; | ||
3102 | |||
3103 | static const struct iw_handler_def at76_handler_def = { | ||
3104 | .num_standard = ARRAY_SIZE(at76_handlers), | ||
3105 | .num_private = ARRAY_SIZE(at76_priv_handlers), | ||
3106 | .num_private_args = ARRAY_SIZE(at76_priv_args), | ||
3107 | .standard = at76_handlers, | ||
3108 | .private = at76_priv_handlers, | ||
3109 | .private_args = at76_priv_args, | ||
3110 | .get_wireless_stats = at76_get_wireless_stats, | ||
3111 | }; | ||
3112 | |||
3113 | static const u8 snapsig[] = { 0xaa, 0xaa, 0x03 }; | ||
3114 | |||
3115 | /* RFC 1042 encapsulates Ethernet frames in 802.2 SNAP (0xaa, 0xaa, 0x03) with | ||
3116 | * a SNAP OID of 0 (0x00, 0x00, 0x00) */ | ||
3117 | static const u8 rfc1042sig[] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 }; | ||
3118 | |||
3119 | static int at76_tx(struct sk_buff *skb, struct net_device *netdev) | ||
3120 | { | ||
3121 | struct at76_priv *priv = netdev_priv(netdev); | ||
3122 | struct net_device_stats *stats = &priv->stats; | ||
3123 | int ret = 0; | ||
3124 | int wlen; | ||
3125 | int submit_len; | ||
3126 | struct at76_tx_buffer *tx_buffer = priv->bulk_out_buffer; | ||
3127 | struct ieee80211_hdr_3addr *i802_11_hdr = | ||
3128 | (struct ieee80211_hdr_3addr *)tx_buffer->packet; | ||
3129 | u8 *payload = i802_11_hdr->payload; | ||
3130 | struct ethhdr *eh = (struct ethhdr *)skb->data; | ||
3131 | |||
3132 | if (netif_queue_stopped(netdev)) { | ||
3133 | printk(KERN_ERR "%s: %s called while netdev is stopped\n", | ||
3134 | netdev->name, __func__); | ||
3135 | /* skip this packet */ | ||
3136 | dev_kfree_skb(skb); | ||
3137 | return 0; | ||
3138 | } | ||
3139 | |||
3140 | if (priv->tx_urb->status == -EINPROGRESS) { | ||
3141 | printk(KERN_ERR "%s: %s called while tx urb is pending\n", | ||
3142 | netdev->name, __func__); | ||
3143 | /* skip this packet */ | ||
3144 | dev_kfree_skb(skb); | ||
3145 | return 0; | ||
3146 | } | ||
3147 | |||
3148 | if (skb->len < ETH_HLEN) { | ||
3149 | printk(KERN_ERR "%s: %s: skb too short (%d)\n", | ||
3150 | netdev->name, __func__, skb->len); | ||
3151 | dev_kfree_skb(skb); | ||
3152 | return 0; | ||
3153 | } | ||
3154 | |||
3155 | at76_ledtrig_tx_activity(); /* tell ledtrigger we send a packet */ | ||
3156 | |||
3157 | /* we can get rid of memcpy if we set netdev->hard_header_len to | ||
3158 | reserve enough space, but we would need to keep the skb around */ | ||
3159 | |||
3160 | if (ntohs(eh->h_proto) <= ETH_DATA_LEN) { | ||
3161 | /* this is a 802.3 packet */ | ||
3162 | if (skb->len >= ETH_HLEN + sizeof(rfc1042sig) | ||
3163 | && skb->data[ETH_HLEN] == rfc1042sig[0] | ||
3164 | && skb->data[ETH_HLEN + 1] == rfc1042sig[1]) { | ||
3165 | /* higher layer delivered SNAP header - keep it */ | ||
3166 | memcpy(payload, skb->data + ETH_HLEN, | ||
3167 | skb->len - ETH_HLEN); | ||
3168 | wlen = IEEE80211_3ADDR_LEN + skb->len - ETH_HLEN; | ||
3169 | } else { | ||
3170 | printk(KERN_ERR "%s: dropping non-SNAP 802.2 packet " | ||
3171 | "(DSAP 0x%02x SSAP 0x%02x cntrl 0x%02x)\n", | ||
3172 | priv->netdev->name, skb->data[ETH_HLEN], | ||
3173 | skb->data[ETH_HLEN + 1], | ||
3174 | skb->data[ETH_HLEN + 2]); | ||
3175 | dev_kfree_skb(skb); | ||
3176 | return 0; | ||
3177 | } | ||
3178 | } else { | ||
3179 | /* add RFC 1042 header in front */ | ||
3180 | memcpy(payload, rfc1042sig, sizeof(rfc1042sig)); | ||
3181 | memcpy(payload + sizeof(rfc1042sig), &eh->h_proto, | ||
3182 | skb->len - offsetof(struct ethhdr, h_proto)); | ||
3183 | wlen = IEEE80211_3ADDR_LEN + sizeof(rfc1042sig) + skb->len - | ||
3184 | offsetof(struct ethhdr, h_proto); | ||
3185 | } | ||
3186 | |||
3187 | /* make wireless header */ | ||
3188 | i802_11_hdr->frame_ctl = | ||
3189 | cpu_to_le16(IEEE80211_FTYPE_DATA | | ||
3190 | (priv->wep_enabled ? IEEE80211_FCTL_PROTECTED : 0) | | ||
3191 | (priv->iw_mode == | ||
3192 | IW_MODE_INFRA ? IEEE80211_FCTL_TODS : 0)); | ||
3193 | |||
3194 | if (priv->iw_mode == IW_MODE_ADHOC) { | ||
3195 | memcpy(i802_11_hdr->addr1, eh->h_dest, ETH_ALEN); | ||
3196 | memcpy(i802_11_hdr->addr2, eh->h_source, ETH_ALEN); | ||
3197 | memcpy(i802_11_hdr->addr3, priv->bssid, ETH_ALEN); | ||
3198 | } else if (priv->iw_mode == IW_MODE_INFRA) { | ||
3199 | memcpy(i802_11_hdr->addr1, priv->bssid, ETH_ALEN); | ||
3200 | memcpy(i802_11_hdr->addr2, eh->h_source, ETH_ALEN); | ||
3201 | memcpy(i802_11_hdr->addr3, eh->h_dest, ETH_ALEN); | ||
3202 | } | ||
3203 | |||
3204 | i802_11_hdr->duration_id = cpu_to_le16(0); | ||
3205 | i802_11_hdr->seq_ctl = cpu_to_le16(0); | ||
3206 | |||
3207 | /* setup 'Atmel' header */ | ||
3208 | tx_buffer->wlength = cpu_to_le16(wlen); | ||
3209 | tx_buffer->tx_rate = priv->txrate; | ||
3210 | /* for broadcast destination addresses, the firmware 0.100.x | ||
3211 | seems to choose the highest rate set with CMD_STARTUP in | ||
3212 | basic_rate_set replacing this value */ | ||
3213 | |||
3214 | memset(tx_buffer->reserved, 0, sizeof(tx_buffer->reserved)); | ||
3215 | |||
3216 | tx_buffer->padding = at76_calc_padding(wlen); | ||
3217 | submit_len = wlen + AT76_TX_HDRLEN + tx_buffer->padding; | ||
3218 | |||
3219 | at76_dbg(DBG_TX_DATA_CONTENT, "%s skb->data %s", priv->netdev->name, | ||
3220 | hex2str(skb->data, 32)); | ||
3221 | at76_dbg(DBG_TX_DATA, "%s tx: wlen 0x%x pad 0x%x rate %d hdr %s", | ||
3222 | priv->netdev->name, | ||
3223 | le16_to_cpu(tx_buffer->wlength), | ||
3224 | tx_buffer->padding, tx_buffer->tx_rate, | ||
3225 | hex2str(i802_11_hdr, sizeof(*i802_11_hdr))); | ||
3226 | at76_dbg(DBG_TX_DATA_CONTENT, "%s payload %s", priv->netdev->name, | ||
3227 | hex2str(payload, 48)); | ||
3228 | |||
3229 | /* send stuff */ | ||
3230 | netif_stop_queue(netdev); | ||
3231 | netdev->trans_start = jiffies; | ||
3232 | |||
3233 | usb_fill_bulk_urb(priv->tx_urb, priv->udev, priv->tx_pipe, tx_buffer, | ||
3234 | submit_len, at76_tx_callback, priv); | ||
3235 | ret = usb_submit_urb(priv->tx_urb, GFP_ATOMIC); | ||
3236 | if (ret) { | ||
3237 | stats->tx_errors++; | ||
3238 | printk(KERN_ERR "%s: error in tx submit urb: %d\n", | ||
3239 | netdev->name, ret); | ||
3240 | if (ret == -EINVAL) | ||
3241 | printk(KERN_ERR | ||
3242 | "%s: -EINVAL: tx urb %p hcpriv %p complete %p\n", | ||
3243 | priv->netdev->name, priv->tx_urb, | ||
3244 | priv->tx_urb->hcpriv, priv->tx_urb->complete); | ||
3245 | } else { | ||
3246 | stats->tx_bytes += skb->len; | ||
3247 | dev_kfree_skb(skb); | ||
3248 | } | ||
3249 | |||
3250 | return ret; | ||
3251 | } | ||
3252 | |||
3253 | static void at76_tx_timeout(struct net_device *netdev) | ||
3254 | { | ||
3255 | struct at76_priv *priv = netdev_priv(netdev); | ||
3256 | |||
3257 | if (!priv) | ||
3258 | return; | ||
3259 | dev_warn(&netdev->dev, "tx timeout."); | ||
3260 | |||
3261 | usb_unlink_urb(priv->tx_urb); | ||
3262 | priv->stats.tx_errors++; | ||
3263 | } | ||
3264 | |||
1322 | static int at76_submit_rx_urb(struct at76_priv *priv) | 3265 | static int at76_submit_rx_urb(struct at76_priv *priv) |
1323 | { | 3266 | { |
1324 | int ret; | 3267 | int ret; |
@@ -1327,7 +3270,7 @@ static int at76_submit_rx_urb(struct at76_priv *priv) | |||
1327 | 3270 | ||
1328 | if (!priv->rx_urb) { | 3271 | if (!priv->rx_urb) { |
1329 | printk(KERN_ERR "%s: %s: priv->rx_urb is NULL\n", | 3272 | printk(KERN_ERR "%s: %s: priv->rx_urb is NULL\n", |
1330 | wiphy_name(priv->hw->wiphy), __func__); | 3273 | priv->netdev->name, __func__); |
1331 | return -EFAULT; | 3274 | return -EFAULT; |
1332 | } | 3275 | } |
1333 | 3276 | ||
@@ -1335,7 +3278,7 @@ static int at76_submit_rx_urb(struct at76_priv *priv) | |||
1335 | skb = dev_alloc_skb(sizeof(struct at76_rx_buffer)); | 3278 | skb = dev_alloc_skb(sizeof(struct at76_rx_buffer)); |
1336 | if (!skb) { | 3279 | if (!skb) { |
1337 | printk(KERN_ERR "%s: cannot allocate rx skbuff\n", | 3280 | printk(KERN_ERR "%s: cannot allocate rx skbuff\n", |
1338 | wiphy_name(priv->hw->wiphy)); | 3281 | priv->netdev->name); |
1339 | ret = -ENOMEM; | 3282 | ret = -ENOMEM; |
1340 | goto exit; | 3283 | goto exit; |
1341 | } | 3284 | } |
@@ -1355,18 +3298,110 @@ static int at76_submit_rx_urb(struct at76_priv *priv) | |||
1355 | "usb_submit_urb returned -ENODEV"); | 3298 | "usb_submit_urb returned -ENODEV"); |
1356 | else | 3299 | else |
1357 | printk(KERN_ERR "%s: rx, usb_submit_urb failed: %d\n", | 3300 | printk(KERN_ERR "%s: rx, usb_submit_urb failed: %d\n", |
1358 | wiphy_name(priv->hw->wiphy), ret); | 3301 | priv->netdev->name, ret); |
1359 | } | 3302 | } |
1360 | 3303 | ||
1361 | exit: | 3304 | exit: |
1362 | if (ret < 0 && ret != -ENODEV) | 3305 | if (ret < 0 && ret != -ENODEV) |
1363 | printk(KERN_ERR "%s: cannot submit rx urb - please unload the " | 3306 | printk(KERN_ERR "%s: cannot submit rx urb - please unload the " |
1364 | "driver and/or power cycle the device\n", | 3307 | "driver and/or power cycle the device\n", |
1365 | wiphy_name(priv->hw->wiphy)); | 3308 | priv->netdev->name); |
1366 | 3309 | ||
1367 | return ret; | 3310 | return ret; |
1368 | } | 3311 | } |
1369 | 3312 | ||
3313 | static int at76_open(struct net_device *netdev) | ||
3314 | { | ||
3315 | struct at76_priv *priv = netdev_priv(netdev); | ||
3316 | int ret = 0; | ||
3317 | |||
3318 | at76_dbg(DBG_PROC_ENTRY, "%s(): entry", __func__); | ||
3319 | |||
3320 | if (mutex_lock_interruptible(&priv->mtx)) | ||
3321 | return -EINTR; | ||
3322 | |||
3323 | /* if netdev->dev_addr != priv->mac_addr we must | ||
3324 | set the mac address in the device ! */ | ||
3325 | if (compare_ether_addr(netdev->dev_addr, priv->mac_addr)) { | ||
3326 | if (at76_add_mac_address(priv, netdev->dev_addr) >= 0) | ||
3327 | at76_dbg(DBG_PROGRESS, "%s: set new MAC addr %s", | ||
3328 | netdev->name, mac2str(netdev->dev_addr)); | ||
3329 | } | ||
3330 | |||
3331 | priv->scan_state = SCAN_IDLE; | ||
3332 | priv->last_scan = jiffies; | ||
3333 | |||
3334 | ret = at76_submit_rx_urb(priv); | ||
3335 | if (ret < 0) { | ||
3336 | printk(KERN_ERR "%s: open: submit_rx_urb failed: %d\n", | ||
3337 | netdev->name, ret); | ||
3338 | goto error; | ||
3339 | } | ||
3340 | |||
3341 | schedule_delayed_work(&priv->dwork_restart, 0); | ||
3342 | |||
3343 | at76_dbg(DBG_PROC_ENTRY, "%s(): end", __func__); | ||
3344 | error: | ||
3345 | mutex_unlock(&priv->mtx); | ||
3346 | return ret < 0 ? ret : 0; | ||
3347 | } | ||
3348 | |||
3349 | static int at76_stop(struct net_device *netdev) | ||
3350 | { | ||
3351 | struct at76_priv *priv = netdev_priv(netdev); | ||
3352 | |||
3353 | at76_dbg(DBG_DEVSTART, "%s: ENTER", __func__); | ||
3354 | |||
3355 | if (mutex_lock_interruptible(&priv->mtx)) | ||
3356 | return -EINTR; | ||
3357 | |||
3358 | at76_quiesce(priv); | ||
3359 | |||
3360 | if (!priv->device_unplugged) { | ||
3361 | /* We are called by "ifconfig ethX down", not because the | ||
3362 | * device is not available anymore. */ | ||
3363 | at76_set_radio(priv, 0); | ||
3364 | |||
3365 | /* We unlink rx_urb because at76_open() re-submits it. | ||
3366 | * If unplugged, at76_delete_device() takes care of it. */ | ||
3367 | usb_kill_urb(priv->rx_urb); | ||
3368 | } | ||
3369 | |||
3370 | /* free the bss_list */ | ||
3371 | at76_free_bss_list(priv); | ||
3372 | |||
3373 | mutex_unlock(&priv->mtx); | ||
3374 | at76_dbg(DBG_DEVSTART, "%s: EXIT", __func__); | ||
3375 | |||
3376 | return 0; | ||
3377 | } | ||
3378 | |||
3379 | static void at76_ethtool_get_drvinfo(struct net_device *netdev, | ||
3380 | struct ethtool_drvinfo *info) | ||
3381 | { | ||
3382 | struct at76_priv *priv = netdev_priv(netdev); | ||
3383 | |||
3384 | strncpy(info->driver, DRIVER_NAME, sizeof(info->driver)); | ||
3385 | strncpy(info->version, DRIVER_VERSION, sizeof(info->version)); | ||
3386 | |||
3387 | usb_make_path(priv->udev, info->bus_info, sizeof(info->bus_info)); | ||
3388 | |||
3389 | snprintf(info->fw_version, sizeof(info->fw_version), "%d.%d.%d-%d", | ||
3390 | priv->fw_version.major, priv->fw_version.minor, | ||
3391 | priv->fw_version.patch, priv->fw_version.build); | ||
3392 | } | ||
3393 | |||
3394 | static u32 at76_ethtool_get_link(struct net_device *netdev) | ||
3395 | { | ||
3396 | struct at76_priv *priv = netdev_priv(netdev); | ||
3397 | return priv->mac_state == MAC_CONNECTED; | ||
3398 | } | ||
3399 | |||
3400 | static struct ethtool_ops at76_ethtool_ops = { | ||
3401 | .get_drvinfo = at76_ethtool_get_drvinfo, | ||
3402 | .get_link = at76_ethtool_get_link, | ||
3403 | }; | ||
3404 | |||
1370 | /* Download external firmware */ | 3405 | /* Download external firmware */ |
1371 | static int at76_load_external_fw(struct usb_device *udev, struct fwentry *fwe) | 3406 | static int at76_load_external_fw(struct usb_device *udev, struct fwentry *fwe) |
1372 | { | 3407 | { |
@@ -1463,6 +3498,406 @@ exit: | |||
1463 | return ret; | 3498 | return ret; |
1464 | } | 3499 | } |
1465 | 3500 | ||
3501 | static int at76_match_essid(struct at76_priv *priv, struct bss_info *ptr) | ||
3502 | { | ||
3503 | /* common criteria for both modi */ | ||
3504 | |||
3505 | int ret = (priv->essid_size == 0 /* ANY ssid */ || | ||
3506 | (priv->essid_size == ptr->ssid_len && | ||
3507 | !memcmp(priv->essid, ptr->ssid, ptr->ssid_len))); | ||
3508 | if (!ret) | ||
3509 | at76_dbg(DBG_BSS_MATCH, | ||
3510 | "%s bss table entry %p: essid didn't match", | ||
3511 | priv->netdev->name, ptr); | ||
3512 | return ret; | ||
3513 | } | ||
3514 | |||
3515 | static inline int at76_match_mode(struct at76_priv *priv, struct bss_info *ptr) | ||
3516 | { | ||
3517 | int ret; | ||
3518 | |||
3519 | if (priv->iw_mode == IW_MODE_ADHOC) | ||
3520 | ret = ptr->capa & WLAN_CAPABILITY_IBSS; | ||
3521 | else | ||
3522 | ret = ptr->capa & WLAN_CAPABILITY_ESS; | ||
3523 | if (!ret) | ||
3524 | at76_dbg(DBG_BSS_MATCH, | ||
3525 | "%s bss table entry %p: mode didn't match", | ||
3526 | priv->netdev->name, ptr); | ||
3527 | return ret; | ||
3528 | } | ||
3529 | |||
3530 | static int at76_match_rates(struct at76_priv *priv, struct bss_info *ptr) | ||
3531 | { | ||
3532 | int i; | ||
3533 | |||
3534 | for (i = 0; i < ptr->rates_len; i++) { | ||
3535 | u8 rate = ptr->rates[i]; | ||
3536 | |||
3537 | if (!(rate & 0x80)) | ||
3538 | continue; | ||
3539 | |||
3540 | /* this is a basic rate we have to support | ||
3541 | (see IEEE802.11, ch. 7.3.2.2) */ | ||
3542 | if (rate != (0x80 | hw_rates[0]) | ||
3543 | && rate != (0x80 | hw_rates[1]) | ||
3544 | && rate != (0x80 | hw_rates[2]) | ||
3545 | && rate != (0x80 | hw_rates[3])) { | ||
3546 | at76_dbg(DBG_BSS_MATCH, | ||
3547 | "%s: bss table entry %p: basic rate %02x not " | ||
3548 | "supported", priv->netdev->name, ptr, rate); | ||
3549 | return 0; | ||
3550 | } | ||
3551 | } | ||
3552 | |||
3553 | /* if we use short preamble, the bss must support it */ | ||
3554 | if (priv->preamble_type == PREAMBLE_TYPE_SHORT && | ||
3555 | !(ptr->capa & WLAN_CAPABILITY_SHORT_PREAMBLE)) { | ||
3556 | at76_dbg(DBG_BSS_MATCH, | ||
3557 | "%s: %p does not support short preamble", | ||
3558 | priv->netdev->name, ptr); | ||
3559 | return 0; | ||
3560 | } else | ||
3561 | return 1; | ||
3562 | } | ||
3563 | |||
3564 | static inline int at76_match_wep(struct at76_priv *priv, struct bss_info *ptr) | ||
3565 | { | ||
3566 | if (!priv->wep_enabled && ptr->capa & WLAN_CAPABILITY_PRIVACY) { | ||
3567 | /* we have disabled WEP, but the BSS signals privacy */ | ||
3568 | at76_dbg(DBG_BSS_MATCH, | ||
3569 | "%s: bss table entry %p: requires encryption", | ||
3570 | priv->netdev->name, ptr); | ||
3571 | return 0; | ||
3572 | } | ||
3573 | /* otherwise if the BSS does not signal privacy it may well | ||
3574 | accept encrypted packets from us ... */ | ||
3575 | return 1; | ||
3576 | } | ||
3577 | |||
3578 | static inline int at76_match_bssid(struct at76_priv *priv, struct bss_info *ptr) | ||
3579 | { | ||
3580 | if (!priv->wanted_bssid_valid || | ||
3581 | !compare_ether_addr(ptr->bssid, priv->wanted_bssid)) | ||
3582 | return 1; | ||
3583 | |||
3584 | at76_dbg(DBG_BSS_MATCH, | ||
3585 | "%s: requested bssid - %s does not match", | ||
3586 | priv->netdev->name, mac2str(priv->wanted_bssid)); | ||
3587 | at76_dbg(DBG_BSS_MATCH, | ||
3588 | " AP bssid - %s of bss table entry %p", | ||
3589 | mac2str(ptr->bssid), ptr); | ||
3590 | return 0; | ||
3591 | } | ||
3592 | |||
3593 | /** | ||
3594 | * at76_match_bss - try to find a matching bss in priv->bss | ||
3595 | * | ||
3596 | * last - last bss tried | ||
3597 | * | ||
3598 | * last == NULL signals a new round starting with priv->bss_list.next | ||
3599 | * this function must be called inside an acquired priv->bss_list_spinlock | ||
3600 | * otherwise the timeout on bss may remove the newly chosen entry | ||
3601 | */ | ||
3602 | static struct bss_info *at76_match_bss(struct at76_priv *priv, | ||
3603 | struct bss_info *last) | ||
3604 | { | ||
3605 | struct bss_info *ptr = NULL; | ||
3606 | struct list_head *curr; | ||
3607 | |||
3608 | curr = last ? last->list.next : priv->bss_list.next; | ||
3609 | while (curr != &priv->bss_list) { | ||
3610 | ptr = list_entry(curr, struct bss_info, list); | ||
3611 | if (at76_match_essid(priv, ptr) && at76_match_mode(priv, ptr) | ||
3612 | && at76_match_wep(priv, ptr) && at76_match_rates(priv, ptr) | ||
3613 | && at76_match_bssid(priv, ptr)) | ||
3614 | break; | ||
3615 | curr = curr->next; | ||
3616 | } | ||
3617 | |||
3618 | if (curr == &priv->bss_list) | ||
3619 | ptr = NULL; | ||
3620 | /* otherwise ptr points to the struct bss_info we have chosen */ | ||
3621 | |||
3622 | at76_dbg(DBG_BSS_TABLE, "%s %s: returned %p", priv->netdev->name, | ||
3623 | __func__, ptr); | ||
3624 | return ptr; | ||
3625 | } | ||
3626 | |||
3627 | /* Start joining a matching BSS, or create own IBSS */ | ||
3628 | static void at76_work_join(struct work_struct *work) | ||
3629 | { | ||
3630 | struct at76_priv *priv = container_of(work, struct at76_priv, | ||
3631 | work_join); | ||
3632 | int ret; | ||
3633 | unsigned long flags; | ||
3634 | |||
3635 | mutex_lock(&priv->mtx); | ||
3636 | |||
3637 | WARN_ON(priv->mac_state != MAC_JOINING); | ||
3638 | if (priv->mac_state != MAC_JOINING) | ||
3639 | goto exit; | ||
3640 | |||
3641 | /* secure the access to priv->curr_bss ! */ | ||
3642 | spin_lock_irqsave(&priv->bss_list_spinlock, flags); | ||
3643 | priv->curr_bss = at76_match_bss(priv, priv->curr_bss); | ||
3644 | spin_unlock_irqrestore(&priv->bss_list_spinlock, flags); | ||
3645 | |||
3646 | if (!priv->curr_bss) { | ||
3647 | /* here we haven't found a matching (i)bss ... */ | ||
3648 | if (priv->iw_mode == IW_MODE_ADHOC) { | ||
3649 | at76_set_mac_state(priv, MAC_OWN_IBSS); | ||
3650 | at76_start_ibss(priv); | ||
3651 | goto exit; | ||
3652 | } | ||
3653 | /* haven't found a matching BSS in infra mode - try again */ | ||
3654 | at76_set_mac_state(priv, MAC_SCANNING); | ||
3655 | schedule_work(&priv->work_start_scan); | ||
3656 | goto exit; | ||
3657 | } | ||
3658 | |||
3659 | ret = at76_join_bss(priv, priv->curr_bss); | ||
3660 | if (ret < 0) { | ||
3661 | printk(KERN_ERR "%s: join_bss failed with %d\n", | ||
3662 | priv->netdev->name, ret); | ||
3663 | goto exit; | ||
3664 | } | ||
3665 | |||
3666 | ret = at76_wait_completion(priv, CMD_JOIN); | ||
3667 | if (ret != CMD_STATUS_COMPLETE) { | ||
3668 | if (ret != CMD_STATUS_TIME_OUT) | ||
3669 | printk(KERN_ERR "%s: join_bss completed with %d\n", | ||
3670 | priv->netdev->name, ret); | ||
3671 | else | ||
3672 | printk(KERN_INFO "%s: join_bss ssid %s timed out\n", | ||
3673 | priv->netdev->name, | ||
3674 | mac2str(priv->curr_bss->bssid)); | ||
3675 | |||
3676 | /* retry next BSS immediately */ | ||
3677 | schedule_work(&priv->work_join); | ||
3678 | goto exit; | ||
3679 | } | ||
3680 | |||
3681 | /* here we have joined the (I)BSS */ | ||
3682 | if (priv->iw_mode == IW_MODE_ADHOC) { | ||
3683 | struct bss_info *bptr = priv->curr_bss; | ||
3684 | at76_set_mac_state(priv, MAC_CONNECTED); | ||
3685 | /* get ESSID, BSSID and channel for priv->curr_bss */ | ||
3686 | priv->essid_size = bptr->ssid_len; | ||
3687 | memcpy(priv->essid, bptr->ssid, bptr->ssid_len); | ||
3688 | memcpy(priv->bssid, bptr->bssid, ETH_ALEN); | ||
3689 | priv->channel = bptr->channel; | ||
3690 | at76_iwevent_bss_connect(priv->netdev, bptr->bssid); | ||
3691 | netif_carrier_on(priv->netdev); | ||
3692 | netif_start_queue(priv->netdev); | ||
3693 | /* just to be sure */ | ||
3694 | cancel_delayed_work(&priv->dwork_get_scan); | ||
3695 | cancel_delayed_work(&priv->dwork_auth); | ||
3696 | cancel_delayed_work(&priv->dwork_assoc); | ||
3697 | } else { | ||
3698 | /* send auth req */ | ||
3699 | priv->retries = AUTH_RETRIES; | ||
3700 | at76_set_mac_state(priv, MAC_AUTH); | ||
3701 | at76_auth_req(priv, priv->curr_bss, 1, NULL); | ||
3702 | at76_dbg(DBG_MGMT_TIMER, | ||
3703 | "%s:%d: starting mgmt_timer + HZ", __func__, __LINE__); | ||
3704 | schedule_delayed_work(&priv->dwork_auth, AUTH_TIMEOUT); | ||
3705 | } | ||
3706 | |||
3707 | exit: | ||
3708 | mutex_unlock(&priv->mtx); | ||
3709 | } | ||
3710 | |||
3711 | /* Reap scan results */ | ||
3712 | static void at76_dwork_get_scan(struct work_struct *work) | ||
3713 | { | ||
3714 | int status; | ||
3715 | int ret; | ||
3716 | struct at76_priv *priv = container_of(work, struct at76_priv, | ||
3717 | dwork_get_scan.work); | ||
3718 | |||
3719 | mutex_lock(&priv->mtx); | ||
3720 | WARN_ON(priv->mac_state != MAC_SCANNING); | ||
3721 | if (priv->mac_state != MAC_SCANNING) | ||
3722 | goto exit; | ||
3723 | |||
3724 | status = at76_get_cmd_status(priv->udev, CMD_SCAN); | ||
3725 | if (status < 0) { | ||
3726 | printk(KERN_ERR "%s: %s: at76_get_cmd_status failed with %d\n", | ||
3727 | priv->netdev->name, __func__, status); | ||
3728 | status = CMD_STATUS_IN_PROGRESS; | ||
3729 | /* INFO: Hope it was a one off error - if not, scanning | ||
3730 | further down the line and stop this cycle */ | ||
3731 | } | ||
3732 | at76_dbg(DBG_PROGRESS, | ||
3733 | "%s %s: got cmd_status %d (state %s, need_any %d)", | ||
3734 | priv->netdev->name, __func__, status, | ||
3735 | mac_states[priv->mac_state], priv->scan_need_any); | ||
3736 | |||
3737 | if (status != CMD_STATUS_COMPLETE) { | ||
3738 | if ((status != CMD_STATUS_IN_PROGRESS) && | ||
3739 | (status != CMD_STATUS_IDLE)) | ||
3740 | printk(KERN_ERR "%s: %s: Bad scan status: %s\n", | ||
3741 | priv->netdev->name, __func__, | ||
3742 | at76_get_cmd_status_string(status)); | ||
3743 | |||
3744 | /* the first cmd status after scan start is always a IDLE -> | ||
3745 | start the timer to poll again until COMPLETED */ | ||
3746 | at76_dbg(DBG_MGMT_TIMER, | ||
3747 | "%s:%d: starting mgmt_timer for %d ticks", | ||
3748 | __func__, __LINE__, SCAN_POLL_INTERVAL); | ||
3749 | schedule_delayed_work(&priv->dwork_get_scan, | ||
3750 | SCAN_POLL_INTERVAL); | ||
3751 | goto exit; | ||
3752 | } | ||
3753 | |||
3754 | if (at76_debug & DBG_BSS_TABLE) | ||
3755 | at76_dump_bss_table(priv); | ||
3756 | |||
3757 | if (priv->scan_need_any) { | ||
3758 | ret = at76_start_scan(priv, 0); | ||
3759 | if (ret < 0) | ||
3760 | printk(KERN_ERR | ||
3761 | "%s: %s: start_scan (ANY) failed with %d\n", | ||
3762 | priv->netdev->name, __func__, ret); | ||
3763 | at76_dbg(DBG_MGMT_TIMER, | ||
3764 | "%s:%d: starting mgmt_timer for %d ticks", __func__, | ||
3765 | __LINE__, SCAN_POLL_INTERVAL); | ||
3766 | schedule_delayed_work(&priv->dwork_get_scan, | ||
3767 | SCAN_POLL_INTERVAL); | ||
3768 | priv->scan_need_any = 0; | ||
3769 | } else { | ||
3770 | priv->scan_state = SCAN_COMPLETED; | ||
3771 | /* report the end of scan to user space */ | ||
3772 | at76_iwevent_scan_complete(priv->netdev); | ||
3773 | at76_set_mac_state(priv, MAC_JOINING); | ||
3774 | schedule_work(&priv->work_join); | ||
3775 | } | ||
3776 | |||
3777 | exit: | ||
3778 | mutex_unlock(&priv->mtx); | ||
3779 | } | ||
3780 | |||
3781 | /* Handle loss of beacons from the AP */ | ||
3782 | static void at76_dwork_beacon(struct work_struct *work) | ||
3783 | { | ||
3784 | struct at76_priv *priv = container_of(work, struct at76_priv, | ||
3785 | dwork_beacon.work); | ||
3786 | |||
3787 | mutex_lock(&priv->mtx); | ||
3788 | if (priv->mac_state != MAC_CONNECTED || priv->iw_mode != IW_MODE_INFRA) | ||
3789 | goto exit; | ||
3790 | |||
3791 | /* We haven't received any beacons from out AP for BEACON_TIMEOUT */ | ||
3792 | printk(KERN_INFO "%s: lost beacon bssid %s\n", | ||
3793 | priv->netdev->name, mac2str(priv->curr_bss->bssid)); | ||
3794 | |||
3795 | netif_carrier_off(priv->netdev); | ||
3796 | netif_stop_queue(priv->netdev); | ||
3797 | at76_iwevent_bss_disconnect(priv->netdev); | ||
3798 | at76_set_mac_state(priv, MAC_SCANNING); | ||
3799 | schedule_work(&priv->work_start_scan); | ||
3800 | |||
3801 | exit: | ||
3802 | mutex_unlock(&priv->mtx); | ||
3803 | } | ||
3804 | |||
3805 | /* Handle authentication response timeout */ | ||
3806 | static void at76_dwork_auth(struct work_struct *work) | ||
3807 | { | ||
3808 | struct at76_priv *priv = container_of(work, struct at76_priv, | ||
3809 | dwork_auth.work); | ||
3810 | |||
3811 | mutex_lock(&priv->mtx); | ||
3812 | WARN_ON(priv->mac_state != MAC_AUTH); | ||
3813 | if (priv->mac_state != MAC_AUTH) | ||
3814 | goto exit; | ||
3815 | |||
3816 | at76_dbg(DBG_PROGRESS, "%s: authentication response timeout", | ||
3817 | priv->netdev->name); | ||
3818 | |||
3819 | if (priv->retries-- >= 0) { | ||
3820 | at76_auth_req(priv, priv->curr_bss, 1, NULL); | ||
3821 | at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ", | ||
3822 | __func__, __LINE__); | ||
3823 | schedule_delayed_work(&priv->dwork_auth, AUTH_TIMEOUT); | ||
3824 | } else { | ||
3825 | /* try to get next matching BSS */ | ||
3826 | at76_set_mac_state(priv, MAC_JOINING); | ||
3827 | schedule_work(&priv->work_join); | ||
3828 | } | ||
3829 | |||
3830 | exit: | ||
3831 | mutex_unlock(&priv->mtx); | ||
3832 | } | ||
3833 | |||
3834 | /* Handle association response timeout */ | ||
3835 | static void at76_dwork_assoc(struct work_struct *work) | ||
3836 | { | ||
3837 | struct at76_priv *priv = container_of(work, struct at76_priv, | ||
3838 | dwork_assoc.work); | ||
3839 | |||
3840 | mutex_lock(&priv->mtx); | ||
3841 | WARN_ON(priv->mac_state != MAC_ASSOC); | ||
3842 | if (priv->mac_state != MAC_ASSOC) | ||
3843 | goto exit; | ||
3844 | |||
3845 | at76_dbg(DBG_PROGRESS, "%s: association response timeout", | ||
3846 | priv->netdev->name); | ||
3847 | |||
3848 | if (priv->retries-- >= 0) { | ||
3849 | at76_assoc_req(priv, priv->curr_bss); | ||
3850 | at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ", | ||
3851 | __func__, __LINE__); | ||
3852 | schedule_delayed_work(&priv->dwork_assoc, ASSOC_TIMEOUT); | ||
3853 | } else { | ||
3854 | /* try to get next matching BSS */ | ||
3855 | at76_set_mac_state(priv, MAC_JOINING); | ||
3856 | schedule_work(&priv->work_join); | ||
3857 | } | ||
3858 | |||
3859 | exit: | ||
3860 | mutex_unlock(&priv->mtx); | ||
3861 | } | ||
3862 | |||
3863 | /* Read new bssid in ad-hoc mode */ | ||
3864 | static void at76_work_new_bss(struct work_struct *work) | ||
3865 | { | ||
3866 | struct at76_priv *priv = container_of(work, struct at76_priv, | ||
3867 | work_new_bss); | ||
3868 | int ret; | ||
3869 | struct mib_mac_mgmt mac_mgmt; | ||
3870 | |||
3871 | mutex_lock(&priv->mtx); | ||
3872 | |||
3873 | ret = at76_get_mib(priv->udev, MIB_MAC_MGMT, &mac_mgmt, | ||
3874 | sizeof(struct mib_mac_mgmt)); | ||
3875 | if (ret < 0) { | ||
3876 | printk(KERN_ERR "%s: at76_get_mib failed: %d\n", | ||
3877 | priv->netdev->name, ret); | ||
3878 | goto exit; | ||
3879 | } | ||
3880 | |||
3881 | at76_dbg(DBG_PROGRESS, "ibss_change = 0x%2x", mac_mgmt.ibss_change); | ||
3882 | memcpy(priv->bssid, mac_mgmt.current_bssid, ETH_ALEN); | ||
3883 | at76_dbg(DBG_PROGRESS, "using BSSID %s", mac2str(priv->bssid)); | ||
3884 | |||
3885 | at76_iwevent_bss_connect(priv->netdev, priv->bssid); | ||
3886 | |||
3887 | priv->mib_buf.type = MIB_MAC_MGMT; | ||
3888 | priv->mib_buf.size = 1; | ||
3889 | priv->mib_buf.index = offsetof(struct mib_mac_mgmt, ibss_change); | ||
3890 | priv->mib_buf.data.byte = 0; | ||
3891 | |||
3892 | ret = at76_set_mib(priv, &priv->mib_buf); | ||
3893 | if (ret < 0) | ||
3894 | printk(KERN_ERR "%s: set_mib (ibss change ok) failed: %d\n", | ||
3895 | priv->netdev->name, ret); | ||
3896 | |||
3897 | exit: | ||
3898 | mutex_unlock(&priv->mtx); | ||
3899 | } | ||
3900 | |||
1466 | static int at76_startup_device(struct at76_priv *priv) | 3901 | static int at76_startup_device(struct at76_priv *priv) |
1467 | { | 3902 | { |
1468 | struct at76_card_config *ccfg = &priv->card_config; | 3903 | struct at76_card_config *ccfg = &priv->card_config; |
@@ -1470,14 +3905,14 @@ static int at76_startup_device(struct at76_priv *priv) | |||
1470 | 3905 | ||
1471 | at76_dbg(DBG_PARAMS, | 3906 | at76_dbg(DBG_PARAMS, |
1472 | "%s param: ssid %.*s (%s) mode %s ch %d wep %s key %d " | 3907 | "%s param: ssid %.*s (%s) mode %s ch %d wep %s key %d " |
1473 | "keylen %d", wiphy_name(priv->hw->wiphy), priv->essid_size, | 3908 | "keylen %d", priv->netdev->name, priv->essid_size, priv->essid, |
1474 | priv->essid, hex2str(priv->essid, IW_ESSID_MAX_SIZE), | 3909 | hex2str(priv->essid, IW_ESSID_MAX_SIZE), |
1475 | priv->iw_mode == IW_MODE_ADHOC ? "adhoc" : "infra", | 3910 | priv->iw_mode == IW_MODE_ADHOC ? "adhoc" : "infra", |
1476 | priv->channel, priv->wep_enabled ? "enabled" : "disabled", | 3911 | priv->channel, priv->wep_enabled ? "enabled" : "disabled", |
1477 | priv->wep_key_id, priv->wep_keys_len[priv->wep_key_id]); | 3912 | priv->wep_key_id, priv->wep_keys_len[priv->wep_key_id]); |
1478 | at76_dbg(DBG_PARAMS, | 3913 | at76_dbg(DBG_PARAMS, |
1479 | "%s param: preamble %s rts %d retry %d frag %d " | 3914 | "%s param: preamble %s rts %d retry %d frag %d " |
1480 | "txrate %s auth_mode %d", wiphy_name(priv->hw->wiphy), | 3915 | "txrate %s auth_mode %d", priv->netdev->name, |
1481 | preambles[priv->preamble_type], priv->rts_threshold, | 3916 | preambles[priv->preamble_type], priv->rts_threshold, |
1482 | priv->short_retry_limit, priv->frag_threshold, | 3917 | priv->short_retry_limit, priv->frag_threshold, |
1483 | priv->txrate == TX_RATE_1MBIT ? "1MBit" : priv->txrate == | 3918 | priv->txrate == TX_RATE_1MBIT ? "1MBit" : priv->txrate == |
@@ -1488,7 +3923,7 @@ static int at76_startup_device(struct at76_priv *priv) | |||
1488 | at76_dbg(DBG_PARAMS, | 3923 | at76_dbg(DBG_PARAMS, |
1489 | "%s param: pm_mode %d pm_period %d auth_mode %s " | 3924 | "%s param: pm_mode %d pm_period %d auth_mode %s " |
1490 | "scan_times %d %d scan_mode %s", | 3925 | "scan_times %d %d scan_mode %s", |
1491 | wiphy_name(priv->hw->wiphy), priv->pm_mode, priv->pm_period, | 3926 | priv->netdev->name, priv->pm_mode, priv->pm_period, |
1492 | priv->auth_mode == WLAN_AUTH_OPEN ? "open" : "shared_secret", | 3927 | priv->auth_mode == WLAN_AUTH_OPEN ? "open" : "shared_secret", |
1493 | priv->scan_min_time, priv->scan_max_time, | 3928 | priv->scan_min_time, priv->scan_max_time, |
1494 | priv->scan_mode == SCAN_TYPE_ACTIVE ? "active" : "passive"); | 3929 | priv->scan_mode == SCAN_TYPE_ACTIVE ? "active" : "passive"); |
@@ -1522,8 +3957,7 @@ static int at76_startup_device(struct at76_priv *priv) | |||
1522 | ccfg->ssid_len = priv->essid_size; | 3957 | ccfg->ssid_len = priv->essid_size; |
1523 | 3958 | ||
1524 | ccfg->wep_default_key_id = priv->wep_key_id; | 3959 | ccfg->wep_default_key_id = priv->wep_key_id; |
1525 | memcpy(ccfg->wep_default_key_value, priv->wep_keys, | 3960 | memcpy(ccfg->wep_default_key_value, priv->wep_keys, 4 * WEP_KEY_LEN); |
1526 | sizeof(priv->wep_keys)); | ||
1527 | 3961 | ||
1528 | ccfg->short_preamble = priv->preamble_type; | 3962 | ccfg->short_preamble = priv->preamble_type; |
1529 | ccfg->beacon_period = cpu_to_le16(priv->beacon_period); | 3963 | ccfg->beacon_period = cpu_to_le16(priv->beacon_period); |
@@ -1532,7 +3966,7 @@ static int at76_startup_device(struct at76_priv *priv) | |||
1532 | sizeof(struct at76_card_config)); | 3966 | sizeof(struct at76_card_config)); |
1533 | if (ret < 0) { | 3967 | if (ret < 0) { |
1534 | printk(KERN_ERR "%s: at76_set_card_command failed: %d\n", | 3968 | printk(KERN_ERR "%s: at76_set_card_command failed: %d\n", |
1535 | wiphy_name(priv->hw->wiphy), ret); | 3969 | priv->netdev->name, ret); |
1536 | return ret; | 3970 | return ret; |
1537 | } | 3971 | } |
1538 | 3972 | ||
@@ -1578,6 +4012,69 @@ static int at76_startup_device(struct at76_priv *priv) | |||
1578 | return 0; | 4012 | return 0; |
1579 | } | 4013 | } |
1580 | 4014 | ||
4015 | /* Restart the interface */ | ||
4016 | static void at76_dwork_restart(struct work_struct *work) | ||
4017 | { | ||
4018 | struct at76_priv *priv = container_of(work, struct at76_priv, | ||
4019 | dwork_restart.work); | ||
4020 | |||
4021 | mutex_lock(&priv->mtx); | ||
4022 | |||
4023 | netif_carrier_off(priv->netdev); /* stop netdev watchdog */ | ||
4024 | netif_stop_queue(priv->netdev); /* stop tx data packets */ | ||
4025 | |||
4026 | at76_startup_device(priv); | ||
4027 | |||
4028 | if (priv->iw_mode != IW_MODE_MONITOR) { | ||
4029 | priv->netdev->type = ARPHRD_ETHER; | ||
4030 | at76_set_mac_state(priv, MAC_SCANNING); | ||
4031 | schedule_work(&priv->work_start_scan); | ||
4032 | } else { | ||
4033 | priv->netdev->type = ARPHRD_IEEE80211_RADIOTAP; | ||
4034 | at76_start_monitor(priv); | ||
4035 | } | ||
4036 | |||
4037 | mutex_unlock(&priv->mtx); | ||
4038 | } | ||
4039 | |||
4040 | /* Initiate scanning */ | ||
4041 | static void at76_work_start_scan(struct work_struct *work) | ||
4042 | { | ||
4043 | struct at76_priv *priv = container_of(work, struct at76_priv, | ||
4044 | work_start_scan); | ||
4045 | int ret; | ||
4046 | |||
4047 | mutex_lock(&priv->mtx); | ||
4048 | |||
4049 | WARN_ON(priv->mac_state != MAC_SCANNING); | ||
4050 | if (priv->mac_state != MAC_SCANNING) | ||
4051 | goto exit; | ||
4052 | |||
4053 | /* only clear the bss list when a scan is actively initiated, | ||
4054 | * otherwise simply rely on at76_bss_list_timeout */ | ||
4055 | if (priv->scan_state == SCAN_IN_PROGRESS) { | ||
4056 | at76_free_bss_list(priv); | ||
4057 | priv->scan_need_any = 1; | ||
4058 | } else | ||
4059 | priv->scan_need_any = 0; | ||
4060 | |||
4061 | ret = at76_start_scan(priv, 1); | ||
4062 | |||
4063 | if (ret < 0) | ||
4064 | printk(KERN_ERR "%s: %s: start_scan failed with %d\n", | ||
4065 | priv->netdev->name, __func__, ret); | ||
4066 | else { | ||
4067 | at76_dbg(DBG_MGMT_TIMER, | ||
4068 | "%s:%d: starting mgmt_timer for %d ticks", | ||
4069 | __func__, __LINE__, SCAN_POLL_INTERVAL); | ||
4070 | schedule_delayed_work(&priv->dwork_get_scan, | ||
4071 | SCAN_POLL_INTERVAL); | ||
4072 | } | ||
4073 | |||
4074 | exit: | ||
4075 | mutex_unlock(&priv->mtx); | ||
4076 | } | ||
4077 | |||
1581 | /* Enable or disable promiscuous mode */ | 4078 | /* Enable or disable promiscuous mode */ |
1582 | static void at76_work_set_promisc(struct work_struct *work) | 4079 | static void at76_work_set_promisc(struct work_struct *work) |
1583 | { | 4080 | { |
@@ -1595,7 +4092,7 @@ static void at76_work_set_promisc(struct work_struct *work) | |||
1595 | ret = at76_set_mib(priv, &priv->mib_buf); | 4092 | ret = at76_set_mib(priv, &priv->mib_buf); |
1596 | if (ret < 0) | 4093 | if (ret < 0) |
1597 | printk(KERN_ERR "%s: set_mib (promiscuous_mode) failed: %d\n", | 4094 | printk(KERN_ERR "%s: set_mib (promiscuous_mode) failed: %d\n", |
1598 | wiphy_name(priv->hw->wiphy), ret); | 4095 | priv->netdev->name, ret); |
1599 | 4096 | ||
1600 | mutex_unlock(&priv->mtx); | 4097 | mutex_unlock(&priv->mtx); |
1601 | } | 4098 | } |
@@ -1611,759 +4108,1088 @@ static void at76_work_submit_rx(struct work_struct *work) | |||
1611 | mutex_unlock(&priv->mtx); | 4108 | mutex_unlock(&priv->mtx); |
1612 | } | 4109 | } |
1613 | 4110 | ||
1614 | static void at76_rx_tasklet(unsigned long param) | 4111 | /* We got an association response */ |
4112 | static void at76_rx_mgmt_assoc(struct at76_priv *priv, | ||
4113 | struct at76_rx_buffer *buf) | ||
1615 | { | 4114 | { |
1616 | struct urb *urb = (struct urb *)param; | 4115 | struct ieee80211_assoc_response *resp = |
1617 | struct at76_priv *priv = urb->context; | 4116 | (struct ieee80211_assoc_response *)buf->packet; |
1618 | struct at76_rx_buffer *buf; | 4117 | u16 assoc_id = le16_to_cpu(resp->aid); |
1619 | struct ieee80211_rx_status rx_status = { 0 }; | 4118 | u16 status = le16_to_cpu(resp->status); |
1620 | 4119 | ||
1621 | if (priv->device_unplugged) { | 4120 | at76_dbg(DBG_RX_MGMT, "%s: rx AssocResp bssid %s capa 0x%04x status " |
1622 | at76_dbg(DBG_DEVSTART, "device unplugged"); | 4121 | "0x%04x assoc_id 0x%04x rates %s", priv->netdev->name, |
1623 | if (urb) | 4122 | mac2str(resp->header.addr3), le16_to_cpu(resp->capability), |
1624 | at76_dbg(DBG_DEVSTART, "urb status %d", urb->status); | 4123 | status, assoc_id, hex2str(resp->info_element->data, |
4124 | resp->info_element->len)); | ||
4125 | |||
4126 | if (priv->mac_state != MAC_ASSOC) { | ||
4127 | printk(KERN_INFO "%s: AssocResp in state %s ignored\n", | ||
4128 | priv->netdev->name, mac_states[priv->mac_state]); | ||
1625 | return; | 4129 | return; |
1626 | } | 4130 | } |
1627 | 4131 | ||
1628 | if (!priv->rx_skb || !priv->rx_skb->data) | 4132 | BUG_ON(!priv->curr_bss); |
1629 | return; | 4133 | |
1630 | 4134 | cancel_delayed_work(&priv->dwork_assoc); | |
1631 | buf = (struct at76_rx_buffer *)priv->rx_skb->data; | 4135 | if (status == WLAN_STATUS_SUCCESS) { |
1632 | 4136 | struct bss_info *ptr = priv->curr_bss; | |
1633 | if (urb->status != 0) { | 4137 | priv->assoc_id = assoc_id & 0x3fff; |
1634 | if (urb->status != -ENOENT && urb->status != -ECONNRESET) | 4138 | /* update iwconfig params */ |
1635 | at76_dbg(DBG_URB, | 4139 | memcpy(priv->bssid, ptr->bssid, ETH_ALEN); |
1636 | "%s %s: - nonzero Rx bulk status received: %d", | 4140 | memcpy(priv->essid, ptr->ssid, ptr->ssid_len); |
1637 | __func__, wiphy_name(priv->hw->wiphy), | 4141 | priv->essid_size = ptr->ssid_len; |
1638 | urb->status); | 4142 | priv->channel = ptr->channel; |
1639 | return; | 4143 | schedule_work(&priv->work_assoc_done); |
4144 | } else { | ||
4145 | at76_set_mac_state(priv, MAC_JOINING); | ||
4146 | schedule_work(&priv->work_join); | ||
1640 | } | 4147 | } |
4148 | } | ||
1641 | 4149 | ||
1642 | at76_dbg(DBG_RX_ATMEL_HDR, | 4150 | /* Process disassociation request from the AP */ |
1643 | "%s: rx frame: rate %d rssi %d noise %d link %d", | 4151 | static void at76_rx_mgmt_disassoc(struct at76_priv *priv, |
1644 | wiphy_name(priv->hw->wiphy), buf->rx_rate, buf->rssi, | 4152 | struct at76_rx_buffer *buf) |
1645 | buf->noise_level, buf->link_quality); | 4153 | { |
1646 | 4154 | struct ieee80211_disassoc *resp = | |
1647 | skb_trim(priv->rx_skb, le16_to_cpu(buf->wlength) + AT76_RX_HDRLEN); | 4155 | (struct ieee80211_disassoc *)buf->packet; |
1648 | at76_dbg_dump(DBG_RX_DATA, &priv->rx_skb->data[AT76_RX_HDRLEN], | 4156 | struct ieee80211_hdr_3addr *mgmt = &resp->header; |
1649 | priv->rx_skb->len, "RX: len=%d", | 4157 | |
1650 | (int)(priv->rx_skb->len - AT76_RX_HDRLEN)); | 4158 | at76_dbg(DBG_RX_MGMT, |
4159 | "%s: rx DisAssoc bssid %s reason 0x%04x destination %s", | ||
4160 | priv->netdev->name, mac2str(mgmt->addr3), | ||
4161 | le16_to_cpu(resp->reason), mac2str(mgmt->addr1)); | ||
4162 | |||
4163 | /* We are not connected, ignore */ | ||
4164 | if (priv->mac_state == MAC_SCANNING || priv->mac_state == MAC_INIT | ||
4165 | || !priv->curr_bss) | ||
4166 | return; | ||
1651 | 4167 | ||
1652 | rx_status.signal = buf->rssi; | 4168 | /* Not our BSSID, ignore */ |
1653 | /* FIXME: is rate_idx still present in structure? */ | 4169 | if (compare_ether_addr(mgmt->addr3, priv->curr_bss->bssid)) |
1654 | rx_status.rate_idx = buf->rx_rate; | 4170 | return; |
1655 | rx_status.flag |= RX_FLAG_DECRYPTED; | ||
1656 | rx_status.flag |= RX_FLAG_IV_STRIPPED; | ||
1657 | 4171 | ||
1658 | skb_pull(priv->rx_skb, AT76_RX_HDRLEN); | 4172 | /* Not for our STA and not broadcast, ignore */ |
1659 | at76_dbg(DBG_MAC80211, "calling ieee80211_rx_irqsafe(): %d/%d", | 4173 | if (compare_ether_addr(priv->netdev->dev_addr, mgmt->addr1) |
1660 | priv->rx_skb->len, priv->rx_skb->data_len); | 4174 | && !is_broadcast_ether_addr(mgmt->addr1)) |
1661 | ieee80211_rx_irqsafe(priv->hw, priv->rx_skb, &rx_status); | 4175 | return; |
1662 | 4176 | ||
1663 | /* Use a new skb for the next receive */ | 4177 | if (priv->mac_state != MAC_ASSOC && priv->mac_state != MAC_CONNECTED |
1664 | priv->rx_skb = NULL; | 4178 | && priv->mac_state != MAC_JOINING) { |
4179 | printk(KERN_INFO "%s: DisAssoc in state %s ignored\n", | ||
4180 | priv->netdev->name, mac_states[priv->mac_state]); | ||
4181 | return; | ||
4182 | } | ||
1665 | 4183 | ||
1666 | at76_submit_rx_urb(priv); | 4184 | if (priv->mac_state == MAC_CONNECTED) { |
4185 | netif_carrier_off(priv->netdev); | ||
4186 | netif_stop_queue(priv->netdev); | ||
4187 | at76_iwevent_bss_disconnect(priv->netdev); | ||
4188 | } | ||
4189 | cancel_delayed_work(&priv->dwork_get_scan); | ||
4190 | cancel_delayed_work(&priv->dwork_beacon); | ||
4191 | cancel_delayed_work(&priv->dwork_auth); | ||
4192 | cancel_delayed_work(&priv->dwork_assoc); | ||
4193 | at76_set_mac_state(priv, MAC_JOINING); | ||
4194 | schedule_work(&priv->work_join); | ||
1667 | } | 4195 | } |
1668 | 4196 | ||
1669 | /* Load firmware into kernel memory and parse it */ | 4197 | static void at76_rx_mgmt_auth(struct at76_priv *priv, |
1670 | static struct fwentry *at76_load_firmware(struct usb_device *udev, | 4198 | struct at76_rx_buffer *buf) |
1671 | enum board_type board_type) | ||
1672 | { | 4199 | { |
1673 | int ret; | 4200 | struct ieee80211_auth *resp = (struct ieee80211_auth *)buf->packet; |
1674 | char *str; | 4201 | struct ieee80211_hdr_3addr *mgmt = &resp->header; |
1675 | struct at76_fw_header *fwh; | 4202 | int seq_nr = le16_to_cpu(resp->transaction); |
1676 | struct fwentry *fwe = &firmwares[board_type]; | 4203 | int alg = le16_to_cpu(resp->algorithm); |
1677 | 4204 | int status = le16_to_cpu(resp->status); | |
1678 | mutex_lock(&fw_mutex); | 4205 | |
1679 | 4206 | at76_dbg(DBG_RX_MGMT, | |
1680 | if (fwe->loaded) { | 4207 | "%s: rx AuthFrame bssid %s alg %d seq_nr %d status %d " |
1681 | at76_dbg(DBG_FW, "re-using previously loaded fw"); | 4208 | "destination %s", priv->netdev->name, mac2str(mgmt->addr3), |
1682 | goto exit; | 4209 | alg, seq_nr, status, mac2str(mgmt->addr1)); |
4210 | |||
4211 | if (alg == WLAN_AUTH_SHARED_KEY && seq_nr == 2) | ||
4212 | at76_dbg(DBG_RX_MGMT, "%s: AuthFrame challenge %s ...", | ||
4213 | priv->netdev->name, hex2str(resp->info_element, 18)); | ||
4214 | |||
4215 | if (priv->mac_state != MAC_AUTH) { | ||
4216 | printk(KERN_INFO "%s: ignored AuthFrame in state %s\n", | ||
4217 | priv->netdev->name, mac_states[priv->mac_state]); | ||
4218 | return; | ||
1683 | } | 4219 | } |
1684 | 4220 | if (priv->auth_mode != alg) { | |
1685 | at76_dbg(DBG_FW, "downloading firmware %s", fwe->fwname); | 4221 | printk(KERN_INFO "%s: ignored AuthFrame for alg %d\n", |
1686 | ret = request_firmware(&fwe->fw, fwe->fwname, &udev->dev); | 4222 | priv->netdev->name, alg); |
1687 | if (ret < 0) { | 4223 | return; |
1688 | dev_printk(KERN_ERR, &udev->dev, "firmware %s not found!\n", | ||
1689 | fwe->fwname); | ||
1690 | dev_printk(KERN_ERR, &udev->dev, | ||
1691 | "you may need to download the firmware from " | ||
1692 | "http://developer.berlios.de/projects/at76c503a/\n"); | ||
1693 | goto exit; | ||
1694 | } | 4224 | } |
1695 | 4225 | ||
1696 | at76_dbg(DBG_FW, "got it."); | 4226 | BUG_ON(!priv->curr_bss); |
1697 | fwh = (struct at76_fw_header *)(fwe->fw->data); | ||
1698 | 4227 | ||
1699 | if (fwe->fw->size <= sizeof(*fwh)) { | 4228 | /* Not our BSSID or not for our STA, ignore */ |
1700 | dev_printk(KERN_ERR, &udev->dev, | 4229 | if (compare_ether_addr(mgmt->addr3, priv->curr_bss->bssid) |
1701 | "firmware is too short (0x%zx)\n", fwe->fw->size); | 4230 | || compare_ether_addr(priv->netdev->dev_addr, mgmt->addr1)) |
1702 | goto exit; | 4231 | return; |
4232 | |||
4233 | cancel_delayed_work(&priv->dwork_auth); | ||
4234 | if (status != WLAN_STATUS_SUCCESS) { | ||
4235 | /* try to join next bss */ | ||
4236 | at76_set_mac_state(priv, MAC_JOINING); | ||
4237 | schedule_work(&priv->work_join); | ||
4238 | return; | ||
1703 | } | 4239 | } |
1704 | 4240 | ||
1705 | /* CRC currently not checked */ | 4241 | if (priv->auth_mode == WLAN_AUTH_OPEN || seq_nr == 4) { |
1706 | fwe->board_type = le32_to_cpu(fwh->board_type); | 4242 | priv->retries = ASSOC_RETRIES; |
1707 | if (fwe->board_type != board_type) { | 4243 | at76_set_mac_state(priv, MAC_ASSOC); |
1708 | dev_printk(KERN_ERR, &udev->dev, | 4244 | at76_assoc_req(priv, priv->curr_bss); |
1709 | "board type mismatch, requested %u, got %u\n", | 4245 | at76_dbg(DBG_MGMT_TIMER, |
1710 | board_type, fwe->board_type); | 4246 | "%s:%d: starting mgmt_timer + HZ", __func__, __LINE__); |
1711 | goto exit; | 4247 | schedule_delayed_work(&priv->dwork_assoc, ASSOC_TIMEOUT); |
4248 | return; | ||
1712 | } | 4249 | } |
1713 | 4250 | ||
1714 | fwe->fw_version.major = fwh->major; | 4251 | WARN_ON(seq_nr != 2); |
1715 | fwe->fw_version.minor = fwh->minor; | 4252 | at76_auth_req(priv, priv->curr_bss, seq_nr + 1, resp->info_element); |
1716 | fwe->fw_version.patch = fwh->patch; | 4253 | at76_dbg(DBG_MGMT_TIMER, "%s:%d: starting mgmt_timer + HZ", __func__, |
1717 | fwe->fw_version.build = fwh->build; | 4254 | __LINE__); |
4255 | schedule_delayed_work(&priv->dwork_auth, AUTH_TIMEOUT); | ||
4256 | } | ||
1718 | 4257 | ||
1719 | str = (char *)fwh + le32_to_cpu(fwh->str_offset); | 4258 | static void at76_rx_mgmt_deauth(struct at76_priv *priv, |
1720 | fwe->intfw = (u8 *)fwh + le32_to_cpu(fwh->int_fw_offset); | 4259 | struct at76_rx_buffer *buf) |
1721 | fwe->intfw_size = le32_to_cpu(fwh->int_fw_len); | 4260 | { |
1722 | fwe->extfw = (u8 *)fwh + le32_to_cpu(fwh->ext_fw_offset); | 4261 | struct ieee80211_disassoc *resp = |
1723 | fwe->extfw_size = le32_to_cpu(fwh->ext_fw_len); | 4262 | (struct ieee80211_disassoc *)buf->packet; |
4263 | struct ieee80211_hdr_3addr *mgmt = &resp->header; | ||
4264 | |||
4265 | at76_dbg(DBG_RX_MGMT | DBG_PROGRESS, | ||
4266 | "%s: rx DeAuth bssid %s reason 0x%04x destination %s", | ||
4267 | priv->netdev->name, mac2str(mgmt->addr3), | ||
4268 | le16_to_cpu(resp->reason), mac2str(mgmt->addr1)); | ||
4269 | |||
4270 | if (priv->mac_state != MAC_AUTH && priv->mac_state != MAC_ASSOC | ||
4271 | && priv->mac_state != MAC_CONNECTED) { | ||
4272 | printk(KERN_INFO "%s: DeAuth in state %s ignored\n", | ||
4273 | priv->netdev->name, mac_states[priv->mac_state]); | ||
4274 | return; | ||
4275 | } | ||
1724 | 4276 | ||
1725 | fwe->loaded = 1; | 4277 | BUG_ON(!priv->curr_bss); |
1726 | 4278 | ||
1727 | dev_printk(KERN_DEBUG, &udev->dev, | 4279 | /* Not our BSSID, ignore */ |
1728 | "using firmware %s (version %d.%d.%d-%d)\n", | 4280 | if (compare_ether_addr(mgmt->addr3, priv->curr_bss->bssid)) |
1729 | fwe->fwname, fwh->major, fwh->minor, fwh->patch, fwh->build); | 4281 | return; |
1730 | 4282 | ||
1731 | at76_dbg(DBG_DEVSTART, "board %u, int %d:%d, ext %d:%d", board_type, | 4283 | /* Not for our STA and not broadcast, ignore */ |
1732 | le32_to_cpu(fwh->int_fw_offset), le32_to_cpu(fwh->int_fw_len), | 4284 | if (compare_ether_addr(priv->netdev->dev_addr, mgmt->addr1) |
1733 | le32_to_cpu(fwh->ext_fw_offset), le32_to_cpu(fwh->ext_fw_len)); | 4285 | && !is_broadcast_ether_addr(mgmt->addr1)) |
1734 | at76_dbg(DBG_DEVSTART, "firmware id %s", str); | 4286 | return; |
1735 | 4287 | ||
1736 | exit: | 4288 | if (priv->mac_state == MAC_CONNECTED) |
1737 | mutex_unlock(&fw_mutex); | 4289 | at76_iwevent_bss_disconnect(priv->netdev); |
1738 | 4290 | ||
1739 | if (fwe->loaded) | 4291 | at76_set_mac_state(priv, MAC_JOINING); |
1740 | return fwe; | 4292 | schedule_work(&priv->work_join); |
1741 | else | 4293 | cancel_delayed_work(&priv->dwork_get_scan); |
1742 | return NULL; | 4294 | cancel_delayed_work(&priv->dwork_beacon); |
4295 | cancel_delayed_work(&priv->dwork_auth); | ||
4296 | cancel_delayed_work(&priv->dwork_assoc); | ||
1743 | } | 4297 | } |
1744 | 4298 | ||
1745 | static void at76_mac80211_tx_callback(struct urb *urb) | 4299 | static void at76_rx_mgmt_beacon(struct at76_priv *priv, |
4300 | struct at76_rx_buffer *buf) | ||
1746 | { | 4301 | { |
1747 | struct at76_priv *priv = urb->context; | 4302 | int varpar_len; |
1748 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(priv->tx_skb); | 4303 | /* beacon content */ |
4304 | struct ieee80211_beacon *bdata = (struct ieee80211_beacon *)buf->packet; | ||
4305 | struct ieee80211_hdr_3addr *mgmt = &bdata->header; | ||
4306 | |||
4307 | struct list_head *lptr; | ||
4308 | struct bss_info *match; /* entry matching addr3 with its bssid */ | ||
4309 | int new_entry = 0; | ||
4310 | int len; | ||
4311 | struct ieee80211_info_element *ie; | ||
4312 | int have_ssid = 0; | ||
4313 | int have_rates = 0; | ||
4314 | int have_channel = 0; | ||
4315 | int keep_going = 1; | ||
4316 | unsigned long flags; | ||
4317 | |||
4318 | spin_lock_irqsave(&priv->bss_list_spinlock, flags); | ||
4319 | if (priv->mac_state == MAC_CONNECTED) { | ||
4320 | /* in state MAC_CONNECTED we use the mgmt_timer to control | ||
4321 | the beacon of the BSS */ | ||
4322 | BUG_ON(!priv->curr_bss); | ||
4323 | |||
4324 | if (!compare_ether_addr(priv->curr_bss->bssid, mgmt->addr3)) { | ||
4325 | /* We got our AP's beacon, defer the timeout handler. | ||
4326 | Kill pending work first, as schedule_delayed_work() | ||
4327 | won't do it. */ | ||
4328 | cancel_delayed_work(&priv->dwork_beacon); | ||
4329 | schedule_delayed_work(&priv->dwork_beacon, | ||
4330 | BEACON_TIMEOUT); | ||
4331 | priv->curr_bss->rssi = buf->rssi; | ||
4332 | priv->beacons_received++; | ||
4333 | goto exit; | ||
4334 | } | ||
4335 | } | ||
1749 | 4336 | ||
1750 | at76_dbg(DBG_MAC80211, "%s()", __func__); | 4337 | /* look if we have this BSS already in the list */ |
4338 | match = NULL; | ||
1751 | 4339 | ||
1752 | switch (urb->status) { | 4340 | if (!list_empty(&priv->bss_list)) { |
1753 | case 0: | 4341 | list_for_each(lptr, &priv->bss_list) { |
1754 | /* success */ | 4342 | struct bss_info *bss_ptr = |
1755 | /* FIXME: | 4343 | list_entry(lptr, struct bss_info, list); |
1756 | * is the frame really ACKed when tx_callback is called ? */ | 4344 | if (!compare_ether_addr(bss_ptr->bssid, mgmt->addr3)) { |
1757 | info->flags |= IEEE80211_TX_STAT_ACK; | 4345 | match = bss_ptr; |
1758 | break; | 4346 | break; |
1759 | case -ENOENT: | 4347 | } |
1760 | case -ECONNRESET: | 4348 | } |
1761 | /* fail, urb has been unlinked */ | ||
1762 | /* FIXME: add error message */ | ||
1763 | break; | ||
1764 | default: | ||
1765 | at76_dbg(DBG_URB, "%s - nonzero tx status received: %d", | ||
1766 | __func__, urb->status); | ||
1767 | break; | ||
1768 | } | 4349 | } |
1769 | 4350 | ||
1770 | memset(&info->status, 0, sizeof(info->status)); | 4351 | if (!match) { |
4352 | /* BSS not in the list - append it */ | ||
4353 | match = kzalloc(sizeof(struct bss_info), GFP_ATOMIC); | ||
4354 | if (!match) { | ||
4355 | at76_dbg(DBG_BSS_TABLE, | ||
4356 | "%s: cannot kmalloc new bss info (%zd byte)", | ||
4357 | priv->netdev->name, sizeof(struct bss_info)); | ||
4358 | goto exit; | ||
4359 | } | ||
4360 | new_entry = 1; | ||
4361 | list_add_tail(&match->list, &priv->bss_list); | ||
4362 | } | ||
1771 | 4363 | ||
1772 | ieee80211_tx_status_irqsafe(priv->hw, priv->tx_skb); | 4364 | match->capa = le16_to_cpu(bdata->capability); |
4365 | match->beacon_interval = le16_to_cpu(bdata->beacon_interval); | ||
4366 | match->rssi = buf->rssi; | ||
4367 | match->link_qual = buf->link_quality; | ||
4368 | match->noise_level = buf->noise_level; | ||
4369 | memcpy(match->bssid, mgmt->addr3, ETH_ALEN); | ||
4370 | at76_dbg(DBG_RX_BEACON, "%s: bssid %s", priv->netdev->name, | ||
4371 | mac2str(match->bssid)); | ||
4372 | |||
4373 | ie = bdata->info_element; | ||
4374 | |||
4375 | /* length of var length beacon parameters */ | ||
4376 | varpar_len = min_t(int, le16_to_cpu(buf->wlength) - | ||
4377 | sizeof(struct ieee80211_beacon), | ||
4378 | BEACON_MAX_DATA_LENGTH); | ||
4379 | |||
4380 | /* This routine steps through the bdata->data array to get | ||
4381 | * some useful information about the access point. | ||
4382 | * Currently, this implementation supports receipt of: SSID, | ||
4383 | * supported transfer rates and channel, in any order, with some | ||
4384 | * tolerance for intermittent unknown codes (although this | ||
4385 | * functionality may not be necessary as the useful information will | ||
4386 | * usually arrive in consecutively, but there have been some | ||
4387 | * reports of some of the useful information fields arriving in a | ||
4388 | * different order). | ||
4389 | * It does not support any more IE types although MFIE_TYPE_TIM may | ||
4390 | * be supported (on my AP at least). | ||
4391 | * The bdata->data array is about 1500 bytes long but only ~36 of those | ||
4392 | * bytes are useful, hence the have_ssid etc optimizations. */ | ||
4393 | |||
4394 | while (keep_going && | ||
4395 | ((&ie->data[ie->len] - (u8 *)bdata->info_element) <= | ||
4396 | varpar_len)) { | ||
4397 | |||
4398 | switch (ie->id) { | ||
4399 | |||
4400 | case MFIE_TYPE_SSID: | ||
4401 | if (have_ssid) | ||
4402 | break; | ||
1773 | 4403 | ||
1774 | priv->tx_skb = NULL; | 4404 | len = min_t(int, IW_ESSID_MAX_SIZE, ie->len); |
1775 | 4405 | ||
1776 | ieee80211_wake_queues(priv->hw); | 4406 | /* we copy only if this is a new entry, |
1777 | } | 4407 | or the incoming SSID is not a hidden SSID. This |
4408 | will protect us from overwriting a real SSID read | ||
4409 | in a ProbeResponse with a hidden one from a | ||
4410 | following beacon. */ | ||
4411 | if (!new_entry && at76_is_hidden_ssid(ie->data, len)) { | ||
4412 | have_ssid = 1; | ||
4413 | break; | ||
4414 | } | ||
1778 | 4415 | ||
1779 | static int at76_mac80211_tx(struct ieee80211_hw *hw, struct sk_buff *skb) | 4416 | match->ssid_len = len; |
1780 | { | 4417 | memcpy(match->ssid, ie->data, len); |
1781 | struct at76_priv *priv = hw->priv; | 4418 | at76_dbg(DBG_RX_BEACON, "%s: SSID - %.*s", |
1782 | struct at76_tx_buffer *tx_buffer = priv->bulk_out_buffer; | 4419 | priv->netdev->name, len, match->ssid); |
1783 | struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); | 4420 | have_ssid = 1; |
1784 | int padding, submit_len, ret; | 4421 | break; |
1785 | 4422 | ||
1786 | at76_dbg(DBG_MAC80211, "%s()", __func__); | 4423 | case MFIE_TYPE_RATES: |
4424 | if (have_rates) | ||
4425 | break; | ||
1787 | 4426 | ||
1788 | if (priv->tx_urb->status == -EINPROGRESS) { | 4427 | match->rates_len = |
1789 | printk(KERN_ERR "%s: %s called while tx urb is pending\n", | 4428 | min_t(int, sizeof(match->rates), ie->len); |
1790 | wiphy_name(priv->hw->wiphy), __func__); | 4429 | memcpy(match->rates, ie->data, match->rates_len); |
1791 | return NETDEV_TX_BUSY; | 4430 | have_rates = 1; |
1792 | } | 4431 | at76_dbg(DBG_RX_BEACON, "%s: SUPPORTED RATES %s", |
4432 | priv->netdev->name, | ||
4433 | hex2str(ie->data, ie->len)); | ||
4434 | break; | ||
1793 | 4435 | ||
1794 | ieee80211_stop_queues(hw); | 4436 | case MFIE_TYPE_DS_SET: |
4437 | if (have_channel) | ||
4438 | break; | ||
1795 | 4439 | ||
1796 | at76_ledtrig_tx_activity(); /* tell ledtrigger we send a packet */ | 4440 | match->channel = ie->data[0]; |
4441 | have_channel = 1; | ||
4442 | at76_dbg(DBG_RX_BEACON, "%s: CHANNEL - %d", | ||
4443 | priv->netdev->name, match->channel); | ||
4444 | break; | ||
1797 | 4445 | ||
1798 | WARN_ON(priv->tx_skb != NULL); | 4446 | case MFIE_TYPE_CF_SET: |
4447 | case MFIE_TYPE_TIM: | ||
4448 | case MFIE_TYPE_IBSS_SET: | ||
4449 | default: | ||
4450 | at76_dbg(DBG_RX_BEACON, "%s: beacon IE id %d len %d %s", | ||
4451 | priv->netdev->name, ie->id, ie->len, | ||
4452 | hex2str(ie->data, ie->len)); | ||
4453 | break; | ||
4454 | } | ||
1799 | 4455 | ||
1800 | priv->tx_skb = skb; | 4456 | /* advance to the next informational element */ |
1801 | padding = at76_calc_padding(skb->len); | 4457 | next_ie(&ie); |
1802 | submit_len = AT76_TX_HDRLEN + skb->len + padding; | ||
1803 | 4458 | ||
1804 | /* setup 'Atmel' header */ | 4459 | /* Optimization: after all, the bdata->data array is |
1805 | memset(tx_buffer, 0, sizeof(*tx_buffer)); | 4460 | * varpar_len bytes long, whereas we get all of the useful |
1806 | tx_buffer->padding = padding; | 4461 | * information after only ~36 bytes, this saves us a lot of |
1807 | tx_buffer->wlength = cpu_to_le16(skb->len); | 4462 | * time (and trouble as the remaining portion of the array |
1808 | tx_buffer->tx_rate = ieee80211_get_tx_rate(hw, info)->hw_value; | 4463 | * could be full of junk) |
1809 | if (FIRMWARE_IS_WPA(priv->fw_version) && info->control.hw_key) { | 4464 | * Comment this out if you want to see what other information |
1810 | tx_buffer->key_id = (info->control.hw_key->keyidx); | 4465 | * comes from the AP - although little of it may be useful */ |
1811 | tx_buffer->cipher_type = | 4466 | } |
1812 | priv->keys[info->control.hw_key->keyidx].cipher; | ||
1813 | tx_buffer->cipher_length = | ||
1814 | priv->keys[info->control.hw_key->keyidx].keylen; | ||
1815 | tx_buffer->reserved = 0; | ||
1816 | } else { | ||
1817 | tx_buffer->key_id = 0; | ||
1818 | tx_buffer->cipher_type = 0; | ||
1819 | tx_buffer->cipher_length = 0; | ||
1820 | tx_buffer->reserved = 0; | ||
1821 | }; | ||
1822 | /* memset(tx_buffer->reserved, 0, sizeof(tx_buffer->reserved)); */ | ||
1823 | memcpy(tx_buffer->packet, skb->data, skb->len); | ||
1824 | 4467 | ||
1825 | at76_dbg(DBG_TX_DATA, "%s tx: wlen 0x%x pad 0x%x rate %d hdr", | 4468 | at76_dbg(DBG_RX_BEACON, "%s: Finished processing beacon data", |
1826 | wiphy_name(priv->hw->wiphy), le16_to_cpu(tx_buffer->wlength), | 4469 | priv->netdev->name); |
1827 | tx_buffer->padding, tx_buffer->tx_rate); | ||
1828 | 4470 | ||
1829 | /* send stuff */ | 4471 | match->last_rx = jiffies; /* record last rx of beacon */ |
1830 | at76_dbg_dump(DBG_TX_DATA_CONTENT, tx_buffer, submit_len, | ||
1831 | "%s(): tx_buffer %d bytes:", __func__, submit_len); | ||
1832 | usb_fill_bulk_urb(priv->tx_urb, priv->udev, priv->tx_pipe, tx_buffer, | ||
1833 | submit_len, at76_mac80211_tx_callback, priv); | ||
1834 | ret = usb_submit_urb(priv->tx_urb, GFP_ATOMIC); | ||
1835 | if (ret) { | ||
1836 | printk(KERN_ERR "%s: error in tx submit urb: %d\n", | ||
1837 | wiphy_name(priv->hw->wiphy), ret); | ||
1838 | if (ret == -EINVAL) | ||
1839 | printk(KERN_ERR | ||
1840 | "%s: -EINVAL: tx urb %p hcpriv %p complete %p\n", | ||
1841 | wiphy_name(priv->hw->wiphy), priv->tx_urb, | ||
1842 | priv->tx_urb->hcpriv, priv->tx_urb->complete); | ||
1843 | } | ||
1844 | 4472 | ||
1845 | return 0; | 4473 | exit: |
4474 | spin_unlock_irqrestore(&priv->bss_list_spinlock, flags); | ||
1846 | } | 4475 | } |
1847 | 4476 | ||
1848 | static int at76_mac80211_start(struct ieee80211_hw *hw) | 4477 | /* Calculate the link level from a given rx_buffer */ |
4478 | static void at76_calc_level(struct at76_priv *priv, struct at76_rx_buffer *buf, | ||
4479 | struct iw_quality *qual) | ||
1849 | { | 4480 | { |
1850 | struct at76_priv *priv = hw->priv; | 4481 | /* just a guess for now, might be different for other chips */ |
1851 | int ret; | 4482 | int max_rssi = 42; |
1852 | |||
1853 | at76_dbg(DBG_MAC80211, "%s()", __func__); | ||
1854 | 4483 | ||
1855 | mutex_lock(&priv->mtx); | 4484 | qual->level = (buf->rssi * 100 / max_rssi); |
1856 | 4485 | if (qual->level > 100) | |
1857 | ret = at76_submit_rx_urb(priv); | 4486 | qual->level = 100; |
1858 | if (ret < 0) { | 4487 | qual->updated |= IW_QUAL_LEVEL_UPDATED; |
1859 | printk(KERN_ERR "%s: open: submit_rx_urb failed: %d\n", | 4488 | } |
1860 | wiphy_name(priv->hw->wiphy), ret); | ||
1861 | goto error; | ||
1862 | } | ||
1863 | 4489 | ||
1864 | at76_startup_device(priv); | 4490 | /* Calculate the link quality from a given rx_buffer */ |
4491 | static void at76_calc_qual(struct at76_priv *priv, struct at76_rx_buffer *buf, | ||
4492 | struct iw_quality *qual) | ||
4493 | { | ||
4494 | if (at76_is_intersil(priv->board_type)) | ||
4495 | qual->qual = buf->link_quality; | ||
4496 | else { | ||
4497 | unsigned long elapsed; | ||
1865 | 4498 | ||
1866 | at76_start_monitor(priv); | 4499 | /* Update qual at most once a second */ |
4500 | elapsed = jiffies - priv->beacons_last_qual; | ||
4501 | if (elapsed < 1 * HZ) | ||
4502 | return; | ||
1867 | 4503 | ||
1868 | error: | 4504 | qual->qual = qual->level * priv->beacons_received * |
1869 | mutex_unlock(&priv->mtx); | 4505 | msecs_to_jiffies(priv->beacon_period) / elapsed; |
1870 | 4506 | ||
1871 | return 0; | 4507 | priv->beacons_last_qual = jiffies; |
4508 | priv->beacons_received = 0; | ||
4509 | } | ||
4510 | qual->qual = (qual->qual > 100) ? 100 : qual->qual; | ||
4511 | qual->updated |= IW_QUAL_QUAL_UPDATED; | ||
1872 | } | 4512 | } |
1873 | 4513 | ||
1874 | static void at76_mac80211_stop(struct ieee80211_hw *hw) | 4514 | /* Calculate the noise quality from a given rx_buffer */ |
4515 | static void at76_calc_noise(struct at76_priv *priv, struct at76_rx_buffer *buf, | ||
4516 | struct iw_quality *qual) | ||
1875 | { | 4517 | { |
1876 | struct at76_priv *priv = hw->priv; | 4518 | qual->noise = 0; |
1877 | 4519 | qual->updated |= IW_QUAL_NOISE_INVALID; | |
1878 | at76_dbg(DBG_MAC80211, "%s()", __func__); | 4520 | } |
1879 | |||
1880 | mutex_lock(&priv->mtx); | ||
1881 | 4521 | ||
1882 | if (!priv->device_unplugged) { | 4522 | static void at76_update_wstats(struct at76_priv *priv, |
1883 | /* We are called by "ifconfig ethX down", not because the | 4523 | struct at76_rx_buffer *buf) |
1884 | * device is not available anymore. */ | 4524 | { |
1885 | if (at76_set_radio(priv, 0) == 1) | 4525 | struct iw_quality *qual = &priv->wstats.qual; |
1886 | at76_wait_completion(priv, CMD_RADIO_ON); | ||
1887 | 4526 | ||
1888 | /* We unlink rx_urb because at76_open() re-submits it. | 4527 | if (buf->rssi && priv->mac_state == MAC_CONNECTED) { |
1889 | * If unplugged, at76_delete_device() takes care of it. */ | 4528 | qual->updated = 0; |
1890 | usb_kill_urb(priv->rx_urb); | 4529 | at76_calc_level(priv, buf, qual); |
4530 | at76_calc_qual(priv, buf, qual); | ||
4531 | at76_calc_noise(priv, buf, qual); | ||
4532 | } else { | ||
4533 | qual->qual = 0; | ||
4534 | qual->level = 0; | ||
4535 | qual->noise = 0; | ||
4536 | qual->updated = IW_QUAL_ALL_INVALID; | ||
1891 | } | 4537 | } |
1892 | |||
1893 | mutex_unlock(&priv->mtx); | ||
1894 | } | 4538 | } |
1895 | 4539 | ||
1896 | static int at76_add_interface(struct ieee80211_hw *hw, | 4540 | static void at76_rx_mgmt(struct at76_priv *priv, struct at76_rx_buffer *buf) |
1897 | struct ieee80211_if_init_conf *conf) | ||
1898 | { | 4541 | { |
1899 | struct at76_priv *priv = hw->priv; | 4542 | struct ieee80211_hdr_3addr *mgmt = |
1900 | int ret = 0; | 4543 | (struct ieee80211_hdr_3addr *)buf->packet; |
4544 | u16 framectl = le16_to_cpu(mgmt->frame_ctl); | ||
4545 | |||
4546 | /* update wstats */ | ||
4547 | if (priv->mac_state != MAC_INIT && priv->mac_state != MAC_SCANNING) { | ||
4548 | /* jal: this is a dirty hack needed by Tim in ad-hoc mode */ | ||
4549 | /* Data packets always seem to have a 0 link level, so we | ||
4550 | only read link quality info from management packets. | ||
4551 | Atmel driver actually averages the present, and previous | ||
4552 | values, we just present the raw value at the moment - TJS */ | ||
4553 | if (priv->iw_mode == IW_MODE_ADHOC | ||
4554 | || (priv->curr_bss | ||
4555 | && !compare_ether_addr(mgmt->addr3, | ||
4556 | priv->curr_bss->bssid))) | ||
4557 | at76_update_wstats(priv, buf); | ||
4558 | } | ||
1901 | 4559 | ||
1902 | at76_dbg(DBG_MAC80211, "%s()", __func__); | 4560 | at76_dbg(DBG_RX_MGMT_CONTENT, "%s rx mgmt framectl 0x%x %s", |
4561 | priv->netdev->name, framectl, | ||
4562 | hex2str(mgmt, le16_to_cpu(buf->wlength))); | ||
1903 | 4563 | ||
1904 | mutex_lock(&priv->mtx); | 4564 | switch (framectl & IEEE80211_FCTL_STYPE) { |
4565 | case IEEE80211_STYPE_BEACON: | ||
4566 | case IEEE80211_STYPE_PROBE_RESP: | ||
4567 | at76_rx_mgmt_beacon(priv, buf); | ||
4568 | break; | ||
4569 | |||
4570 | case IEEE80211_STYPE_ASSOC_RESP: | ||
4571 | at76_rx_mgmt_assoc(priv, buf); | ||
4572 | break; | ||
1905 | 4573 | ||
1906 | switch (conf->type) { | 4574 | case IEEE80211_STYPE_DISASSOC: |
1907 | case NL80211_IFTYPE_STATION: | 4575 | at76_rx_mgmt_disassoc(priv, buf); |
1908 | priv->iw_mode = IW_MODE_INFRA; | ||
1909 | break; | 4576 | break; |
4577 | |||
4578 | case IEEE80211_STYPE_AUTH: | ||
4579 | at76_rx_mgmt_auth(priv, buf); | ||
4580 | break; | ||
4581 | |||
4582 | case IEEE80211_STYPE_DEAUTH: | ||
4583 | at76_rx_mgmt_deauth(priv, buf); | ||
4584 | break; | ||
4585 | |||
1910 | default: | 4586 | default: |
1911 | ret = -EOPNOTSUPP; | 4587 | printk(KERN_DEBUG "%s: ignoring frame with framectl 0x%04x\n", |
1912 | goto exit; | 4588 | priv->netdev->name, framectl); |
1913 | } | 4589 | } |
1914 | 4590 | ||
1915 | exit: | 4591 | return; |
1916 | mutex_unlock(&priv->mtx); | ||
1917 | |||
1918 | return ret; | ||
1919 | } | 4592 | } |
1920 | 4593 | ||
1921 | static void at76_remove_interface(struct ieee80211_hw *hw, | 4594 | /* Convert the 802.11 header into an ethernet-style header, make skb |
1922 | struct ieee80211_if_init_conf *conf) | 4595 | * ready for consumption by netif_rx() */ |
4596 | static void at76_ieee80211_to_eth(struct sk_buff *skb, int iw_mode) | ||
1923 | { | 4597 | { |
1924 | at76_dbg(DBG_MAC80211, "%s()", __func__); | 4598 | struct ieee80211_hdr_3addr *i802_11_hdr; |
1925 | } | 4599 | struct ethhdr *eth_hdr_p; |
4600 | u8 *src_addr; | ||
4601 | u8 *dest_addr; | ||
1926 | 4602 | ||
1927 | static int at76_join(struct at76_priv *priv) | 4603 | i802_11_hdr = (struct ieee80211_hdr_3addr *)skb->data; |
1928 | { | ||
1929 | struct at76_req_join join; | ||
1930 | int ret; | ||
1931 | 4604 | ||
1932 | memset(&join, 0, sizeof(struct at76_req_join)); | 4605 | /* That would be the ethernet header if the hardware converted |
1933 | memcpy(join.essid, priv->essid, priv->essid_size); | 4606 | * the frame for us. Make sure the source and the destination |
1934 | join.essid_size = priv->essid_size; | 4607 | * match the 802.11 header. Which hardware does it? */ |
1935 | memcpy(join.bssid, priv->bssid, ETH_ALEN); | 4608 | eth_hdr_p = (struct ethhdr *)skb_pull(skb, IEEE80211_3ADDR_LEN); |
1936 | join.bss_type = INFRASTRUCTURE_MODE; | ||
1937 | join.channel = priv->channel; | ||
1938 | join.timeout = cpu_to_le16(2000); | ||
1939 | 4609 | ||
1940 | at76_dbg(DBG_MAC80211, "%s: sending CMD_JOIN", __func__); | 4610 | dest_addr = i802_11_hdr->addr1; |
1941 | ret = at76_set_card_command(priv->udev, CMD_JOIN, &join, | 4611 | if (iw_mode == IW_MODE_ADHOC) |
1942 | sizeof(struct at76_req_join)); | 4612 | src_addr = i802_11_hdr->addr2; |
4613 | else | ||
4614 | src_addr = i802_11_hdr->addr3; | ||
1943 | 4615 | ||
1944 | if (ret < 0) { | 4616 | if (!compare_ether_addr(eth_hdr_p->h_source, src_addr) && |
1945 | printk(KERN_ERR "%s: at76_set_card_command failed: %d\n", | 4617 | !compare_ether_addr(eth_hdr_p->h_dest, dest_addr)) |
1946 | wiphy_name(priv->hw->wiphy), ret); | 4618 | /* Yes, we already have an ethernet header */ |
1947 | return 0; | 4619 | skb_reset_mac_header(skb); |
1948 | } | 4620 | else { |
4621 | u16 len; | ||
4622 | |||
4623 | /* Need to build an ethernet header */ | ||
4624 | if (!memcmp(skb->data, snapsig, sizeof(snapsig))) { | ||
4625 | /* SNAP frame - decapsulate, keep proto */ | ||
4626 | skb_push(skb, offsetof(struct ethhdr, h_proto) - | ||
4627 | sizeof(rfc1042sig)); | ||
4628 | len = 0; | ||
4629 | } else { | ||
4630 | /* 802.3 frame, proto is length */ | ||
4631 | len = skb->len; | ||
4632 | skb_push(skb, ETH_HLEN); | ||
4633 | } | ||
1949 | 4634 | ||
1950 | ret = at76_wait_completion(priv, CMD_JOIN); | 4635 | skb_reset_mac_header(skb); |
1951 | at76_dbg(DBG_MAC80211, "%s: CMD_JOIN returned: 0x%02x", __func__, ret); | 4636 | eth_hdr_p = eth_hdr(skb); |
1952 | if (ret != CMD_STATUS_COMPLETE) { | 4637 | /* This needs to be done in this order (eth_hdr_p->h_dest may |
1953 | printk(KERN_ERR "%s: at76_wait_completion failed: %d\n", | 4638 | * overlap src_addr) */ |
1954 | wiphy_name(priv->hw->wiphy), ret); | 4639 | memcpy(eth_hdr_p->h_source, src_addr, ETH_ALEN); |
1955 | return 0; | 4640 | memcpy(eth_hdr_p->h_dest, dest_addr, ETH_ALEN); |
4641 | if (len) | ||
4642 | eth_hdr_p->h_proto = htons(len); | ||
1956 | } | 4643 | } |
1957 | 4644 | ||
1958 | at76_set_tkip_bssid(priv, priv->bssid); | 4645 | skb->protocol = eth_type_trans(skb, skb->dev); |
1959 | at76_set_pm_mode(priv); | ||
1960 | |||
1961 | return 0; | ||
1962 | } | 4646 | } |
1963 | 4647 | ||
1964 | static void at76_dwork_hw_scan(struct work_struct *work) | 4648 | /* Check for fragmented data in priv->rx_skb. If the packet was no fragment |
4649 | or it was the last of a fragment set a skb containing the whole packet | ||
4650 | is returned for further processing. Otherwise we get NULL and are | ||
4651 | done and the packet is either stored inside the fragment buffer | ||
4652 | or thrown away. Every returned skb starts with the ieee802_11 header | ||
4653 | and contains _no_ FCS at the end */ | ||
4654 | static struct sk_buff *at76_check_for_rx_frags(struct at76_priv *priv) | ||
1965 | { | 4655 | { |
1966 | struct at76_priv *priv = container_of(work, struct at76_priv, | 4656 | struct sk_buff *skb = priv->rx_skb; |
1967 | dwork_hw_scan.work); | 4657 | struct at76_rx_buffer *buf = (struct at76_rx_buffer *)skb->data; |
1968 | int ret; | 4658 | struct ieee80211_hdr_3addr *i802_11_hdr = |
4659 | (struct ieee80211_hdr_3addr *)buf->packet; | ||
4660 | /* seq_ctrl, fragment_number, sequence number of new packet */ | ||
4661 | u16 sctl = le16_to_cpu(i802_11_hdr->seq_ctl); | ||
4662 | u16 fragnr = sctl & 0xf; | ||
4663 | u16 seqnr = sctl >> 4; | ||
4664 | u16 frame_ctl = le16_to_cpu(i802_11_hdr->frame_ctl); | ||
1969 | 4665 | ||
1970 | ret = at76_get_cmd_status(priv->udev, CMD_SCAN); | 4666 | /* Length including the IEEE802.11 header, but without the trailing |
1971 | at76_dbg(DBG_MAC80211, "%s: CMD_SCAN status 0x%02x", __func__, ret); | 4667 | * FCS and without the Atmel Rx header */ |
4668 | int length = le16_to_cpu(buf->wlength) - IEEE80211_FCS_LEN; | ||
1972 | 4669 | ||
1973 | /* FIXME: add maximum time for scan to complete */ | 4670 | /* where does the data payload start in skb->data ? */ |
4671 | u8 *data = i802_11_hdr->payload; | ||
1974 | 4672 | ||
1975 | if (ret != CMD_STATUS_COMPLETE) { | 4673 | /* length of payload, excl. the trailing FCS */ |
1976 | queue_delayed_work(priv->hw->workqueue, &priv->dwork_hw_scan, | 4674 | int data_len = length - IEEE80211_3ADDR_LEN; |
1977 | SCAN_POLL_INTERVAL); | 4675 | |
1978 | goto exit; | 4676 | int i; |
4677 | struct rx_data_buf *bptr, *optr; | ||
4678 | unsigned long oldest = ~0UL; | ||
4679 | |||
4680 | at76_dbg(DBG_RX_FRAGS, | ||
4681 | "%s: rx data frame_ctl %04x addr2 %s seq/frag %d/%d " | ||
4682 | "length %d data %d: %s ...", priv->netdev->name, frame_ctl, | ||
4683 | mac2str(i802_11_hdr->addr2), seqnr, fragnr, length, data_len, | ||
4684 | hex2str(data, 32)); | ||
4685 | |||
4686 | at76_dbg(DBG_RX_FRAGS_SKB, "%s: incoming skb: head %p data %p " | ||
4687 | "tail %p end %p len %d", priv->netdev->name, skb->head, | ||
4688 | skb->data, skb_tail_pointer(skb), skb_end_pointer(skb), | ||
4689 | skb->len); | ||
4690 | |||
4691 | if (data_len < 0) { | ||
4692 | /* make sure data starts in the buffer */ | ||
4693 | printk(KERN_INFO "%s: data frame too short\n", | ||
4694 | priv->netdev->name); | ||
4695 | return NULL; | ||
1979 | } | 4696 | } |
1980 | 4697 | ||
1981 | ieee80211_scan_completed(priv->hw); | 4698 | WARN_ON(length <= AT76_RX_HDRLEN); |
4699 | if (length <= AT76_RX_HDRLEN) | ||
4700 | return NULL; | ||
1982 | 4701 | ||
1983 | if (is_valid_ether_addr(priv->bssid)) { | 4702 | /* remove the at76_rx_buffer header - we don't need it anymore */ |
1984 | ieee80211_wake_queues(priv->hw); | 4703 | /* we need the IEEE802.11 header (for the addresses) if this packet |
1985 | at76_join(priv); | 4704 | is the first of a chain */ |
4705 | skb_pull(skb, AT76_RX_HDRLEN); | ||
4706 | |||
4707 | /* remove FCS at end */ | ||
4708 | skb_trim(skb, length); | ||
4709 | |||
4710 | at76_dbg(DBG_RX_FRAGS_SKB, "%s: trimmed skb: head %p data %p tail %p " | ||
4711 | "end %p len %d data %p data_len %d", priv->netdev->name, | ||
4712 | skb->head, skb->data, skb_tail_pointer(skb), | ||
4713 | skb_end_pointer(skb), skb->len, data, data_len); | ||
4714 | |||
4715 | if (fragnr == 0 && !(frame_ctl & IEEE80211_FCTL_MOREFRAGS)) { | ||
4716 | /* unfragmented packet received */ | ||
4717 | /* Use a new skb for the next receive */ | ||
4718 | priv->rx_skb = NULL; | ||
4719 | at76_dbg(DBG_RX_FRAGS, "%s: unfragmented", priv->netdev->name); | ||
4720 | return skb; | ||
1986 | } | 4721 | } |
1987 | 4722 | ||
1988 | ieee80211_wake_queues(priv->hw); | 4723 | /* look if we've got a chain for the sender address. |
4724 | afterwards optr points to first free or the oldest entry, | ||
4725 | or, if i < NR_RX_DATA_BUF, bptr points to the entry for the | ||
4726 | sender address */ | ||
4727 | /* determining the oldest entry doesn't cope with jiffies wrapping | ||
4728 | but I don't care to delete a young entry at these rare moments ... */ | ||
4729 | |||
4730 | bptr = priv->rx_data; | ||
4731 | optr = NULL; | ||
4732 | for (i = 0; i < NR_RX_DATA_BUF; i++, bptr++) { | ||
4733 | if (!bptr->skb) { | ||
4734 | optr = bptr; | ||
4735 | oldest = 0UL; | ||
4736 | continue; | ||
4737 | } | ||
1989 | 4738 | ||
1990 | exit: | 4739 | if (!compare_ether_addr(i802_11_hdr->addr2, bptr->sender)) |
1991 | return; | 4740 | break; |
1992 | } | ||
1993 | 4741 | ||
1994 | static int at76_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len) | 4742 | if (!optr) { |
1995 | { | 4743 | optr = bptr; |
1996 | struct at76_priv *priv = hw->priv; | 4744 | oldest = bptr->last_rx; |
1997 | struct at76_req_scan scan; | 4745 | } else if (bptr->last_rx < oldest) |
1998 | int ret; | 4746 | optr = bptr; |
4747 | } | ||
1999 | 4748 | ||
2000 | at76_dbg(DBG_MAC80211, "%s():", __func__); | 4749 | if (i < NR_RX_DATA_BUF) { |
2001 | at76_dbg_dump(DBG_MAC80211, ssid, len, "ssid %zd bytes:", len); | 4750 | |
4751 | at76_dbg(DBG_RX_FRAGS, "%s: %d. cacheentry (seq/frag = %d/%d) " | ||
4752 | "matched sender addr", | ||
4753 | priv->netdev->name, i, bptr->seqnr, bptr->fragnr); | ||
4754 | |||
4755 | /* bptr points to an entry for the sender address */ | ||
4756 | if (bptr->seqnr == seqnr) { | ||
4757 | int left; | ||
4758 | /* the fragment has the current sequence number */ | ||
4759 | if (((bptr->fragnr + 1) & 0xf) != fragnr) { | ||
4760 | /* wrong fragment number -> ignore it */ | ||
4761 | /* is & 0xf necessary above ??? */ | ||
4762 | at76_dbg(DBG_RX_FRAGS, | ||
4763 | "%s: frag nr mismatch: %d + 1 != %d", | ||
4764 | priv->netdev->name, bptr->fragnr, | ||
4765 | fragnr); | ||
4766 | return NULL; | ||
4767 | } | ||
4768 | bptr->last_rx = jiffies; | ||
4769 | /* the next following fragment number -> | ||
4770 | add the data at the end */ | ||
4771 | |||
4772 | /* for test only ??? */ | ||
4773 | left = skb_tailroom(bptr->skb); | ||
4774 | if (left < data_len) | ||
4775 | printk(KERN_INFO | ||
4776 | "%s: only %d byte free (need %d)\n", | ||
4777 | priv->netdev->name, left, data_len); | ||
4778 | else | ||
4779 | memcpy(skb_put(bptr->skb, data_len), data, | ||
4780 | data_len); | ||
4781 | |||
4782 | bptr->fragnr = fragnr; | ||
4783 | if (frame_ctl & IEEE80211_FCTL_MOREFRAGS) | ||
4784 | return NULL; | ||
4785 | |||
4786 | /* this was the last fragment - send it */ | ||
4787 | skb = bptr->skb; | ||
4788 | bptr->skb = NULL; /* free the entry */ | ||
4789 | at76_dbg(DBG_RX_FRAGS, "%s: last frag of seq %d", | ||
4790 | priv->netdev->name, seqnr); | ||
4791 | return skb; | ||
4792 | } | ||
2002 | 4793 | ||
2003 | mutex_lock(&priv->mtx); | 4794 | /* got another sequence number */ |
4795 | if (fragnr == 0) { | ||
4796 | /* it's the start of a new chain - replace the | ||
4797 | old one by this */ | ||
4798 | /* bptr->sender has the correct value already */ | ||
4799 | at76_dbg(DBG_RX_FRAGS, | ||
4800 | "%s: start of new seq %d, removing old seq %d", | ||
4801 | priv->netdev->name, seqnr, bptr->seqnr); | ||
4802 | bptr->seqnr = seqnr; | ||
4803 | bptr->fragnr = 0; | ||
4804 | bptr->last_rx = jiffies; | ||
4805 | /* swap bptr->skb and priv->rx_skb */ | ||
4806 | skb = bptr->skb; | ||
4807 | bptr->skb = priv->rx_skb; | ||
4808 | priv->rx_skb = skb; | ||
4809 | } else { | ||
4810 | /* it from the middle of a new chain -> | ||
4811 | delete the old entry and skip the new one */ | ||
4812 | at76_dbg(DBG_RX_FRAGS, | ||
4813 | "%s: middle of new seq %d (%d) " | ||
4814 | "removing old seq %d", | ||
4815 | priv->netdev->name, seqnr, fragnr, | ||
4816 | bptr->seqnr); | ||
4817 | dev_kfree_skb(bptr->skb); | ||
4818 | bptr->skb = NULL; | ||
4819 | } | ||
4820 | return NULL; | ||
4821 | } | ||
2004 | 4822 | ||
2005 | ieee80211_stop_queues(hw); | 4823 | /* if we didn't find a chain for the sender address, optr |
4824 | points either to the first free or the oldest entry */ | ||
2006 | 4825 | ||
2007 | memset(&scan, 0, sizeof(struct at76_req_scan)); | 4826 | if (fragnr != 0) { |
2008 | memset(scan.bssid, 0xFF, ETH_ALEN); | 4827 | /* this is not the begin of a fragment chain ... */ |
2009 | scan.scan_type = SCAN_TYPE_ACTIVE; | 4828 | at76_dbg(DBG_RX_FRAGS, |
2010 | if (priv->essid_size > 0) { | 4829 | "%s: no chain for non-first fragment (%d)", |
2011 | memcpy(scan.essid, ssid, len); | 4830 | priv->netdev->name, fragnr); |
2012 | scan.essid_size = len; | 4831 | return NULL; |
2013 | } | 4832 | } |
2014 | scan.min_channel_time = cpu_to_le16(priv->scan_min_time); | ||
2015 | scan.max_channel_time = cpu_to_le16(priv->scan_max_time); | ||
2016 | scan.probe_delay = cpu_to_le16(priv->scan_min_time * 1000); | ||
2017 | scan.international_scan = 0; | ||
2018 | 4833 | ||
2019 | at76_dbg(DBG_MAC80211, "%s: sending CMD_SCAN", __func__); | 4834 | BUG_ON(!optr); |
2020 | ret = at76_set_card_command(priv->udev, CMD_SCAN, &scan, sizeof(scan)); | 4835 | if (optr->skb) { |
4836 | /* swap the skb's */ | ||
4837 | skb = optr->skb; | ||
4838 | optr->skb = priv->rx_skb; | ||
4839 | priv->rx_skb = skb; | ||
2021 | 4840 | ||
2022 | if (ret < 0) { | 4841 | at76_dbg(DBG_RX_FRAGS, |
2023 | err("CMD_SCAN failed: %d", ret); | 4842 | "%s: free old contents: sender %s seq/frag %d/%d", |
2024 | goto exit; | 4843 | priv->netdev->name, mac2str(optr->sender), |
2025 | } | 4844 | optr->seqnr, optr->fragnr); |
2026 | 4845 | ||
2027 | queue_delayed_work(priv->hw->workqueue, &priv->dwork_hw_scan, | 4846 | } else { |
2028 | SCAN_POLL_INTERVAL); | 4847 | /* take the skb from priv->rx_skb */ |
4848 | optr->skb = priv->rx_skb; | ||
4849 | /* let at76_submit_rx_urb() allocate a new skb */ | ||
4850 | priv->rx_skb = NULL; | ||
2029 | 4851 | ||
2030 | exit: | 4852 | at76_dbg(DBG_RX_FRAGS, "%s: use a free entry", |
2031 | mutex_unlock(&priv->mtx); | 4853 | priv->netdev->name); |
4854 | } | ||
4855 | memcpy(optr->sender, i802_11_hdr->addr2, ETH_ALEN); | ||
4856 | optr->seqnr = seqnr; | ||
4857 | optr->fragnr = 0; | ||
4858 | optr->last_rx = jiffies; | ||
2032 | 4859 | ||
2033 | return 0; | 4860 | return NULL; |
2034 | } | 4861 | } |
2035 | 4862 | ||
2036 | static int at76_config(struct ieee80211_hw *hw, u32 changed) | 4863 | /* Rx interrupt: we expect the complete data buffer in priv->rx_skb */ |
4864 | static void at76_rx_data(struct at76_priv *priv) | ||
2037 | { | 4865 | { |
2038 | struct at76_priv *priv = hw->priv; | 4866 | struct net_device *netdev = priv->netdev; |
2039 | struct ieee80211_conf *conf = &hw->conf; | 4867 | struct net_device_stats *stats = &priv->stats; |
4868 | struct sk_buff *skb = priv->rx_skb; | ||
4869 | struct at76_rx_buffer *buf = (struct at76_rx_buffer *)skb->data; | ||
4870 | struct ieee80211_hdr_3addr *i802_11_hdr; | ||
4871 | int length = le16_to_cpu(buf->wlength); | ||
2040 | 4872 | ||
2041 | at76_dbg(DBG_MAC80211, "%s(): channel %d radio %d", | 4873 | at76_dbg(DBG_RX_DATA, "%s received data packet: %s", netdev->name, |
2042 | __func__, conf->channel->hw_value, conf->radio_enabled); | 4874 | hex2str(skb->data, AT76_RX_HDRLEN)); |
2043 | at76_dbg_dump(DBG_MAC80211, priv->essid, priv->essid_size, "ssid:"); | ||
2044 | at76_dbg_dump(DBG_MAC80211, priv->bssid, ETH_ALEN, "bssid:"); | ||
2045 | 4875 | ||
2046 | mutex_lock(&priv->mtx); | 4876 | at76_dbg(DBG_RX_DATA_CONTENT, "rx packet: %s", |
4877 | hex2str(skb->data + AT76_RX_HDRLEN, length)); | ||
2047 | 4878 | ||
2048 | priv->channel = conf->channel->hw_value; | 4879 | skb = at76_check_for_rx_frags(priv); |
4880 | if (!skb) | ||
4881 | return; | ||
2049 | 4882 | ||
2050 | if (is_valid_ether_addr(priv->bssid)) { | 4883 | /* Atmel header and the FCS are already removed */ |
2051 | at76_join(priv); | 4884 | i802_11_hdr = (struct ieee80211_hdr_3addr *)skb->data; |
2052 | ieee80211_wake_queues(priv->hw); | ||
2053 | } else { | ||
2054 | ieee80211_stop_queues(priv->hw); | ||
2055 | at76_start_monitor(priv); | ||
2056 | }; | ||
2057 | 4885 | ||
2058 | mutex_unlock(&priv->mtx); | 4886 | skb->dev = netdev; |
4887 | skb->ip_summed = CHECKSUM_NONE; /* TODO: should check CRC */ | ||
2059 | 4888 | ||
2060 | return 0; | 4889 | if (is_broadcast_ether_addr(i802_11_hdr->addr1)) { |
2061 | } | 4890 | if (!compare_ether_addr(i802_11_hdr->addr1, netdev->broadcast)) |
4891 | skb->pkt_type = PACKET_BROADCAST; | ||
4892 | else | ||
4893 | skb->pkt_type = PACKET_MULTICAST; | ||
4894 | } else if (compare_ether_addr(i802_11_hdr->addr1, netdev->dev_addr)) | ||
4895 | skb->pkt_type = PACKET_OTHERHOST; | ||
2062 | 4896 | ||
2063 | static int at76_config_interface(struct ieee80211_hw *hw, | 4897 | at76_ieee80211_to_eth(skb, priv->iw_mode); |
2064 | struct ieee80211_vif *vif, | ||
2065 | struct ieee80211_if_conf *conf) | ||
2066 | { | ||
2067 | struct at76_priv *priv = hw->priv; | ||
2068 | 4898 | ||
2069 | at76_dbg_dump(DBG_MAC80211, conf->bssid, ETH_ALEN, "bssid:"); | 4899 | netdev->last_rx = jiffies; |
4900 | netif_rx(skb); | ||
4901 | stats->rx_packets++; | ||
4902 | stats->rx_bytes += length; | ||
2070 | 4903 | ||
2071 | mutex_lock(&priv->mtx); | 4904 | return; |
4905 | } | ||
2072 | 4906 | ||
2073 | memcpy(priv->bssid, conf->bssid, ETH_ALEN); | 4907 | static void at76_rx_monitor_mode(struct at76_priv *priv) |
2074 | // memcpy(priv->essid, conf->ssid, conf->ssid_len); | 4908 | { |
2075 | // priv->essid_size = conf->ssid_len; | 4909 | struct at76_rx_radiotap *rt; |
4910 | u8 *payload; | ||
4911 | int skblen; | ||
4912 | struct net_device *netdev = priv->netdev; | ||
4913 | struct at76_rx_buffer *buf = | ||
4914 | (struct at76_rx_buffer *)priv->rx_skb->data; | ||
4915 | /* length including the IEEE802.11 header and the trailing FCS, | ||
4916 | but not at76_rx_buffer */ | ||
4917 | int length = le16_to_cpu(buf->wlength); | ||
4918 | struct sk_buff *skb = priv->rx_skb; | ||
4919 | struct net_device_stats *stats = &priv->stats; | ||
2076 | 4920 | ||
2077 | if (is_valid_ether_addr(priv->bssid)) { | 4921 | if (length < IEEE80211_FCS_LEN) { |
2078 | /* mac80211 is joining a bss */ | 4922 | /* buffer contains no data */ |
2079 | ieee80211_wake_queues(priv->hw); | 4923 | at76_dbg(DBG_MONITOR_MODE, |
2080 | at76_join(priv); | 4924 | "%s: MONITOR MODE: rx skb without data", |
2081 | } else | 4925 | priv->netdev->name); |
2082 | ieee80211_stop_queues(priv->hw); | 4926 | return; |
4927 | } | ||
2083 | 4928 | ||
2084 | mutex_unlock(&priv->mtx); | 4929 | skblen = sizeof(struct at76_rx_radiotap) + length; |
2085 | 4930 | ||
2086 | return 0; | 4931 | skb = dev_alloc_skb(skblen); |
4932 | if (!skb) { | ||
4933 | printk(KERN_ERR "%s: MONITOR MODE: dev_alloc_skb for radiotap " | ||
4934 | "header returned NULL\n", priv->netdev->name); | ||
4935 | return; | ||
4936 | } | ||
4937 | |||
4938 | skb_put(skb, skblen); | ||
4939 | |||
4940 | rt = (struct at76_rx_radiotap *)skb->data; | ||
4941 | payload = skb->data + sizeof(struct at76_rx_radiotap); | ||
4942 | |||
4943 | rt->rt_hdr.it_version = 0; | ||
4944 | rt->rt_hdr.it_pad = 0; | ||
4945 | rt->rt_hdr.it_len = cpu_to_le16(sizeof(struct at76_rx_radiotap)); | ||
4946 | rt->rt_hdr.it_present = cpu_to_le32(AT76_RX_RADIOTAP_PRESENT); | ||
4947 | |||
4948 | rt->rt_tsft = cpu_to_le64(le32_to_cpu(buf->rx_time)); | ||
4949 | rt->rt_rate = hw_rates[buf->rx_rate] & (~0x80); | ||
4950 | rt->rt_signal = buf->rssi; | ||
4951 | rt->rt_noise = buf->noise_level; | ||
4952 | rt->rt_flags = IEEE80211_RADIOTAP_F_FCS; | ||
4953 | if (buf->fragmentation) | ||
4954 | rt->rt_flags |= IEEE80211_RADIOTAP_F_FRAG; | ||
4955 | |||
4956 | memcpy(payload, buf->packet, length); | ||
4957 | skb->dev = netdev; | ||
4958 | skb->ip_summed = CHECKSUM_NONE; | ||
4959 | skb_reset_mac_header(skb); | ||
4960 | skb->pkt_type = PACKET_OTHERHOST; | ||
4961 | skb->protocol = htons(ETH_P_802_2); | ||
4962 | |||
4963 | netdev->last_rx = jiffies; | ||
4964 | netif_rx(skb); | ||
4965 | stats->rx_packets++; | ||
4966 | stats->rx_bytes += length; | ||
2087 | } | 4967 | } |
2088 | 4968 | ||
2089 | /* must be atomic */ | 4969 | /* Check if we spy on the sender address in buf and update stats */ |
2090 | static void at76_configure_filter(struct ieee80211_hw *hw, | 4970 | static void at76_iwspy_update(struct at76_priv *priv, |
2091 | unsigned int changed_flags, | 4971 | struct at76_rx_buffer *buf) |
2092 | unsigned int *total_flags, int mc_count, | ||
2093 | struct dev_addr_list *mc_list) | ||
2094 | { | 4972 | { |
2095 | struct at76_priv *priv = hw->priv; | 4973 | struct ieee80211_hdr_3addr *hdr = |
2096 | int flags; | 4974 | (struct ieee80211_hdr_3addr *)buf->packet; |
2097 | 4975 | struct iw_quality qual; | |
2098 | at76_dbg(DBG_MAC80211, "%s(): changed_flags=0x%08x " | ||
2099 | "total_flags=0x%08x mc_count=%d", | ||
2100 | __func__, changed_flags, *total_flags, mc_count); | ||
2101 | 4976 | ||
2102 | flags = changed_flags & AT76_SUPPORTED_FILTERS; | 4977 | /* We can only set the level here */ |
2103 | *total_flags = AT76_SUPPORTED_FILTERS; | 4978 | qual.updated = IW_QUAL_QUAL_INVALID | IW_QUAL_NOISE_INVALID; |
4979 | qual.level = 0; | ||
4980 | qual.noise = 0; | ||
4981 | at76_calc_level(priv, buf, &qual); | ||
2104 | 4982 | ||
2105 | /* FIXME: access to priv->promisc should be protected with | 4983 | spin_lock_bh(&priv->spy_spinlock); |
2106 | * priv->mtx, but it's impossible because this function needs to be | ||
2107 | * atomic */ | ||
2108 | 4984 | ||
2109 | if (flags && !priv->promisc) { | 4985 | if (priv->spy_data.spy_number > 0) |
2110 | /* mac80211 wants us to enable promiscuous mode */ | 4986 | wireless_spy_update(priv->netdev, hdr->addr2, &qual); |
2111 | priv->promisc = 1; | ||
2112 | } else if (!flags && priv->promisc) { | ||
2113 | /* we need to disable promiscuous mode */ | ||
2114 | priv->promisc = 0; | ||
2115 | } else | ||
2116 | return; | ||
2117 | 4987 | ||
2118 | queue_work(hw->workqueue, &priv->work_set_promisc); | 4988 | spin_unlock_bh(&priv->spy_spinlock); |
2119 | } | 4989 | } |
2120 | 4990 | ||
2121 | static int at76_set_key_oldfw(struct ieee80211_hw *hw, enum set_key_cmd cmd, | 4991 | static void at76_rx_tasklet(unsigned long param) |
2122 | const u8 *local_address, const u8 *address, | ||
2123 | struct ieee80211_key_conf *key) | ||
2124 | { | 4992 | { |
2125 | struct at76_priv *priv = hw->priv; | 4993 | struct urb *urb = (struct urb *)param; |
2126 | 4994 | struct at76_priv *priv = urb->context; | |
2127 | int i; | 4995 | struct net_device *netdev = priv->netdev; |
2128 | 4996 | struct at76_rx_buffer *buf; | |
2129 | at76_dbg(DBG_MAC80211, "%s(): cmd %d key->alg %d key->keyidx %d " | 4997 | struct ieee80211_hdr_3addr *i802_11_hdr; |
2130 | "key->keylen %d", | 4998 | u16 frame_ctl; |
2131 | __func__, cmd, key->alg, key->keyidx, key->keylen); | ||
2132 | 4999 | ||
2133 | if (key->alg != ALG_WEP) | 5000 | if (priv->device_unplugged) { |
2134 | return -EOPNOTSUPP; | 5001 | at76_dbg(DBG_DEVSTART, "device unplugged"); |
5002 | if (urb) | ||
5003 | at76_dbg(DBG_DEVSTART, "urb status %d", urb->status); | ||
5004 | return; | ||
5005 | } | ||
2135 | 5006 | ||
2136 | key->hw_key_idx = key->keyidx; | 5007 | if (!priv->rx_skb || !netdev || !priv->rx_skb->data) |
5008 | return; | ||
2137 | 5009 | ||
2138 | mutex_lock(&priv->mtx); | 5010 | buf = (struct at76_rx_buffer *)priv->rx_skb->data; |
2139 | 5011 | ||
2140 | switch (cmd) { | 5012 | i802_11_hdr = (struct ieee80211_hdr_3addr *)buf->packet; |
2141 | case SET_KEY: | ||
2142 | memcpy(priv->wep_keys[key->keyidx], key->key, key->keylen); | ||
2143 | priv->wep_keys_len[key->keyidx] = key->keylen; | ||
2144 | 5013 | ||
2145 | /* FIXME: find out how to do this properly */ | 5014 | frame_ctl = le16_to_cpu(i802_11_hdr->frame_ctl); |
2146 | priv->wep_key_id = key->keyidx; | ||
2147 | 5015 | ||
2148 | break; | 5016 | if (urb->status != 0) { |
2149 | case DISABLE_KEY: | 5017 | if (urb->status != -ENOENT && urb->status != -ECONNRESET) |
2150 | default: | 5018 | at76_dbg(DBG_URB, |
2151 | priv->wep_keys_len[key->keyidx] = 0; | 5019 | "%s %s: - nonzero Rx bulk status received: %d", |
2152 | break; | 5020 | __func__, netdev->name, urb->status); |
5021 | return; | ||
2153 | } | 5022 | } |
2154 | 5023 | ||
2155 | priv->wep_enabled = 0; | 5024 | at76_dbg(DBG_RX_ATMEL_HDR, |
5025 | "%s: rx frame: rate %d rssi %d noise %d link %d %s", | ||
5026 | priv->netdev->name, buf->rx_rate, buf->rssi, buf->noise_level, | ||
5027 | buf->link_quality, hex2str(i802_11_hdr, 48)); | ||
5028 | if (priv->iw_mode == IW_MODE_MONITOR) { | ||
5029 | at76_rx_monitor_mode(priv); | ||
5030 | goto exit; | ||
5031 | } | ||
2156 | 5032 | ||
2157 | for (i = 0; i < WEP_KEYS; i++) { | 5033 | /* there is a new bssid around, accept it: */ |
2158 | if (priv->wep_keys_len[i] != 0) | 5034 | if (buf->newbss && priv->iw_mode == IW_MODE_ADHOC) { |
2159 | priv->wep_enabled = 1; | 5035 | at76_dbg(DBG_PROGRESS, "%s: rx newbss", netdev->name); |
5036 | schedule_work(&priv->work_new_bss); | ||
2160 | } | 5037 | } |
2161 | 5038 | ||
2162 | at76_startup_device(priv); | 5039 | switch (frame_ctl & IEEE80211_FCTL_FTYPE) { |
5040 | case IEEE80211_FTYPE_DATA: | ||
5041 | at76_rx_data(priv); | ||
5042 | break; | ||
2163 | 5043 | ||
2164 | mutex_unlock(&priv->mtx); | 5044 | case IEEE80211_FTYPE_MGMT: |
5045 | /* jal: TODO: find out if we can update iwspy also on | ||
5046 | other frames than management (might depend on the | ||
5047 | radio chip / firmware version !) */ | ||
2165 | 5048 | ||
2166 | return 0; | 5049 | at76_iwspy_update(priv, buf); |
2167 | } | ||
2168 | 5050 | ||
2169 | static int at76_set_key_newfw(struct ieee80211_hw *hw, enum set_key_cmd cmd, | 5051 | at76_rx_mgmt(priv, buf); |
2170 | const u8 *local_address, const u8 *address, | 5052 | break; |
2171 | struct ieee80211_key_conf *key) | ||
2172 | { | ||
2173 | struct at76_priv *priv = hw->priv; | ||
2174 | int ret = -EOPNOTSUPP; | ||
2175 | |||
2176 | at76_dbg(DBG_MAC80211, "%s(): cmd %d key->alg %d key->keyidx %d " | ||
2177 | "key->keylen %d", | ||
2178 | __func__, cmd, key->alg, key->keyidx, key->keylen); | ||
2179 | 5053 | ||
2180 | mutex_lock(&priv->mtx); | 5054 | case IEEE80211_FTYPE_CTL: |
5055 | at76_dbg(DBG_RX_CTRL, "%s: ignored ctrl frame: %04x", | ||
5056 | priv->netdev->name, frame_ctl); | ||
5057 | break; | ||
2181 | 5058 | ||
2182 | priv->mib_buf.type = MIB_MAC_ENCRYPTION; | 5059 | default: |
5060 | printk(KERN_DEBUG "%s: ignoring frame with framectl 0x%04x\n", | ||
5061 | priv->netdev->name, frame_ctl); | ||
5062 | } | ||
5063 | exit: | ||
5064 | at76_submit_rx_urb(priv); | ||
5065 | } | ||
2183 | 5066 | ||
2184 | if (cmd == DISABLE_KEY) { | 5067 | /* Load firmware into kernel memory and parse it */ |
2185 | priv->mib_buf.size = CIPHER_KEY_LEN; | 5068 | static struct fwentry *at76_load_firmware(struct usb_device *udev, |
2186 | priv->mib_buf.index = offsetof(struct mib_mac_encryption, | 5069 | enum board_type board_type) |
2187 | cipher_default_keyvalue[key->keyidx]); | 5070 | { |
2188 | memset(priv->mib_buf.data.data, 0, CIPHER_KEY_LEN); | 5071 | int ret; |
2189 | if (at76_set_mib(priv, &priv->mib_buf) != CMD_STATUS_COMPLETE) | 5072 | char *str; |
2190 | ret = -EOPNOTSUPP; /* -EIO would be probably better */ | 5073 | struct at76_fw_header *fwh; |
2191 | else { | 5074 | struct fwentry *fwe = &firmwares[board_type]; |
2192 | 5075 | ||
2193 | priv->keys[key->keyidx].cipher = CIPHER_NONE; | 5076 | mutex_lock(&fw_mutex); |
2194 | priv->keys[key->keyidx].keylen = 0; | ||
2195 | }; | ||
2196 | if (priv->default_group_key == key->keyidx) | ||
2197 | priv->default_group_key = 0xff; | ||
2198 | 5077 | ||
2199 | if (priv->default_pairwise_key == key->keyidx) | 5078 | if (fwe->loaded) { |
2200 | priv->default_pairwise_key = 0xff; | 5079 | at76_dbg(DBG_FW, "re-using previously loaded fw"); |
2201 | /* If default pairwise key is removed, fall back to | ||
2202 | * group key? */ | ||
2203 | ret = 0; | ||
2204 | goto exit; | 5080 | goto exit; |
2205 | }; | 5081 | } |
2206 | |||
2207 | if (cmd == SET_KEY) { | ||
2208 | /* store key into MIB */ | ||
2209 | priv->mib_buf.size = CIPHER_KEY_LEN; | ||
2210 | priv->mib_buf.index = offsetof(struct mib_mac_encryption, | ||
2211 | cipher_default_keyvalue[key->keyidx]); | ||
2212 | memset(priv->mib_buf.data.data, 0, CIPHER_KEY_LEN); | ||
2213 | memcpy(priv->mib_buf.data.data, key->key, key->keylen); | ||
2214 | |||
2215 | switch (key->alg) { | ||
2216 | case ALG_WEP: | ||
2217 | if (key->keylen == 5) { | ||
2218 | priv->keys[key->keyidx].cipher = | ||
2219 | CIPHER_WEP64; | ||
2220 | priv->keys[key->keyidx].keylen = 8; | ||
2221 | } else if (key->keylen == 13) { | ||
2222 | priv->keys[key->keyidx].cipher = | ||
2223 | CIPHER_WEP128; | ||
2224 | /* Firmware needs this */ | ||
2225 | priv->keys[key->keyidx].keylen = 8; | ||
2226 | } else { | ||
2227 | ret = -EOPNOTSUPP; | ||
2228 | goto exit; | ||
2229 | }; | ||
2230 | break; | ||
2231 | case ALG_TKIP: | ||
2232 | key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC; | ||
2233 | priv->keys[key->keyidx].cipher = CIPHER_TKIP; | ||
2234 | priv->keys[key->keyidx].keylen = 12; | ||
2235 | break; | ||
2236 | 5082 | ||
2237 | case ALG_CCMP: | 5083 | at76_dbg(DBG_FW, "downloading firmware %s", fwe->fwname); |
2238 | if (!at76_is_505a(priv->board_type)) { | 5084 | ret = request_firmware(&fwe->fw, fwe->fwname, &udev->dev); |
2239 | ret = -EOPNOTSUPP; | 5085 | if (ret < 0) { |
2240 | goto exit; | 5086 | dev_printk(KERN_ERR, &udev->dev, "firmware %s not found!\n", |
2241 | }; | 5087 | fwe->fwname); |
2242 | key->flags |= IEEE80211_KEY_FLAG_GENERATE_MMIC; | 5088 | dev_printk(KERN_ERR, &udev->dev, |
2243 | priv->keys[key->keyidx].cipher = CIPHER_CCMP; | 5089 | "you may need to download the firmware from " |
2244 | priv->keys[key->keyidx].keylen = 16; | 5090 | "http://developer.berlios.de/projects/at76c503a/"); |
2245 | break; | 5091 | goto exit; |
5092 | } | ||
2246 | 5093 | ||
2247 | default: | 5094 | at76_dbg(DBG_FW, "got it."); |
2248 | ret = -EOPNOTSUPP; | 5095 | fwh = (struct at76_fw_header *)(fwe->fw->data); |
2249 | goto exit; | ||
2250 | }; | ||
2251 | |||
2252 | priv->mib_buf.data.data[38] = priv->keys[key->keyidx].cipher; | ||
2253 | priv->mib_buf.data.data[39] = 1; /* Taken from atmelwlandriver, | ||
2254 | not documented */ | ||
2255 | |||
2256 | if (is_valid_ether_addr(address)) | ||
2257 | /* Pairwise key */ | ||
2258 | priv->mib_buf.data.data[39] |= (KEY_PAIRWISE | KEY_TX); | ||
2259 | else if (is_broadcast_ether_addr(address)) | ||
2260 | /* Group key */ | ||
2261 | priv->mib_buf.data.data[39] |= (KEY_TX); | ||
2262 | else /* Key used only for transmission ??? */ | ||
2263 | priv->mib_buf.data.data[39] |= (KEY_TX); | ||
2264 | |||
2265 | if (at76_set_mib(priv, &priv->mib_buf) != | ||
2266 | CMD_STATUS_COMPLETE) { | ||
2267 | ret = -EOPNOTSUPP; /* -EIO would be probably better */ | ||
2268 | goto exit; | ||
2269 | }; | ||
2270 | 5096 | ||
2271 | if ((key->alg == ALG_TKIP) || (key->alg == ALG_CCMP)) | 5097 | if (fwe->fw->size <= sizeof(*fwh)) { |
2272 | at76_reset_rsc(priv); | 5098 | dev_printk(KERN_ERR, &udev->dev, |
5099 | "firmware is too short (0x%zx)\n", fwe->fw->size); | ||
5100 | goto exit; | ||
5101 | } | ||
2273 | 5102 | ||
2274 | key->hw_key_idx = key->keyidx; | 5103 | /* CRC currently not checked */ |
5104 | fwe->board_type = le32_to_cpu(fwh->board_type); | ||
5105 | if (fwe->board_type != board_type) { | ||
5106 | dev_printk(KERN_ERR, &udev->dev, | ||
5107 | "board type mismatch, requested %u, got %u\n", | ||
5108 | board_type, fwe->board_type); | ||
5109 | goto exit; | ||
5110 | } | ||
2275 | 5111 | ||
2276 | /* Set up default keys */ | 5112 | fwe->fw_version.major = fwh->major; |
2277 | if (is_broadcast_ether_addr(address)) | 5113 | fwe->fw_version.minor = fwh->minor; |
2278 | priv->default_group_key = key->keyidx; | 5114 | fwe->fw_version.patch = fwh->patch; |
2279 | if (is_valid_ether_addr(address)) | 5115 | fwe->fw_version.build = fwh->build; |
2280 | priv->default_pairwise_key = key->keyidx; | ||
2281 | 5116 | ||
2282 | /* Set up encryption MIBs */ | 5117 | str = (char *)fwh + le32_to_cpu(fwh->str_offset); |
5118 | fwe->intfw = (u8 *)fwh + le32_to_cpu(fwh->int_fw_offset); | ||
5119 | fwe->intfw_size = le32_to_cpu(fwh->int_fw_len); | ||
5120 | fwe->extfw = (u8 *)fwh + le32_to_cpu(fwh->ext_fw_offset); | ||
5121 | fwe->extfw_size = le32_to_cpu(fwh->ext_fw_len); | ||
2283 | 5122 | ||
2284 | /* first block of settings */ | 5123 | fwe->loaded = 1; |
2285 | priv->mib_buf.size = 3; | ||
2286 | priv->mib_buf.index = offsetof(struct mib_mac_encryption, | ||
2287 | privacy_invoked); | ||
2288 | priv->mib_buf.data.data[0] = 1; /* privacy_invoked */ | ||
2289 | priv->mib_buf.data.data[1] = priv->default_pairwise_key; | ||
2290 | priv->mib_buf.data.data[2] = priv->default_group_key; | ||
2291 | 5124 | ||
2292 | ret = at76_set_mib(priv, &priv->mib_buf); | 5125 | dev_printk(KERN_DEBUG, &udev->dev, |
2293 | if (ret != CMD_STATUS_COMPLETE) | 5126 | "using firmware %s (version %d.%d.%d-%d)\n", |
2294 | goto exit; | 5127 | fwe->fwname, fwh->major, fwh->minor, fwh->patch, fwh->build); |
2295 | 5128 | ||
2296 | /* second block of settings */ | 5129 | at76_dbg(DBG_DEVSTART, "board %u, int %d:%d, ext %d:%d", board_type, |
2297 | priv->mib_buf.size = 3; | 5130 | le32_to_cpu(fwh->int_fw_offset), le32_to_cpu(fwh->int_fw_len), |
2298 | priv->mib_buf.index = offsetof(struct mib_mac_encryption, | 5131 | le32_to_cpu(fwh->ext_fw_offset), le32_to_cpu(fwh->ext_fw_len)); |
2299 | exclude_unencrypted); | 5132 | at76_dbg(DBG_DEVSTART, "firmware id %s", str); |
2300 | priv->mib_buf.data.data[0] = 1; /* exclude_unencrypted */ | ||
2301 | priv->mib_buf.data.data[1] = 0; /* wep_encryption_type */ | ||
2302 | priv->mib_buf.data.data[2] = 0; /* ckip_key_permutation */ | ||
2303 | 5133 | ||
2304 | ret = at76_set_mib(priv, &priv->mib_buf); | ||
2305 | if (ret != CMD_STATUS_COMPLETE) | ||
2306 | goto exit; | ||
2307 | ret = 0; | ||
2308 | }; | ||
2309 | exit: | 5134 | exit: |
2310 | at76_dump_mib_mac_encryption(priv); | 5135 | mutex_unlock(&fw_mutex); |
2311 | mutex_unlock(&priv->mtx); | ||
2312 | return ret; | ||
2313 | } | ||
2314 | |||
2315 | static int at76_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, | ||
2316 | const u8 *local_address, const u8 *address, | ||
2317 | struct ieee80211_key_conf *key) | ||
2318 | { | ||
2319 | struct at76_priv *priv = hw->priv; | ||
2320 | |||
2321 | at76_dbg(DBG_MAC80211, "%s(): cmd %d key->alg %d key->keyidx %d " | ||
2322 | "key->keylen %d", | ||
2323 | __func__, cmd, key->alg, key->keyidx, key->keylen); | ||
2324 | 5136 | ||
2325 | if (FIRMWARE_IS_WPA(priv->fw_version)) | 5137 | if (fwe->loaded) |
2326 | return at76_set_key_newfw(hw, cmd, local_address, address, key); | 5138 | return fwe; |
2327 | else | 5139 | else |
2328 | return at76_set_key_oldfw(hw, cmd, local_address, address, key); | 5140 | return NULL; |
2329 | |||
2330 | } | 5141 | } |
2331 | 5142 | ||
2332 | static const struct ieee80211_ops at76_ops = { | ||
2333 | .tx = at76_mac80211_tx, | ||
2334 | .add_interface = at76_add_interface, | ||
2335 | .remove_interface = at76_remove_interface, | ||
2336 | .config = at76_config, | ||
2337 | .config_interface = at76_config_interface, | ||
2338 | .configure_filter = at76_configure_filter, | ||
2339 | .start = at76_mac80211_start, | ||
2340 | .stop = at76_mac80211_stop, | ||
2341 | .hw_scan = at76_hw_scan, | ||
2342 | .set_key = at76_set_key, | ||
2343 | }; | ||
2344 | |||
2345 | /* Allocate network device and initialize private data */ | 5143 | /* Allocate network device and initialize private data */ |
2346 | static struct at76_priv *at76_alloc_new_device(struct usb_device *udev) | 5144 | static struct at76_priv *at76_alloc_new_device(struct usb_device *udev) |
2347 | { | 5145 | { |
2348 | struct ieee80211_hw *hw; | 5146 | struct net_device *netdev; |
2349 | struct at76_priv *priv; | 5147 | struct at76_priv *priv; |
5148 | int i; | ||
2350 | 5149 | ||
2351 | hw = ieee80211_alloc_hw(sizeof(struct at76_priv), &at76_ops); | 5150 | /* allocate memory for our device state and initialize it */ |
2352 | if (!hw) { | 5151 | netdev = alloc_etherdev(sizeof(struct at76_priv)); |
2353 | printk(KERN_ERR DRIVER_NAME ": could not register" | 5152 | if (!netdev) { |
2354 | " ieee80211_hw\n"); | 5153 | dev_printk(KERN_ERR, &udev->dev, "out of memory\n"); |
2355 | return NULL; | 5154 | return NULL; |
2356 | } | 5155 | } |
2357 | 5156 | ||
2358 | priv = hw->priv; | 5157 | priv = netdev_priv(netdev); |
2359 | priv->hw = hw; | ||
2360 | 5158 | ||
2361 | priv->udev = udev; | 5159 | priv->udev = udev; |
5160 | priv->netdev = netdev; | ||
2362 | 5161 | ||
2363 | mutex_init(&priv->mtx); | 5162 | mutex_init(&priv->mtx); |
5163 | INIT_WORK(&priv->work_assoc_done, at76_work_assoc_done); | ||
5164 | INIT_WORK(&priv->work_join, at76_work_join); | ||
5165 | INIT_WORK(&priv->work_new_bss, at76_work_new_bss); | ||
5166 | INIT_WORK(&priv->work_start_scan, at76_work_start_scan); | ||
2364 | INIT_WORK(&priv->work_set_promisc, at76_work_set_promisc); | 5167 | INIT_WORK(&priv->work_set_promisc, at76_work_set_promisc); |
2365 | INIT_WORK(&priv->work_submit_rx, at76_work_submit_rx); | 5168 | INIT_WORK(&priv->work_submit_rx, at76_work_submit_rx); |
2366 | INIT_DELAYED_WORK(&priv->dwork_hw_scan, at76_dwork_hw_scan); | 5169 | INIT_DELAYED_WORK(&priv->dwork_restart, at76_dwork_restart); |
5170 | INIT_DELAYED_WORK(&priv->dwork_get_scan, at76_dwork_get_scan); | ||
5171 | INIT_DELAYED_WORK(&priv->dwork_beacon, at76_dwork_beacon); | ||
5172 | INIT_DELAYED_WORK(&priv->dwork_auth, at76_dwork_auth); | ||
5173 | INIT_DELAYED_WORK(&priv->dwork_assoc, at76_dwork_assoc); | ||
5174 | |||
5175 | spin_lock_init(&priv->mgmt_spinlock); | ||
5176 | priv->next_mgmt_bulk = NULL; | ||
5177 | priv->mac_state = MAC_INIT; | ||
5178 | |||
5179 | /* initialize empty BSS list */ | ||
5180 | priv->curr_bss = NULL; | ||
5181 | INIT_LIST_HEAD(&priv->bss_list); | ||
5182 | spin_lock_init(&priv->bss_list_spinlock); | ||
5183 | |||
5184 | init_timer(&priv->bss_list_timer); | ||
5185 | priv->bss_list_timer.data = (unsigned long)priv; | ||
5186 | priv->bss_list_timer.function = at76_bss_list_timeout; | ||
5187 | |||
5188 | spin_lock_init(&priv->spy_spinlock); | ||
5189 | |||
5190 | /* mark all rx data entries as unused */ | ||
5191 | for (i = 0; i < NR_RX_DATA_BUF; i++) | ||
5192 | priv->rx_data[i].skb = NULL; | ||
2367 | 5193 | ||
2368 | priv->rx_tasklet.func = at76_rx_tasklet; | 5194 | priv->rx_tasklet.func = at76_rx_tasklet; |
2369 | priv->rx_tasklet.data = 0; | 5195 | priv->rx_tasklet.data = 0; |
@@ -2371,9 +5197,6 @@ static struct at76_priv *at76_alloc_new_device(struct usb_device *udev) | |||
2371 | priv->pm_mode = AT76_PM_OFF; | 5197 | priv->pm_mode = AT76_PM_OFF; |
2372 | priv->pm_period = 0; | 5198 | priv->pm_period = 0; |
2373 | 5199 | ||
2374 | /* unit us */ | ||
2375 | priv->hw->channel_change_time = 100000; | ||
2376 | |||
2377 | return priv; | 5200 | return priv; |
2378 | } | 5201 | } |
2379 | 5202 | ||
@@ -2436,42 +5259,11 @@ static int at76_alloc_urbs(struct at76_priv *priv, | |||
2436 | return 0; | 5259 | return 0; |
2437 | } | 5260 | } |
2438 | 5261 | ||
2439 | static struct ieee80211_rate at76_rates[] = { | ||
2440 | { .bitrate = 10, .hw_value = TX_RATE_1MBIT, }, | ||
2441 | { .bitrate = 20, .hw_value = TX_RATE_2MBIT, }, | ||
2442 | { .bitrate = 55, .hw_value = TX_RATE_5_5MBIT, }, | ||
2443 | { .bitrate = 110, .hw_value = TX_RATE_11MBIT, }, | ||
2444 | }; | ||
2445 | |||
2446 | static struct ieee80211_channel at76_channels[] = { | ||
2447 | { .center_freq = 2412, .hw_value = 1 }, | ||
2448 | { .center_freq = 2417, .hw_value = 2 }, | ||
2449 | { .center_freq = 2422, .hw_value = 3 }, | ||
2450 | { .center_freq = 2427, .hw_value = 4 }, | ||
2451 | { .center_freq = 2432, .hw_value = 5 }, | ||
2452 | { .center_freq = 2437, .hw_value = 6 }, | ||
2453 | { .center_freq = 2442, .hw_value = 7 }, | ||
2454 | { .center_freq = 2447, .hw_value = 8 }, | ||
2455 | { .center_freq = 2452, .hw_value = 9 }, | ||
2456 | { .center_freq = 2457, .hw_value = 10 }, | ||
2457 | { .center_freq = 2462, .hw_value = 11 }, | ||
2458 | { .center_freq = 2467, .hw_value = 12 }, | ||
2459 | { .center_freq = 2472, .hw_value = 13 }, | ||
2460 | { .center_freq = 2484, .hw_value = 14 } | ||
2461 | }; | ||
2462 | |||
2463 | static struct ieee80211_supported_band at76_supported_band = { | ||
2464 | .channels = at76_channels, | ||
2465 | .n_channels = ARRAY_SIZE(at76_channels), | ||
2466 | .bitrates = at76_rates, | ||
2467 | .n_bitrates = ARRAY_SIZE(at76_rates), | ||
2468 | }; | ||
2469 | |||
2470 | /* Register network device and initialize the hardware */ | 5262 | /* Register network device and initialize the hardware */ |
2471 | static int at76_init_new_device(struct at76_priv *priv, | 5263 | static int at76_init_new_device(struct at76_priv *priv, |
2472 | struct usb_interface *interface) | 5264 | struct usb_interface *interface) |
2473 | { | 5265 | { |
2474 | struct device *dev = &interface->dev; | 5266 | struct net_device *netdev = priv->netdev; |
2475 | int ret; | 5267 | int ret; |
2476 | 5268 | ||
2477 | /* set up the endpoint information */ | 5269 | /* set up the endpoint information */ |
@@ -2487,11 +5279,14 @@ static int at76_init_new_device(struct at76_priv *priv, | |||
2487 | /* MAC address */ | 5279 | /* MAC address */ |
2488 | ret = at76_get_hw_config(priv); | 5280 | ret = at76_get_hw_config(priv); |
2489 | if (ret < 0) { | 5281 | if (ret < 0) { |
2490 | dev_err(dev, "cannot get MAC address\n"); | 5282 | dev_printk(KERN_ERR, &interface->dev, |
5283 | "cannot get MAC address\n"); | ||
2491 | goto exit; | 5284 | goto exit; |
2492 | } | 5285 | } |
2493 | 5286 | ||
2494 | priv->domain = at76_get_reg_domain(priv->regulatory_domain); | 5287 | priv->domain = at76_get_reg_domain(priv->regulatory_domain); |
5288 | /* init. netdev->dev_addr */ | ||
5289 | memcpy(netdev->dev_addr, priv->mac_addr, ETH_ALEN); | ||
2495 | 5290 | ||
2496 | priv->channel = DEF_CHANNEL; | 5291 | priv->channel = DEF_CHANNEL; |
2497 | priv->iw_mode = IW_MODE_INFRA; | 5292 | priv->iw_mode = IW_MODE_INFRA; |
@@ -2501,54 +5296,47 @@ static int at76_init_new_device(struct at76_priv *priv, | |||
2501 | priv->txrate = TX_RATE_AUTO; | 5296 | priv->txrate = TX_RATE_AUTO; |
2502 | priv->preamble_type = PREAMBLE_TYPE_LONG; | 5297 | priv->preamble_type = PREAMBLE_TYPE_LONG; |
2503 | priv->beacon_period = 100; | 5298 | priv->beacon_period = 100; |
5299 | priv->beacons_last_qual = jiffies; | ||
2504 | priv->auth_mode = WLAN_AUTH_OPEN; | 5300 | priv->auth_mode = WLAN_AUTH_OPEN; |
2505 | priv->scan_min_time = DEF_SCAN_MIN_TIME; | 5301 | priv->scan_min_time = DEF_SCAN_MIN_TIME; |
2506 | priv->scan_max_time = DEF_SCAN_MAX_TIME; | 5302 | priv->scan_max_time = DEF_SCAN_MAX_TIME; |
2507 | priv->scan_mode = SCAN_TYPE_ACTIVE; | 5303 | priv->scan_mode = SCAN_TYPE_ACTIVE; |
2508 | priv->default_pairwise_key = 0xff; | ||
2509 | priv->default_group_key = 0xff; | ||
2510 | |||
2511 | /* mac80211 initialisation */ | ||
2512 | priv->hw->wiphy->bands[IEEE80211_BAND_2GHZ] = &at76_supported_band; | ||
2513 | 5304 | ||
2514 | if (FIRMWARE_IS_WPA(priv->fw_version) && | 5305 | netdev->flags &= ~IFF_MULTICAST; /* not yet or never */ |
2515 | (at76_is_503rfmd(priv->board_type) || | 5306 | netdev->open = at76_open; |
2516 | at76_is_505(priv->board_type))) | 5307 | netdev->stop = at76_stop; |
2517 | priv->hw->flags = IEEE80211_HW_SIGNAL_UNSPEC; | 5308 | netdev->get_stats = at76_get_stats; |
2518 | else | 5309 | netdev->ethtool_ops = &at76_ethtool_ops; |
2519 | priv->hw->flags = IEEE80211_HW_RX_INCLUDES_FCS | | 5310 | |
2520 | IEEE80211_HW_SIGNAL_UNSPEC; | 5311 | /* Add pointers to enable iwspy support. */ |
2521 | 5312 | priv->wireless_data.spy_data = &priv->spy_data; | |
2522 | priv->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION); | 5313 | netdev->wireless_data = &priv->wireless_data; |
2523 | 5314 | ||
2524 | SET_IEEE80211_DEV(priv->hw, &interface->dev); | 5315 | netdev->hard_start_xmit = at76_tx; |
2525 | SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr); | 5316 | netdev->tx_timeout = at76_tx_timeout; |
2526 | 5317 | netdev->watchdog_timeo = 2 * HZ; | |
2527 | ret = ieee80211_register_hw(priv->hw); | 5318 | netdev->wireless_handlers = &at76_handler_def; |
5319 | netdev->set_multicast_list = at76_set_multicast; | ||
5320 | netdev->set_mac_address = at76_set_mac_address; | ||
5321 | dev_alloc_name(netdev, "wlan%d"); | ||
5322 | |||
5323 | ret = register_netdev(priv->netdev); | ||
2528 | if (ret) { | 5324 | if (ret) { |
2529 | dev_err(dev, "cannot register mac80211 hw (status %d)!\n", ret); | 5325 | dev_printk(KERN_ERR, &interface->dev, |
5326 | "cannot register netdevice (status %d)!\n", ret); | ||
2530 | goto exit; | 5327 | goto exit; |
2531 | } | 5328 | } |
5329 | priv->netdev_registered = 1; | ||
2532 | 5330 | ||
2533 | priv->mac80211_registered = 1; | 5331 | printk(KERN_INFO "%s: USB %s, MAC %s, firmware %d.%d.%d-%d\n", |
5332 | netdev->name, dev_name(&interface->dev), mac2str(priv->mac_addr), | ||
5333 | priv->fw_version.major, priv->fw_version.minor, | ||
5334 | priv->fw_version.patch, priv->fw_version.build); | ||
5335 | printk(KERN_INFO "%s: regulatory domain 0x%02x: %s\n", netdev->name, | ||
5336 | priv->regulatory_domain, priv->domain->name); | ||
2534 | 5337 | ||
2535 | dev_info(dev, "%s: USB %s, MAC %s, firmware %d.%d.%d-%d\n", | 5338 | /* we let this timer run the whole time this driver instance lives */ |
2536 | wiphy_name(priv->hw->wiphy), | 5339 | mod_timer(&priv->bss_list_timer, jiffies + BSS_LIST_TIMEOUT); |
2537 | dev_name(&interface->dev), mac2str(priv->mac_addr), | ||
2538 | priv->fw_version.major, priv->fw_version.minor, | ||
2539 | priv->fw_version.patch, priv->fw_version.build); | ||
2540 | dev_info(dev, "%s: regulatory domain 0x%02x: %s\n", | ||
2541 | wiphy_name(priv->hw->wiphy), | ||
2542 | priv->regulatory_domain, priv->domain->name); | ||
2543 | dev_info(dev, "%s: WPA support: ", wiphy_name(priv->hw->wiphy)); | ||
2544 | if (!FIRMWARE_IS_WPA(priv->fw_version)) | ||
2545 | printk("none\n"); | ||
2546 | else { | ||
2547 | if (!at76_is_505a(priv->board_type)) | ||
2548 | printk("TKIP\n"); | ||
2549 | else | ||
2550 | printk("TKIP, AES/CCMP\n"); | ||
2551 | }; | ||
2552 | 5340 | ||
2553 | exit: | 5341 | exit: |
2554 | return ret; | 5342 | return ret; |
@@ -2556,13 +5344,15 @@ exit: | |||
2556 | 5344 | ||
2557 | static void at76_delete_device(struct at76_priv *priv) | 5345 | static void at76_delete_device(struct at76_priv *priv) |
2558 | { | 5346 | { |
5347 | int i; | ||
5348 | |||
2559 | at76_dbg(DBG_PROC_ENTRY, "%s: ENTER", __func__); | 5349 | at76_dbg(DBG_PROC_ENTRY, "%s: ENTER", __func__); |
2560 | 5350 | ||
2561 | /* The device is gone, don't bother turning it off */ | 5351 | /* The device is gone, don't bother turning it off */ |
2562 | priv->device_unplugged = 1; | 5352 | priv->device_unplugged = 1; |
2563 | 5353 | ||
2564 | if (priv->mac80211_registered) | 5354 | if (priv->netdev_registered) |
2565 | ieee80211_unregister_hw(priv->hw); | 5355 | unregister_netdev(priv->netdev); |
2566 | 5356 | ||
2567 | /* assuming we used keventd, it must quiesce too */ | 5357 | /* assuming we used keventd, it must quiesce too */ |
2568 | flush_scheduled_work(); | 5358 | flush_scheduled_work(); |
@@ -2583,11 +5373,25 @@ static void at76_delete_device(struct at76_priv *priv) | |||
2583 | if (priv->rx_skb) | 5373 | if (priv->rx_skb) |
2584 | kfree_skb(priv->rx_skb); | 5374 | kfree_skb(priv->rx_skb); |
2585 | 5375 | ||
5376 | at76_free_bss_list(priv); | ||
5377 | del_timer_sync(&priv->bss_list_timer); | ||
5378 | cancel_delayed_work(&priv->dwork_get_scan); | ||
5379 | cancel_delayed_work(&priv->dwork_beacon); | ||
5380 | cancel_delayed_work(&priv->dwork_auth); | ||
5381 | cancel_delayed_work(&priv->dwork_assoc); | ||
5382 | |||
5383 | if (priv->mac_state == MAC_CONNECTED) | ||
5384 | at76_iwevent_bss_disconnect(priv->netdev); | ||
5385 | |||
5386 | for (i = 0; i < NR_RX_DATA_BUF; i++) | ||
5387 | if (priv->rx_data[i].skb) { | ||
5388 | dev_kfree_skb(priv->rx_data[i].skb); | ||
5389 | priv->rx_data[i].skb = NULL; | ||
5390 | } | ||
2586 | usb_put_dev(priv->udev); | 5391 | usb_put_dev(priv->udev); |
2587 | 5392 | ||
2588 | at76_dbg(DBG_PROC_ENTRY, "%s: before freeing priv/ieee80211_hw", | 5393 | at76_dbg(DBG_PROC_ENTRY, "%s: before freeing priv/netdev", __func__); |
2589 | __func__); | 5394 | free_netdev(priv->netdev); /* priv is in netdev */ |
2590 | ieee80211_free_hw(priv->hw); | ||
2591 | 5395 | ||
2592 | at76_dbg(DBG_PROC_ENTRY, "%s: EXIT", __func__); | 5396 | at76_dbg(DBG_PROC_ENTRY, "%s: EXIT", __func__); |
2593 | } | 5397 | } |
@@ -2621,8 +5425,8 @@ static int at76_probe(struct usb_interface *interface, | |||
2621 | we get 204 with 2.4.23, Fiberline FL-WL240u (505A+RFMD2958) ??? */ | 5425 | we get 204 with 2.4.23, Fiberline FL-WL240u (505A+RFMD2958) ??? */ |
2622 | 5426 | ||
2623 | if (op_mode == OPMODE_HW_CONFIG_MODE) { | 5427 | if (op_mode == OPMODE_HW_CONFIG_MODE) { |
2624 | dev_err(&interface->dev, | 5428 | dev_printk(KERN_ERR, &interface->dev, |
2625 | "cannot handle a device in HW_CONFIG_MODE\n"); | 5429 | "cannot handle a device in HW_CONFIG_MODE\n"); |
2626 | ret = -EBUSY; | 5430 | ret = -EBUSY; |
2627 | goto error; | 5431 | goto error; |
2628 | } | 5432 | } |
@@ -2630,12 +5434,13 @@ static int at76_probe(struct usb_interface *interface, | |||
2630 | if (op_mode != OPMODE_NORMAL_NIC_WITH_FLASH | 5434 | if (op_mode != OPMODE_NORMAL_NIC_WITH_FLASH |
2631 | && op_mode != OPMODE_NORMAL_NIC_WITHOUT_FLASH) { | 5435 | && op_mode != OPMODE_NORMAL_NIC_WITHOUT_FLASH) { |
2632 | /* download internal firmware part */ | 5436 | /* download internal firmware part */ |
2633 | dev_dbg(&interface->dev, "downloading internal firmware\n"); | 5437 | dev_printk(KERN_DEBUG, &interface->dev, |
5438 | "downloading internal firmware\n"); | ||
2634 | ret = at76_load_internal_fw(udev, fwe); | 5439 | ret = at76_load_internal_fw(udev, fwe); |
2635 | if (ret < 0) { | 5440 | if (ret < 0) { |
2636 | dev_err(&interface->dev, | 5441 | dev_printk(KERN_ERR, &interface->dev, |
2637 | "error %d downloading internal firmware\n", | 5442 | "error %d downloading internal firmware\n", |
2638 | ret); | 5443 | ret); |
2639 | goto error; | 5444 | goto error; |
2640 | } | 5445 | } |
2641 | usb_put_dev(udev); | 5446 | usb_put_dev(udev); |
@@ -2660,7 +5465,8 @@ static int at76_probe(struct usb_interface *interface, | |||
2660 | need_ext_fw = 1; | 5465 | need_ext_fw = 1; |
2661 | 5466 | ||
2662 | if (need_ext_fw) { | 5467 | if (need_ext_fw) { |
2663 | dev_dbg(&interface->dev, "downloading external firmware\n"); | 5468 | dev_printk(KERN_DEBUG, &interface->dev, |
5469 | "downloading external firmware\n"); | ||
2664 | 5470 | ||
2665 | ret = at76_load_external_fw(udev, fwe); | 5471 | ret = at76_load_external_fw(udev, fwe); |
2666 | if (ret) | 5472 | if (ret) |
@@ -2669,8 +5475,8 @@ static int at76_probe(struct usb_interface *interface, | |||
2669 | /* Re-check firmware version */ | 5475 | /* Re-check firmware version */ |
2670 | ret = at76_get_mib(udev, MIB_FW_VERSION, &fwv, sizeof(fwv)); | 5476 | ret = at76_get_mib(udev, MIB_FW_VERSION, &fwv, sizeof(fwv)); |
2671 | if (ret < 0) { | 5477 | if (ret < 0) { |
2672 | dev_err(&interface->dev, | 5478 | dev_printk(KERN_ERR, &interface->dev, |
2673 | "error %d getting firmware version\n", ret); | 5479 | "error %d getting firmware version\n", ret); |
2674 | goto error; | 5480 | goto error; |
2675 | } | 5481 | } |
2676 | } | 5482 | } |
@@ -2681,6 +5487,7 @@ static int at76_probe(struct usb_interface *interface, | |||
2681 | goto error; | 5487 | goto error; |
2682 | } | 5488 | } |
2683 | 5489 | ||
5490 | SET_NETDEV_DEV(priv->netdev, &interface->dev); | ||
2684 | usb_set_intfdata(interface, priv); | 5491 | usb_set_intfdata(interface, priv); |
2685 | 5492 | ||
2686 | memcpy(&priv->fw_version, &fwv, sizeof(struct mib_fw_version)); | 5493 | memcpy(&priv->fw_version, &fwv, sizeof(struct mib_fw_version)); |
@@ -2708,7 +5515,7 @@ static void at76_disconnect(struct usb_interface *interface) | |||
2708 | if (!priv) | 5515 | if (!priv) |
2709 | return; | 5516 | return; |
2710 | 5517 | ||
2711 | printk(KERN_INFO "%s: disconnecting\n", wiphy_name(priv->hw->wiphy)); | 5518 | printk(KERN_INFO "%s: disconnecting\n", priv->netdev->name); |
2712 | at76_delete_device(priv); | 5519 | at76_delete_device(priv); |
2713 | dev_printk(KERN_INFO, &interface->dev, "disconnected\n"); | 5520 | dev_printk(KERN_INFO, &interface->dev, "disconnected\n"); |
2714 | } | 5521 | } |
@@ -2764,8 +5571,5 @@ MODULE_AUTHOR("Alex <alex@foogod.com>"); | |||
2764 | MODULE_AUTHOR("Nick Jones"); | 5571 | MODULE_AUTHOR("Nick Jones"); |
2765 | MODULE_AUTHOR("Balint Seeber <n0_5p4m_p13453@hotmail.com>"); | 5572 | MODULE_AUTHOR("Balint Seeber <n0_5p4m_p13453@hotmail.com>"); |
2766 | MODULE_AUTHOR("Pavel Roskin <proski@gnu.org>"); | 5573 | MODULE_AUTHOR("Pavel Roskin <proski@gnu.org>"); |
2767 | MODULE_AUTHOR("Guido Guenther <agx@sigxcpu.org>"); | ||
2768 | MODULE_AUTHOR("Kalle Valo <kalle.valo@iki.fi>"); | ||
2769 | MODULE_AUTHOR("Milan Plzik <milan.plzik@gmail.com>"); | ||
2770 | MODULE_DESCRIPTION(DRIVER_DESC); | 5574 | MODULE_DESCRIPTION(DRIVER_DESC); |
2771 | MODULE_LICENSE("GPL"); | 5575 | MODULE_LICENSE("GPL"); |
diff --git a/drivers/staging/at76_usb/at76_usb.h b/drivers/staging/at76_usb/at76_usb.h index 8bb352f16d45..b20be9da1fa1 100644 --- a/drivers/staging/at76_usb/at76_usb.h +++ b/drivers/staging/at76_usb/at76_usb.h | |||
@@ -34,6 +34,23 @@ enum board_type { | |||
34 | BOARD_505AMX = 8 | 34 | BOARD_505AMX = 8 |
35 | }; | 35 | }; |
36 | 36 | ||
37 | /* our private ioctl's */ | ||
38 | /* preamble length (0 - long, 1 - short, 2 - auto) */ | ||
39 | #define AT76_SET_SHORT_PREAMBLE (SIOCIWFIRSTPRIV + 0) | ||
40 | #define AT76_GET_SHORT_PREAMBLE (SIOCIWFIRSTPRIV + 1) | ||
41 | /* which debug channels are enabled */ | ||
42 | #define AT76_SET_DEBUG (SIOCIWFIRSTPRIV + 2) | ||
43 | #define AT76_GET_DEBUG (SIOCIWFIRSTPRIV + 3) | ||
44 | /* power save mode (incl. the Atmel proprietary smart save mode) */ | ||
45 | #define AT76_SET_POWERSAVE_MODE (SIOCIWFIRSTPRIV + 4) | ||
46 | #define AT76_GET_POWERSAVE_MODE (SIOCIWFIRSTPRIV + 5) | ||
47 | /* min and max channel times for scan */ | ||
48 | #define AT76_SET_SCAN_TIMES (SIOCIWFIRSTPRIV + 6) | ||
49 | #define AT76_GET_SCAN_TIMES (SIOCIWFIRSTPRIV + 7) | ||
50 | /* scan mode (0 - active, 1 - passive) */ | ||
51 | #define AT76_SET_SCAN_MODE (SIOCIWFIRSTPRIV + 8) | ||
52 | #define AT76_GET_SCAN_MODE (SIOCIWFIRSTPRIV + 9) | ||
53 | |||
37 | #define CMD_STATUS_IDLE 0x00 | 54 | #define CMD_STATUS_IDLE 0x00 |
38 | #define CMD_STATUS_COMPLETE 0x01 | 55 | #define CMD_STATUS_COMPLETE 0x01 |
39 | #define CMD_STATUS_UNKNOWN 0x02 | 56 | #define CMD_STATUS_UNKNOWN 0x02 |
@@ -65,7 +82,6 @@ enum board_type { | |||
65 | #define MIB_MAC 0x03 | 82 | #define MIB_MAC 0x03 |
66 | #define MIB_MAC_MGMT 0x05 | 83 | #define MIB_MAC_MGMT 0x05 |
67 | #define MIB_MAC_WEP 0x06 | 84 | #define MIB_MAC_WEP 0x06 |
68 | #define MIB_MAC_ENCRYPTION 0x06 | ||
69 | #define MIB_PHY 0x07 | 85 | #define MIB_PHY 0x07 |
70 | #define MIB_FW_VERSION 0x08 | 86 | #define MIB_FW_VERSION 0x08 |
71 | #define MIB_MDOMAIN 0x09 | 87 | #define MIB_MDOMAIN 0x09 |
@@ -90,26 +106,6 @@ enum board_type { | |||
90 | #define AT76_PM_ON 2 | 106 | #define AT76_PM_ON 2 |
91 | #define AT76_PM_SMART 3 | 107 | #define AT76_PM_SMART 3 |
92 | 108 | ||
93 | /* cipher values for encryption keys */ | ||
94 | #define CIPHER_NONE 0 /* this value is only guessed */ | ||
95 | #define CIPHER_WEP64 1 | ||
96 | #define CIPHER_TKIP 2 | ||
97 | #define CIPHER_CCMP 3 | ||
98 | #define CIPHER_CCX 4 /* for consistency sake only */ | ||
99 | #define CIPHER_WEP128 5 | ||
100 | |||
101 | /* bit flags key types for encryption keys */ | ||
102 | #define KEY_PAIRWISE 2 | ||
103 | #define KEY_TX 4 | ||
104 | |||
105 | #define CIPHER_KEYS (4) | ||
106 | #define CIPHER_KEY_LEN (40) | ||
107 | |||
108 | struct key_config { | ||
109 | u8 cipher; | ||
110 | u8 keylen; | ||
111 | }; | ||
112 | |||
113 | struct hwcfg_r505 { | 109 | struct hwcfg_r505 { |
114 | u8 cr39_values[14]; | 110 | u8 cr39_values[14]; |
115 | u8 reserved1[14]; | 111 | u8 reserved1[14]; |
@@ -151,9 +147,6 @@ union at76_hwcfg { | |||
151 | 147 | ||
152 | #define WEP_SMALL_KEY_LEN (40 / 8) | 148 | #define WEP_SMALL_KEY_LEN (40 / 8) |
153 | #define WEP_LARGE_KEY_LEN (104 / 8) | 149 | #define WEP_LARGE_KEY_LEN (104 / 8) |
154 | #define WEP_KEYS (4) | ||
155 | |||
156 | |||
157 | 150 | ||
158 | struct at76_card_config { | 151 | struct at76_card_config { |
159 | u8 exclude_unencrypted; | 152 | u8 exclude_unencrypted; |
@@ -168,7 +161,7 @@ struct at76_card_config { | |||
168 | u8 privacy_invoked; | 161 | u8 privacy_invoked; |
169 | u8 wep_default_key_id; /* 0..3 */ | 162 | u8 wep_default_key_id; /* 0..3 */ |
170 | u8 current_ssid[32]; | 163 | u8 current_ssid[32]; |
171 | u8 wep_default_key_value[4][WEP_LARGE_KEY_LEN]; | 164 | u8 wep_default_key_value[4][WEP_KEY_LEN]; |
172 | u8 ssid_len; | 165 | u8 ssid_len; |
173 | u8 short_preamble; | 166 | u8 short_preamble; |
174 | __le16 beacon_period; | 167 | __le16 beacon_period; |
@@ -193,7 +186,7 @@ struct at76_rx_buffer { | |||
193 | u8 link_quality; | 186 | u8 link_quality; |
194 | u8 noise_level; | 187 | u8 noise_level; |
195 | __le32 rx_time; | 188 | __le32 rx_time; |
196 | u8 packet[IEEE80211_MAX_FRAG_THRESHOLD]; | 189 | u8 packet[IEEE80211_FRAME_LEN + IEEE80211_FCS_LEN]; |
197 | } __attribute__((packed)); | 190 | } __attribute__((packed)); |
198 | 191 | ||
199 | /* Length of Atmel-specific Tx header before 802.11 frame */ | 192 | /* Length of Atmel-specific Tx header before 802.11 frame */ |
@@ -203,11 +196,8 @@ struct at76_tx_buffer { | |||
203 | __le16 wlength; | 196 | __le16 wlength; |
204 | u8 tx_rate; | 197 | u8 tx_rate; |
205 | u8 padding; | 198 | u8 padding; |
206 | u8 key_id; | 199 | u8 reserved[4]; |
207 | u8 cipher_type; | 200 | u8 packet[IEEE80211_FRAME_LEN + IEEE80211_FCS_LEN]; |
208 | u8 cipher_length; | ||
209 | u8 reserved; | ||
210 | u8 packet[IEEE80211_MAX_FRAG_THRESHOLD]; | ||
211 | } __attribute__((packed)); | 201 | } __attribute__((packed)); |
212 | 202 | ||
213 | /* defines for scan_type below */ | 203 | /* defines for scan_type below */ |
@@ -254,7 +244,6 @@ struct set_mib_buffer { | |||
254 | u8 byte; | 244 | u8 byte; |
255 | __le16 word; | 245 | __le16 word; |
256 | u8 addr[ETH_ALEN]; | 246 | u8 addr[ETH_ALEN]; |
257 | u8 data[256]; /* we need more space for mib_mac_encryption */ | ||
258 | } data; | 247 | } data; |
259 | } __attribute__((packed)); | 248 | } __attribute__((packed)); |
260 | 249 | ||
@@ -328,24 +317,10 @@ struct mib_mac_wep { | |||
328 | u8 exclude_unencrypted; | 317 | u8 exclude_unencrypted; |
329 | __le32 wep_icv_error_count; | 318 | __le32 wep_icv_error_count; |
330 | __le32 wep_excluded_count; | 319 | __le32 wep_excluded_count; |
331 | u8 wep_default_keyvalue[WEP_KEYS][WEP_LARGE_KEY_LEN]; | 320 | u8 wep_default_keyvalue[WEP_KEYS][WEP_KEY_LEN]; |
332 | u8 encryption_level; /* 1 for 40bit, 2 for 104bit encryption */ | 321 | u8 encryption_level; /* 1 for 40bit, 2 for 104bit encryption */ |
333 | } __attribute__((packed)); | 322 | } __attribute__((packed)); |
334 | 323 | ||
335 | struct mib_mac_encryption { | ||
336 | u8 cipher_default_keyvalue[CIPHER_KEYS][CIPHER_KEY_LEN]; | ||
337 | u8 tkip_bssid[6]; | ||
338 | u8 privacy_invoked; | ||
339 | u8 cipher_default_key_id; | ||
340 | u8 cipher_default_group_key_id; | ||
341 | u8 exclude_unencrypted; | ||
342 | u8 wep_encryption_type; | ||
343 | u8 ckip_key_permutation; /* bool */ | ||
344 | __le32 wep_icv_error_count; | ||
345 | __le32 wep_excluded_count; | ||
346 | u8 key_rsc[CIPHER_KEYS][8]; | ||
347 | } __attribute__((packed)); | ||
348 | |||
349 | struct mib_phy { | 324 | struct mib_phy { |
350 | __le32 ed_threshold; | 325 | __le32 ed_threshold; |
351 | 326 | ||
@@ -389,6 +364,16 @@ struct at76_fw_header { | |||
389 | __le32 ext_fw_len; /* external firmware image length */ | 364 | __le32 ext_fw_len; /* external firmware image length */ |
390 | } __attribute__((packed)); | 365 | } __attribute__((packed)); |
391 | 366 | ||
367 | enum mac_state { | ||
368 | MAC_INIT, | ||
369 | MAC_SCANNING, | ||
370 | MAC_AUTH, | ||
371 | MAC_ASSOC, | ||
372 | MAC_JOINING, | ||
373 | MAC_CONNECTED, | ||
374 | MAC_OWN_IBSS | ||
375 | }; | ||
376 | |||
392 | /* a description of a regulatory domain and the allowed channels */ | 377 | /* a description of a regulatory domain and the allowed channels */ |
393 | struct reg_domain { | 378 | struct reg_domain { |
394 | u16 code; | 379 | u16 code; |
@@ -396,6 +381,47 @@ struct reg_domain { | |||
396 | u32 channel_map; /* if bit N is set, channel (N+1) is allowed */ | 381 | u32 channel_map; /* if bit N is set, channel (N+1) is allowed */ |
397 | }; | 382 | }; |
398 | 383 | ||
384 | /* how long do we keep a (I)BSS in the bss_list in jiffies | ||
385 | this should be long enough for the user to retrieve the table | ||
386 | (by iwlist ?) after the device started, because all entries from | ||
387 | other channels than the one the device locks on get removed, too */ | ||
388 | #define BSS_LIST_TIMEOUT (120 * HZ) | ||
389 | /* struct to store BSS info found during scan */ | ||
390 | #define BSS_LIST_MAX_RATE_LEN 32 /* 32 rates should be enough ... */ | ||
391 | |||
392 | struct bss_info { | ||
393 | struct list_head list; | ||
394 | |||
395 | u8 bssid[ETH_ALEN]; /* bssid */ | ||
396 | u8 ssid[IW_ESSID_MAX_SIZE]; /* essid */ | ||
397 | u8 ssid_len; /* length of ssid above */ | ||
398 | u8 channel; | ||
399 | u16 capa; /* BSS capabilities */ | ||
400 | u16 beacon_interval; /* beacon interval, Kus (1024 microseconds) */ | ||
401 | u8 rates[BSS_LIST_MAX_RATE_LEN]; /* supported rates in units of | ||
402 | 500 kbps, ORed with 0x80 for | ||
403 | basic rates */ | ||
404 | u8 rates_len; | ||
405 | |||
406 | /* quality of received beacon */ | ||
407 | u8 rssi; | ||
408 | u8 link_qual; | ||
409 | u8 noise_level; | ||
410 | |||
411 | unsigned long last_rx; /* time (jiffies) of last beacon received */ | ||
412 | }; | ||
413 | |||
414 | /* a rx data buffer to collect rx fragments */ | ||
415 | struct rx_data_buf { | ||
416 | u8 sender[ETH_ALEN]; /* sender address */ | ||
417 | u16 seqnr; /* sequence number */ | ||
418 | u16 fragnr; /* last fragment received */ | ||
419 | unsigned long last_rx; /* jiffies of last rx */ | ||
420 | struct sk_buff *skb; /* == NULL if entry is free */ | ||
421 | }; | ||
422 | |||
423 | #define NR_RX_DATA_BUF 8 | ||
424 | |||
399 | /* Data for one loaded firmware file */ | 425 | /* Data for one loaded firmware file */ |
400 | struct fwentry { | 426 | struct fwentry { |
401 | const char *const fwname; | 427 | const char *const fwname; |
@@ -412,9 +438,11 @@ struct fwentry { | |||
412 | 438 | ||
413 | struct at76_priv { | 439 | struct at76_priv { |
414 | struct usb_device *udev; /* USB device pointer */ | 440 | struct usb_device *udev; /* USB device pointer */ |
441 | struct net_device *netdev; /* net device pointer */ | ||
442 | struct net_device_stats stats; /* net device stats */ | ||
443 | struct iw_statistics wstats; /* wireless stats */ | ||
415 | 444 | ||
416 | struct sk_buff *rx_skb; /* skbuff for receiving data */ | 445 | struct sk_buff *rx_skb; /* skbuff for receiving data */ |
417 | struct sk_buff *tx_skb; /* skbuff for transmitting data */ | ||
418 | void *bulk_out_buffer; /* buffer for sending data */ | 446 | void *bulk_out_buffer; /* buffer for sending data */ |
419 | 447 | ||
420 | struct urb *tx_urb; /* URB for sending data */ | 448 | struct urb *tx_urb; /* URB for sending data */ |
@@ -426,17 +454,26 @@ struct at76_priv { | |||
426 | struct mutex mtx; /* locks this structure */ | 454 | struct mutex mtx; /* locks this structure */ |
427 | 455 | ||
428 | /* work queues */ | 456 | /* work queues */ |
457 | struct work_struct work_assoc_done; | ||
458 | struct work_struct work_join; | ||
459 | struct work_struct work_new_bss; | ||
460 | struct work_struct work_start_scan; | ||
429 | struct work_struct work_set_promisc; | 461 | struct work_struct work_set_promisc; |
430 | struct work_struct work_submit_rx; | 462 | struct work_struct work_submit_rx; |
431 | struct delayed_work dwork_hw_scan; | 463 | struct delayed_work dwork_restart; |
464 | struct delayed_work dwork_get_scan; | ||
465 | struct delayed_work dwork_beacon; | ||
466 | struct delayed_work dwork_auth; | ||
467 | struct delayed_work dwork_assoc; | ||
432 | 468 | ||
433 | struct tasklet_struct rx_tasklet; | 469 | struct tasklet_struct rx_tasklet; |
434 | 470 | ||
435 | /* the WEP stuff */ | 471 | /* the WEP stuff */ |
436 | int wep_enabled; /* 1 if WEP is enabled */ | 472 | int wep_enabled; /* 1 if WEP is enabled */ |
437 | int wep_key_id; /* key id to be used */ | 473 | int wep_key_id; /* key id to be used */ |
438 | u8 wep_keys[WEP_KEYS][WEP_LARGE_KEY_LEN]; /* WEP keys */ | 474 | u8 wep_keys[WEP_KEYS][WEP_KEY_LEN]; /* the four WEP keys, |
439 | u8 wep_keys_len[WEP_KEYS]; /* length of WEP keys */ | 475 | 5 or 13 bytes are used */ |
476 | u8 wep_keys_len[WEP_KEYS]; /* the length of the above keys */ | ||
440 | 477 | ||
441 | int channel; | 478 | int channel; |
442 | int iw_mode; | 479 | int iw_mode; |
@@ -458,13 +495,44 @@ struct at76_priv { | |||
458 | int scan_mode; /* SCAN_TYPE_ACTIVE, SCAN_TYPE_PASSIVE */ | 495 | int scan_mode; /* SCAN_TYPE_ACTIVE, SCAN_TYPE_PASSIVE */ |
459 | int scan_need_any; /* if set, need to scan for any ESSID */ | 496 | int scan_need_any; /* if set, need to scan for any ESSID */ |
460 | 497 | ||
498 | /* the list we got from scanning */ | ||
499 | spinlock_t bss_list_spinlock; /* protects bss_list operations */ | ||
500 | struct list_head bss_list; /* list of BSS we got beacons from */ | ||
501 | struct timer_list bss_list_timer; /* timer to purge old entries | ||
502 | from bss_list */ | ||
503 | struct bss_info *curr_bss; /* current BSS */ | ||
461 | u16 assoc_id; /* current association ID, if associated */ | 504 | u16 assoc_id; /* current association ID, if associated */ |
462 | 505 | ||
506 | u8 wanted_bssid[ETH_ALEN]; | ||
507 | int wanted_bssid_valid; /* != 0 if wanted_bssid is to be used */ | ||
508 | |||
509 | /* some data for infrastructure mode only */ | ||
510 | spinlock_t mgmt_spinlock; /* this spinlock protects access to | ||
511 | next_mgmt_bulk */ | ||
512 | |||
513 | struct at76_tx_buffer *next_mgmt_bulk; /* pending management msg to | ||
514 | send via bulk out */ | ||
515 | enum mac_state mac_state; | ||
516 | enum { | ||
517 | SCAN_IDLE, | ||
518 | SCAN_IN_PROGRESS, | ||
519 | SCAN_COMPLETED | ||
520 | } scan_state; | ||
521 | time_t last_scan; | ||
522 | |||
523 | int retries; /* remaining retries in case of timeout when | ||
524 | * sending AuthReq or AssocReq */ | ||
463 | u8 pm_mode; /* power management mode */ | 525 | u8 pm_mode; /* power management mode */ |
464 | u32 pm_period; /* power management period in microseconds */ | 526 | u32 pm_period; /* power management period in microseconds */ |
465 | 527 | ||
466 | struct reg_domain const *domain; /* reg domain description */ | 528 | struct reg_domain const *domain; /* reg domain description */ |
467 | 529 | ||
530 | /* iwspy support */ | ||
531 | spinlock_t spy_spinlock; | ||
532 | struct iw_spy_data spy_data; | ||
533 | |||
534 | struct iw_public_data wireless_data; | ||
535 | |||
468 | /* These fields contain HW config provided by the device (not all of | 536 | /* These fields contain HW config provided by the device (not all of |
469 | * these fields are used by all board types) */ | 537 | * these fields are used by all board types) */ |
470 | u8 mac_addr[ETH_ALEN]; | 538 | u8 mac_addr[ETH_ALEN]; |
@@ -472,6 +540,9 @@ struct at76_priv { | |||
472 | 540 | ||
473 | struct at76_card_config card_config; | 541 | struct at76_card_config card_config; |
474 | 542 | ||
543 | /* store rx fragments until complete */ | ||
544 | struct rx_data_buf rx_data[NR_RX_DATA_BUF]; | ||
545 | |||
475 | enum board_type board_type; | 546 | enum board_type board_type; |
476 | struct mib_fw_version fw_version; | 547 | struct mib_fw_version fw_version; |
477 | 548 | ||
@@ -479,20 +550,58 @@ struct at76_priv { | |||
479 | unsigned int netdev_registered:1; | 550 | unsigned int netdev_registered:1; |
480 | struct set_mib_buffer mib_buf; /* global buffer for set_mib calls */ | 551 | struct set_mib_buffer mib_buf; /* global buffer for set_mib calls */ |
481 | 552 | ||
553 | /* beacon counting */ | ||
482 | int beacon_period; /* period of mgmt beacons, Kus */ | 554 | int beacon_period; /* period of mgmt beacons, Kus */ |
555 | int beacons_received; | ||
556 | unsigned long beacons_last_qual; /* time we restarted counting | ||
557 | beacons */ | ||
558 | }; | ||
483 | 559 | ||
484 | struct ieee80211_hw *hw; | 560 | struct at76_rx_radiotap { |
485 | int mac80211_registered; | 561 | struct ieee80211_radiotap_header rt_hdr; |
486 | 562 | __le64 rt_tsft; | |
487 | struct key_config keys[4]; /* installed key types */ | 563 | u8 rt_flags; |
488 | u8 default_pairwise_key; | 564 | u8 rt_rate; |
489 | u8 default_group_key; | 565 | s8 rt_signal; |
566 | s8 rt_noise; | ||
490 | }; | 567 | }; |
491 | 568 | ||
492 | #define AT76_SUPPORTED_FILTERS FIF_PROMISC_IN_BSS | 569 | #define AT76_RX_RADIOTAP_PRESENT \ |
570 | ((1 << IEEE80211_RADIOTAP_TSFT) | \ | ||
571 | (1 << IEEE80211_RADIOTAP_FLAGS) | \ | ||
572 | (1 << IEEE80211_RADIOTAP_RATE) | \ | ||
573 | (1 << IEEE80211_RADIOTAP_DB_ANTSIGNAL) | \ | ||
574 | (1 << IEEE80211_RADIOTAP_DB_ANTNOISE)) | ||
575 | |||
576 | #define BEACON_MAX_DATA_LENGTH 1500 | ||
577 | |||
578 | /* the maximum size of an AssocReq packet */ | ||
579 | #define ASSOCREQ_MAX_SIZE \ | ||
580 | (AT76_TX_HDRLEN + sizeof(struct ieee80211_assoc_request) + \ | ||
581 | 1 + 1 + IW_ESSID_MAX_SIZE + 1 + 1 + 4) | ||
582 | |||
583 | /* for shared secret auth, add the challenge text size */ | ||
584 | #define AUTH_FRAME_SIZE (AT76_TX_HDRLEN + sizeof(struct ieee80211_auth)) | ||
585 | |||
586 | /* Maximal number of AuthReq retries */ | ||
587 | #define AUTH_RETRIES 3 | ||
493 | 588 | ||
589 | /* Maximal number of AssocReq retries */ | ||
590 | #define ASSOC_RETRIES 3 | ||
591 | |||
592 | /* Beacon timeout in managed mode when we are connected */ | ||
593 | #define BEACON_TIMEOUT (10 * HZ) | ||
594 | |||
595 | /* Timeout for authentication response */ | ||
596 | #define AUTH_TIMEOUT (1 * HZ) | ||
597 | |||
598 | /* Timeout for association response */ | ||
599 | #define ASSOC_TIMEOUT (1 * HZ) | ||
600 | |||
601 | /* Polling interval when scan is running */ | ||
494 | #define SCAN_POLL_INTERVAL (HZ / 4) | 602 | #define SCAN_POLL_INTERVAL (HZ / 4) |
495 | 603 | ||
604 | /* Command completion timeout */ | ||
496 | #define CMD_COMPLETION_TIMEOUT (5 * HZ) | 605 | #define CMD_COMPLETION_TIMEOUT (5 * HZ) |
497 | 606 | ||
498 | #define DEF_RTS_THRESHOLD 1536 | 607 | #define DEF_RTS_THRESHOLD 1536 |
@@ -502,6 +611,8 @@ struct at76_priv { | |||
502 | #define DEF_SCAN_MIN_TIME 10 | 611 | #define DEF_SCAN_MIN_TIME 10 |
503 | #define DEF_SCAN_MAX_TIME 120 | 612 | #define DEF_SCAN_MAX_TIME 120 |
504 | 613 | ||
614 | #define MAX_RTS_THRESHOLD (MAX_FRAG_THRESHOLD + 1) | ||
615 | |||
505 | /* the max padding size for tx in bytes (see calc_padding) */ | 616 | /* the max padding size for tx in bytes (see calc_padding) */ |
506 | #define MAX_PADDING_SIZE 53 | 617 | #define MAX_PADDING_SIZE 53 |
507 | 618 | ||
diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c index 5ffe269c2382..ab69c1bf36a8 100644 --- a/drivers/staging/panel/panel.c +++ b/drivers/staging/panel/panel.c | |||
@@ -622,7 +622,7 @@ static int set_ctrl_bits(void) | |||
622 | } | 622 | } |
623 | 623 | ||
624 | /* sets ctrl & data port bits according to current signals values */ | 624 | /* sets ctrl & data port bits according to current signals values */ |
625 | static void set_bits(void) | 625 | static void panel_set_bits(void) |
626 | { | 626 | { |
627 | set_data_bits(); | 627 | set_data_bits(); |
628 | set_ctrl_bits(); | 628 | set_ctrl_bits(); |
@@ -707,12 +707,12 @@ static void lcd_send_serial(int byte) | |||
707 | */ | 707 | */ |
708 | for (bit = 0; bit < 8; bit++) { | 708 | for (bit = 0; bit < 8; bit++) { |
709 | bits.cl = BIT_CLR; /* CLK low */ | 709 | bits.cl = BIT_CLR; /* CLK low */ |
710 | set_bits(); | 710 | panel_set_bits(); |
711 | bits.da = byte & 1; | 711 | bits.da = byte & 1; |
712 | set_bits(); | 712 | panel_set_bits(); |
713 | udelay(2); /* maintain the data during 2 us before CLK up */ | 713 | udelay(2); /* maintain the data during 2 us before CLK up */ |
714 | bits.cl = BIT_SET; /* CLK high */ | 714 | bits.cl = BIT_SET; /* CLK high */ |
715 | set_bits(); | 715 | panel_set_bits(); |
716 | udelay(1); /* maintain the strobe during 1 us */ | 716 | udelay(1); /* maintain the strobe during 1 us */ |
717 | byte >>= 1; | 717 | byte >>= 1; |
718 | } | 718 | } |
@@ -727,7 +727,7 @@ static void lcd_backlight(int on) | |||
727 | /* The backlight is activated by seting the AUTOFEED line to +5V */ | 727 | /* The backlight is activated by seting the AUTOFEED line to +5V */ |
728 | spin_lock(&pprt_lock); | 728 | spin_lock(&pprt_lock); |
729 | bits.bl = on; | 729 | bits.bl = on; |
730 | set_bits(); | 730 | panel_set_bits(); |
731 | spin_unlock(&pprt_lock); | 731 | spin_unlock(&pprt_lock); |
732 | } | 732 | } |
733 | 733 | ||