diff options
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 763a93d832f8..1b682ddcf4e8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -2104,18 +2104,23 @@ static void iwl_ucode_callback(const struct firmware *ucode_raw, void *context) | |||
2104 | * firmware filename ... but we don't check for that and only rely | 2104 | * firmware filename ... but we don't check for that and only rely |
2105 | * on the API version read from firmware header from here on forward | 2105 | * on the API version read from firmware header from here on forward |
2106 | */ | 2106 | */ |
2107 | if (api_ver < api_min || api_ver > api_max) { | 2107 | /* no api version check required for experimental uCode */ |
2108 | IWL_ERR(priv, "Driver unable to support your firmware API. " | 2108 | if (priv->fw_index != UCODE_EXPERIMENTAL_INDEX) { |
2109 | "Driver supports v%u, firmware is v%u.\n", | 2109 | if (api_ver < api_min || api_ver > api_max) { |
2110 | api_max, api_ver); | 2110 | IWL_ERR(priv, |
2111 | goto try_again; | 2111 | "Driver unable to support your firmware API. " |
2112 | } | 2112 | "Driver supports v%u, firmware is v%u.\n", |
2113 | api_max, api_ver); | ||
2114 | goto try_again; | ||
2115 | } | ||
2113 | 2116 | ||
2114 | if (api_ver != api_max) | 2117 | if (api_ver != api_max) |
2115 | IWL_ERR(priv, "Firmware has old API version. Expected v%u, " | 2118 | IWL_ERR(priv, |
2116 | "got v%u. New firmware can be obtained " | 2119 | "Firmware has old API version. Expected v%u, " |
2117 | "from http://www.intellinuxwireless.org.\n", | 2120 | "got v%u. New firmware can be obtained " |
2118 | api_max, api_ver); | 2121 | "from http://www.intellinuxwireless.org.\n", |
2122 | api_max, api_ver); | ||
2123 | } | ||
2119 | 2124 | ||
2120 | if (build) | 2125 | if (build) |
2121 | sprintf(buildstr, " build %u%s", build, | 2126 | sprintf(buildstr, " build %u%s", build, |