lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwlwifi: correct device name for 1000 series

Browse Source 
device name was changed from 100 to 1000

Signed-off-by: Jay Sternberg <jay.e.sternberg@linux.intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Jay Sternberg
2009-03-06 13:52:55 -08:00
committed by John W. Linville
parent 8337031ef3
commit 77dcb6a952
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/iwlwifi/Kconfig
View File

@@ -87,7 +87,7 @@ config IWL4965
This option enables support for Intel Wireless WiFi Link 4965AGN This option enables support for Intel Wireless WiFi Link 4965AGN
config IWL5000 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 depends on IWLAGN
---help--- ---help---
This option enables support for Intel Wireless WiFi Link 5000AGN Family This option enables support for Intel Wireless WiFi Link 5000AGN Family

2
drivers/net/wireless/iwlwifi/Makefile
View File

@@ -13,7 +13,7 @@ iwlagn-objs := iwl-agn.o iwl-agn-rs.o
iwlagn-$(CONFIG_IWL4965) += iwl-4965.o iwlagn-$(CONFIG_IWL4965) += iwl-4965.o
iwlagn-$(CONFIG_IWL5000) += iwl-5000.o iwlagn-$(CONFIG_IWL5000) += iwl-5000.o
iwlagn-$(CONFIG_IWL5000) += iwl-6000.o iwlagn-$(CONFIG_IWL5000) += iwl-6000.o
iwlagn-$(CONFIG_IWL5000) += iwl-100.o iwlagn-$(CONFIG_IWL5000) += iwl-1000.o
obj-$(CONFIG_IWL3945) += iwl3945.o obj-$(CONFIG_IWL3945) += iwl3945.o
iwl3945-objs := iwl3945-base.o iwl-3945.o iwl-3945-rs.o iwl3945-objs := iwl3945-base.o iwl-3945.o iwl-3945-rs.o

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

@@ -46,20 +46,20 @@
#include "iwl-5000-hw.h" #include "iwl-5000-hw.h"
/* Highest firmware API version supported */ /* Highest firmware API version supported */
#define IWL100_UCODE_API_MAX 2 #define IWL1000_UCODE_API_MAX 2
/* Lowest firmware API version supported */ /* Lowest firmware API version supported */
#define IWL100_UCODE_API_MIN 1 #define IWL1000_UCODE_API_MIN 1
#define IWL100_FW_PRE "iwlwifi-100-" #define IWL1000_FW_PRE "iwlwifi-1000-"
#define _IWL100_MODULE_FIRMWARE(api) IWL100_FW_PRE #api ".ucode" #define _IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE #api ".ucode"
#define IWL100_MODULE_FIRMWARE(api) _IWL100_MODULE_FIRMWARE(api) #define IWL1000_MODULE_FIRMWARE(api) _IWL1000_MODULE_FIRMWARE(api)
struct iwl_cfg iwl100_bgn_cfg = { struct iwl_cfg iwl1000_bgn_cfg = {
.name = "100 Series BGN", .name = "1000 Series BGN",
.fw_name_pre = IWL100_FW_PRE, .fw_name_pre = IWL1000_FW_PRE,
.ucode_api_max = IWL100_UCODE_API_MAX, .ucode_api_max = IWL1000_UCODE_API_MAX,
.ucode_api_min = IWL100_UCODE_API_MIN, .ucode_api_min = IWL1000_UCODE_API_MIN,
.sku = IWL_SKU_G|IWL_SKU_N, .sku = IWL_SKU_G|IWL_SKU_N,
.ops = &iwl5000_ops, .ops = &iwl5000_ops,
.eeprom_size = IWL_5000_EEPROM_IMG_SIZE, .eeprom_size = IWL_5000_EEPROM_IMG_SIZE,

6
drivers/net/wireless/iwlwifi/iwl-agn.c
View File

@@ -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(0x0087, PCI_ANY_ID, iwl6050_2agn_cfg)},
{IWL_PCI_DEVICE(0x0088, PCI_ANY_ID, iwl6050_3agn_cfg)}, {IWL_PCI_DEVICE(0x0088, PCI_ANY_ID, iwl6050_3agn_cfg)},
{IWL_PCI_DEVICE(0x0089, PCI_ANY_ID, iwl6050_2agn_cfg)}, {IWL_PCI_DEVICE(0x0089, PCI_ANY_ID, iwl6050_2agn_cfg)},
/* 100 Series WiFi */ /* 1000 Series WiFi */
{IWL_PCI_DEVICE(0x0083, PCI_ANY_ID, iwl100_bgn_cfg)}, {IWL_PCI_DEVICE(0x0083, PCI_ANY_ID, iwl1000_bgn_cfg)},
{IWL_PCI_DEVICE(0x0084, PCI_ANY_ID, iwl100_bgn_cfg)}, {IWL_PCI_DEVICE(0x0084, PCI_ANY_ID, iwl1000_bgn_cfg)},
#endif /* CONFIG_IWL5000 */ #endif /* CONFIG_IWL5000 */
{0} {0}

2
drivers/net/wireless/iwlwifi/iwl-csr.h
View File

@@ -211,7 +211,7 @@
#define CSR_HW_REV_TYPE_5350 (0x0000030) #define CSR_HW_REV_TYPE_5350 (0x0000030)
#define CSR_HW_REV_TYPE_5100 (0x0000050) #define CSR_HW_REV_TYPE_5100 (0x0000050)
#define CSR_HW_REV_TYPE_5150 (0x0000040) #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_6x00 (0x0000070)
#define CSR_HW_REV_TYPE_6x50 (0x0000080) #define CSR_HW_REV_TYPE_6x50 (0x0000080)
#define CSR_HW_REV_TYPE_NONE (0x00000F0) #define CSR_HW_REV_TYPE_NONE (0x00000F0)

2
drivers/net/wireless/iwlwifi/iwl-dev.h
View File

@@ -62,7 +62,7 @@ extern struct iwl_cfg iwl6000_2agn_cfg;
extern struct iwl_cfg iwl6000_3agn_cfg; extern struct iwl_cfg iwl6000_3agn_cfg;
extern struct iwl_cfg iwl6050_2agn_cfg; extern struct iwl_cfg iwl6050_2agn_cfg;
extern struct iwl_cfg iwl6050_3agn_cfg; extern struct iwl_cfg iwl6050_3agn_cfg;
extern struct iwl_cfg iwl100_bgn_cfg; extern struct iwl_cfg iwl1000_bgn_cfg;
/* shared structures from iwl-5000.c */ /* shared structures from iwl-5000.c */
extern struct iwl_mod_params iwl50_mod_params; extern struct iwl_mod_params iwl50_mod_params;