diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-10-05 13:50:27 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-05 13:50:27 -0400 |
| commit | 46bf695802bb090d9d0d0fec6bb5b46c24b17d4e (patch) | |
| tree | 788afdbec413608f6331ffbac4153f0f6736e6b7 /drivers/net/wireless/wl12xx/wl1271_testmode.c | |
| parent | e7480bbb926c5816e4fbfca70748096bbe0e4978 (diff) | |
| parent | 4b48e6876b641e1138f37a0fc11fb6a4fc3e24e1 (diff) | |
| download | kernel_replicant_linux-46bf695802bb090d9d0d0fec6bb5b46c24b17d4e.tar.gz kernel_replicant_linux-46bf695802bb090d9d0d0fec6bb5b46c24b17d4e.tar.bz2 kernel_replicant_linux-46bf695802bb090d9d0d0fec6bb5b46c24b17d4e.zip | |
Merge branch 'wireless-next' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_testmode.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_testmode.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_testmode.c b/drivers/net/wireless/wl12xx/wl1271_testmode.c index 6e0952f79e9a..a3aa84386c88 100644 --- a/drivers/net/wireless/wl12xx/wl1271_testmode.c +++ b/drivers/net/wireless/wl12xx/wl1271_testmode.c @@ -199,19 +199,6 @@ static int wl1271_tm_cmd_nvs_push(struct wl1271 *wl, struct nlattr *tb[]) buf = nla_data(tb[WL1271_TM_ATTR_DATA]); len = nla_len(tb[WL1271_TM_ATTR_DATA]); - /* - * FIXME: the LEGACY NVS image support (NVS's missing the 5GHz band - * configurations) can be removed when those NVS files stop floating - * around. - */ - if (len != sizeof(struct wl1271_nvs_file) && - (len != WL1271_INI_LEGACY_NVS_FILE_SIZE || - wl1271_11a_enabled())) { - wl1271_error("nvs size is not as expected: %zu != %zu", - len, sizeof(struct wl1271_nvs_file)); - return -EMSGSIZE; - } - mutex_lock(&wl->mutex); kfree(wl->nvs); @@ -224,6 +211,7 @@ static int wl1271_tm_cmd_nvs_push(struct wl1271 *wl, struct nlattr *tb[]) } memcpy(wl->nvs, buf, len); + wl->nvs_len = len; wl1271_debug(DEBUG_TESTMODE, "testmode pushed nvs"); |