summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl12xx.h
diff options
context:
space:
mode:
authorShahar Levi <shahar_levi@ti.com>2011-03-06 16:32:10 +0200
committerLuciano Coelho <coelho@ti.com>2011-04-19 16:48:10 +0300
commitbc765bf3b9a095b3e41c8cda80643901884c3dd4 (patch)
treedebb36120cb682b9fb848f0876454547f285495f /drivers/net/wireless/wl12xx/wl12xx.h
parent49d750ca14cd49e76ab039b33b5a621e0a92b9fd (diff)
downloadblackbird-obmc-linux-bc765bf3b9a095b3e41c8cda80643901884c3dd4.tar.gz
blackbird-obmc-linux-bc765bf3b9a095b3e41c8cda80643901884c3dd4.zip
wl12xx: 1281/1283 support - Loading FW & NVS
Take care of FW & NVS with the auto-detection between wl127x and wl128x. [Moved some common code outside if statements and added notes about NVS structure assumptions; Fixed a bug when checking the nvs size: if the size was incorrect, the local nvs variable was set to NULL, it should be wl->nvs instead. -- Luca] [Merged with potential buffer overflow fix -- Luca] Signed-off-by: Shahar Levi <shahar_levi@ti.com> Reviewed-by: Luciano Coelho <coelho@ti.com> Signed-off-by: Luciano Coelho <coelho@ti.com>
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl12xx.h')
-rw-r--r--drivers/net/wireless/wl12xx/wl12xx.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 959b338d0af4..e59f5392e909 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -378,7 +378,7 @@ struct wl1271 {
u8 *fw;
size_t fw_len;
u8 fw_bss_type;
- struct wl1271_nvs_file *nvs;
+ void *nvs;
size_t nvs_len;
s8 hw_pg_ver;
OpenPOWER on IntegriCloud