summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/wl12xx/ini.h
diff options
context:
space:
mode:
authorShahar Levi <shahar_levi@ti.com>2011-05-02 12:42:21 +0800
committerAndy Green <andy.green@linaro.org>2011-05-02 12:42:21 +0800
commit43bccffc0a63701a77fe59b7dc81971a17b66a0b (patch)
treed16cdd0349f672f632e664c2c26b4d394bc9f9ff /drivers/net/wireless/wl12xx/ini.h
parent5091eecc8bbfee602c37400d45f18a76e0243d04 (diff)
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/ini.h')
-rw-r--r--drivers/net/wireless/wl12xx/ini.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/ini.h b/drivers/net/wireless/wl12xx/ini.h
index 30efcd6643b..1420c842b8f 100644
--- a/drivers/net/wireless/wl12xx/ini.h
+++ b/drivers/net/wireless/wl12xx/ini.h
@@ -174,7 +174,7 @@ struct wl128x_ini_fem_params_5 {
#define WL1271_INI_LEGACY_NVS_FILE_SIZE 800
struct wl1271_nvs_file {
- /* NVS section */
+ /* NVS section - must be first! */
u8 nvs[WL1271_INI_NVS_SECTION_SIZE];
/* INI section */
@@ -195,7 +195,7 @@ struct wl1271_nvs_file {
} __packed;
struct wl128x_nvs_file {
- /* NVS section */
+ /* NVS section - must be first! */
u8 nvs[WL1271_INI_NVS_SECTION_SIZE];
/* INI section */