diff options
| author | Luciano Coelho <luciano.coelho@nokia.com> | 2009-12-11 15:40:53 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-28 16:31:32 -0500 |
| commit | 8cf5e8e509950237fa0982235a703348d8b6e670 (patch) | |
| tree | cdf15048787724c4644e5c0c3664f616ad9256d6 /drivers/net | |
| parent | 98b2a68473ae975bc4abdeb66cd719ccfdad9d4a (diff) | |
| download | op-kernel-dev-8cf5e8e509950237fa0982235a703348d8b6e670.zip op-kernel-dev-8cf5e8e509950237fa0982235a703348d8b6e670.tar.gz | |
wl1271: upload only the first 468 bytes from the NVS file
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>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271.h | 1 | ||||
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_boot.c | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271.h b/drivers/net/wireless/wl12xx/wl1271.h index 3bec6f3..8dfc9ec 100644 --- a/drivers/net/wireless/wl12xx/wl1271.h +++ b/drivers/net/wireless/wl12xx/wl1271.h @@ -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 diff --git a/drivers/net/wireless/wl12xx/wl1271_boot.c b/drivers/net/wireless/wl12xx/wl1271_boot.c index b7c9645..e803b87 100644 --- a/drivers/net/wireless/wl12xx/wl1271_boot.c +++ b/drivers/net/wireless/wl12xx/wl1271_boot.c @@ -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]; |
