iwlwifi: fix devices with PCI Device ID 0x34F0 and 11ac RF modules
authorLuca Coelho <luciano.coelho@intel.com>
Wed, 15 Aug 2018 19:07:25 +0000 (22:07 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Sep 2019 06:22:06 +0000 (08:22 +0200)
commit213566a9b0de6b786cdd3d9f60704e002284b02d
tree967ea99c336b3c9ac9aa42dedd37cc386fd9e688
parent2b76fcb6ba6239f8247591af2db491ec8c2bdc5f
iwlwifi: fix devices with PCI Device ID 0x34F0 and 11ac RF modules

[ Upstream commit ab27926d9e4ae23df4f4d98e31f067c8b486bb4f ]

The devices with PCI device ID 0x34F0 are part of the SoC and can be
combined with some different external RF modules.  The configuration
for these devices should reflect that, but are currently mixed up.  To
avoid confusion with discrete devices, add part of the firmware to be
used and the official name of the device to the cfg structs.

This is least reorganization possible (without messing things even
more) that could be done as a bugfix for this SoC.  Further
reorganization of this code will be done separately.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/intel/iwlwifi/cfg/22000.c
drivers/net/wireless/intel/iwlwifi/iwl-config.h
drivers/net/wireless/intel/iwlwifi/pcie/drv.c