Skip to contentSkip to conversation

Patch "iwlwifi: fix MODULE_FIRMWARE for 6030" has been added to the 4.10-stable tree

PATCH [email protected] 1 participant 1 message May 9, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

iwlwifi: fix MODULE_FIRMWARE for 6030

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
iwlwifi-fix-module_firmware-for-6030.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From d8320d75b59ecdc1b8e60ac793d3a54d84333a18 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <[email protected]>
Date: Mon, 10 Oct 2016 18:30:00 +0200
Subject: iwlwifi: fix MODULE_FIRMWARE for 6030
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

From: Jürg Billeter <[email protected]>

commit d8320d75b59ecdc1b8e60ac793d3a54d84333a18 upstream.

IWL6000G2B_UCODE_API_MAX is not defined. ucode_api_max of IWL_DEVICE_6030 uses IWL6000G2_UCODE_API_MAX. Use this also for MODULE_FIRMWARE.

Fixes 9d9b21d1b616 ("iwlwifi: remove IWL_*_UCODE_API_OK")
---
 drivers/net/wireless/intel/iwlwifi/iwl-6000.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/iwl-6000.c +1 -1
@@ -371,4 +371,4 @@ const struct iwl_cfg iwl6000_3agn_cfg =
 MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL6050_MODULE_FIRMWARE(IWL6050_UCODE_API_MAX));
 MODULE_FIRMWARE(IWL6005_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));
-MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2B_UCODE_API_MAX));
+MODULE_FIRMWARE(IWL6030_MODULE_FIRMWARE(IWL6000G2_UCODE_API_MAX));

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/iwlwifi-fix-module_firmware-for-6030.patch