Newer
Older
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
+ IL_ERR("Firmware file req failed\n", buf, ret);
if (ret == -ENOENT)
continue;
else
@@ -1870,7 +1870,7 @@
if (idx < api_max)
IL_ERR("Loaded firmware %s, "
"which is deprecated. "
- " Please use API v%u instead.\n", buf,
+ "\n", buf,
api_max);
D_INFO("Got firmware '%s' file "
"(%zd bytes) from disk\n", buf, ucode_raw->size);
@@ -1906,16 +1906,14 @@
if (api_ver < api_min || api_ver > api_max) {
IL_ERR("Driver unable to support your firmware API. "
- "Driver supports v%u, firmware is v%u.\n", api_max,
+ "\n", api_max,
api_ver);
il->ucode_ver = 0;
ret = -EINVAL;
goto err_release;
}
if (api_ver != api_max)
- IL_ERR("Firmware has old API version. Expected %u, "
- "got %u. New firmware can be obtained "
- "from http://www.intellinuxwireless.org.\n", api_max,
+ IL_ERR("Firmware has old API version\n", api_max,
api_ver);
IL_INFO("loaded firmware version %u.%u.%u.%u\n",
diff -ru source.orig/drivers/net/wireless/iwlegacy/4965-mac.c source/drivers/net/wireless/iwlegacy/4965-mac.c
--- source.orig/drivers/net/wireless/iwlegacy/4965-mac.c 2016-01-10 23:01:32.000000000 +0000
+++ source/drivers/net/wireless/iwlegacy/4965-mac.c 2016-08-05 21:45:04.533469374 +0000
@@ -4706,7 +4706,7 @@
sprintf(il->firmware_name, "%s%s%s", name_pre, tag, ".ucode");
- D_INFO("attempting to load firmware '%s'\n", il->firmware_name);
+ D_INFO("attempting to load firmware\n", il->firmware_name);
return request_firmware_nowait(THIS_MODULE, 1, il->firmware_name,
&il->pci_dev->dev, GFP_KERNEL, il,
@@ -4797,7 +4797,7 @@
if (!ucode_raw) {
if (il->fw_idx <= il->cfg->ucode_api_max)
- IL_ERR("request for firmware file '%s' failed.\n",
+ IL_ERR("request for firmware failed.\n",
il->firmware_name);
goto try_again;
}
@@ -4827,16 +4827,13 @@
* on the API version read from firmware header from here on forward
*/
if (api_ver < api_min || api_ver > api_max) {
- IL_ERR("Driver unable to support your firmware API. "
- "Driver supports v%u, firmware is v%u.\n", api_max,
+ IL_ERR("Driver unable to support your firmware API.\n", api_max,
api_ver);
goto try_again;
}
if (api_ver != api_max)
- IL_ERR("Firmware has old API version. Expected v%u, "
- "got v%u. New firmware can be obtained "
- "from http://www.intellinuxwireless.org.\n", api_max,
+ IL_ERR("Firmware has old API version.\n", api_max,
api_ver);
IL_INFO("loaded firmware version %u.%u.%u.%u\n",