diff options
| author | Luciano Coelho <luciano.coelho@nokia.com> | 2009-12-11 16:40:53 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-29 00:31:32 +0300 |
| commit | 8cf5e8e509950237fa0982235a703348d8b6e670 (patch) | |
| tree | cdf15048787724c4644e5c0c3664f616ad9256d6 /drivers/net/wireless/wl12xx/wl1271_boot.c | |
| parent | 98b2a68473ae975bc4abdeb66cd719ccfdad9d4a (diff) | |
| download | linux-8cf5e8e509950237fa0982235a703348d8b6e670.tar.xz | |
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/wireless/wl12xx/wl1271_boot.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_boot.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_boot.c b/drivers/net/wireless/wl12xx/wl1271_boot.c index b7c96454cca3..e803b876f3f0 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]; |