Commit 77dcb6a9 authored by Jay Sternberg's avatar Jay Sternberg Committed by John W. Linville
Browse files

iwlwifi: correct device name for 1000 series 



device name was changed from 100 to 1000

Signed-off-by: default avatarJay Sternberg <jay.e.sternberg@linux.intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8337031e

drivers/net/wireless/iwlwifi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ config IWL4965 
	  This option enables support for Intel Wireless WiFi Link 4965AGN



config IWL5000

	bool "Intel Wireless WiFi 5000AGN; Intel WiFi Link 100, 6000, and 6050 Series"

	bool "Intel Wireless WiFi 5000AGN; Intel WiFi Link 1000, 6000, and 6050 Series"

	depends on IWLAGN

	---help---

	  This option enables support for Intel Wireless WiFi Link 5000AGN Family

drivers/net/wireless/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ iwlagn-objs := iwl-agn.o iwl-agn-rs.o 
iwlagn-$(CONFIG_IWL4965) += iwl-4965.o

iwlagn-$(CONFIG_IWL5000) += iwl-5000.o

iwlagn-$(CONFIG_IWL5000) += iwl-6000.o

iwlagn-$(CONFIG_IWL5000) += iwl-100.o

iwlagn-$(CONFIG_IWL5000) += iwl-1000.o



obj-$(CONFIG_IWL3945)	+= iwl3945.o

iwl3945-objs		:= iwl3945-base.o iwl-3945.o iwl-3945-rs.o

drivers/net/wireless/iwlwifi/iwl-100.c→drivers/net/wireless/iwlwifi/iwl-1000.c

+10 −10
Original line number Diff line number Diff line
@@ -46,20 +46,20 @@ 
#include "iwl-5000-hw.h"



/* Highest firmware API version supported */

#define IWL100_UCODE_API_MAX 2

#define IWL1000_UCODE_API_MAX 2



/* Lowest firmware API version supported */

#define IWL100_UCODE_API_MIN 1

#define IWL1000_UCODE_API_MIN 1



#define IWL100_FW_PRE "iwlwifi-100-"

#define _IWL100_MODULE_FIRMWARE(api) IWL100_FW_PRE #api ".ucode"

#define IWL100_MODULE_FIRMWARE(api) _IWL100_MODULE_FIRMWARE(api)

#define IWL1000_FW_PRE "iwlwifi-1000-"

#define _IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE #api ".ucode"

#define IWL1000_MODULE_FIRMWARE(api) _IWL1000_MODULE_FIRMWARE(api)



struct iwl_cfg iwl100_bgn_cfg = {

	.name = "100 Series BGN",

	.fw_name_pre = IWL100_FW_PRE,

	.ucode_api_max = IWL100_UCODE_API_MAX,

	.ucode_api_min = IWL100_UCODE_API_MIN,

struct iwl_cfg iwl1000_bgn_cfg = {

	.name = "1000 Series BGN",

	.fw_name_pre = IWL1000_FW_PRE,

	.ucode_api_max = IWL1000_UCODE_API_MAX,

	.ucode_api_min = IWL1000_UCODE_API_MIN,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl5000_ops,

	.eeprom_size = IWL_5000_EEPROM_IMG_SIZE,

drivers/net/wireless/iwlwifi/iwl-agn.c

+3 −3
Original line number Diff line number Diff line
@@ -3643,9 +3643,9 @@ static struct pci_device_id iwl_hw_card_ids[] = { 
	{IWL_PCI_DEVICE(0x0087, PCI_ANY_ID, iwl6050_2agn_cfg)},

	{IWL_PCI_DEVICE(0x0088, PCI_ANY_ID, iwl6050_3agn_cfg)},

	{IWL_PCI_DEVICE(0x0089, PCI_ANY_ID, iwl6050_2agn_cfg)},

/* 100 Series WiFi */

	{IWL_PCI_DEVICE(0x0083, PCI_ANY_ID, iwl100_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0084, PCI_ANY_ID, iwl100_bgn_cfg)},

/* 1000 Series WiFi */

	{IWL_PCI_DEVICE(0x0083, PCI_ANY_ID, iwl1000_bgn_cfg)},

	{IWL_PCI_DEVICE(0x0084, PCI_ANY_ID, iwl1000_bgn_cfg)},

#endif /* CONFIG_IWL5000 */



	{0}

drivers/net/wireless/iwlwifi/iwl-csr.h

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ 
#define CSR_HW_REV_TYPE_5350           (0x0000030)

#define CSR_HW_REV_TYPE_5100           (0x0000050)

#define CSR_HW_REV_TYPE_5150           (0x0000040)

#define CSR_HW_REV_TYPE_100            (0x0000060)

#define CSR_HW_REV_TYPE_1000           (0x0000060)

#define CSR_HW_REV_TYPE_6x00           (0x0000070)

#define CSR_HW_REV_TYPE_6x50           (0x0000080)

#define CSR_HW_REV_TYPE_NONE           (0x00000F0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE