Skip to content

Commit

Permalink
wl1271: upload only the first 468 bytes from the NVS file
Browse files Browse the repository at this point in the history
We were uploading the whole NVS file, but that is wrong, because the same
file also contains the initialization values.  For the latest firmwares, we
should upload only the initial 468 bytes from the file.

Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Luciano Coelho authored and John W. Linville committed Dec 28, 2009
1 parent 98b2a68 commit 8cf5e8e
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
1 change: 1 addition & 0 deletions drivers/net/wireless/wl12xx/wl1271.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ enum {

#define WL1271_FW_NAME "wl1271-fw.bin"
#define WL1271_NVS_NAME "wl1271-nvs.bin"
#define WL1271_NVS_LEN 468

/*
* Enable/disable 802.11a support for WL1273
Expand Down
8 changes: 7 additions & 1 deletion drivers/net/wireless/wl12xx/wl1271_boot.c
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,15 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl)
if (nvs == NULL)
return -ENODEV;

if (wl->nvs_len < WL1271_NVS_LEN)
return -EINVAL;

nvs_ptr = nvs;

nvs_len = wl->nvs_len;
/* only the first part of the NVS needs to be uploaded */
nvs_len = WL1271_NVS_LEN;

/* FIXME: read init settings from the remaining part of the NVS */

/* Update the device MAC address into the nvs */
nvs[11] = wl->mac_addr[0];
Expand Down

0 comments on commit 8cf5e8e

Please sign in to comment.