openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

iwlagn: no version check for experimental uCode 

For experimental uCode, it should work with the driver
if driver has experimental uCode support option enabled;
remove the API version checking.

Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
This commit is contained in:
Wey-Yi Guy 2010-09-21 16:15:58 -07:00
parent 1cf2637360
commit 65cccfb03d
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/net/wireless/iwlwifi/iwl-agn.c
View File

@ -2104,18 +2104,23 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context)
* firmware filename ... but we don't check for that and only rely * firmware filename ... but we don't check for that and only rely
* on the API version read from firmware header from here on forward * on the API version read from firmware header from here on forward
*/ */
if (api_ver < api_min || api_ver > api_max) { /* no api version check required for experimental uCode */
IWL_ERR(priv, "Driver unable to support your firmware API. " if (priv->fw_index != UCODE_EXPERIMENTAL_INDEX) {
"Driver supports v%u, firmware is v%u.\n", if (api_ver < api_min || api_ver > api_max) {
api_max, api_ver); IWL_ERR(priv,
goto try_again; "Driver unable to support your firmware API. "
} "Driver supports v%u, firmware is v%u.\n",
api_max, api_ver);
goto try_again;
}
if (api_ver != api_max) if (api_ver != api_max)
IWL_ERR(priv, "Firmware has old API version. Expected v%u, " IWL_ERR(priv,
"got v%u. New firmware can be obtained " "Firmware has old API version. Expected v%u, "
"from http://www.intellinuxwireless.org.\n", "got v%u. New firmware can be obtained "
api_max, api_ver); "from http://www.intellinuxwireless.org.\n",
api_max, api_ver);
}
if (build) if (build)
sprintf(buildstr, " build %u%s", build, sprintf(buildstr, " build %u%s", build,