Commit 706c4ff6 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

iwlwifi: make config const 



Writing to the global config structures
is always wrong. To protect against such
mistakes in the future, mark them const.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 7e79a393

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

+4 −4
Original line number Diff line number Diff line
@@ -196,13 +196,13 @@ static struct iwl_ht_params iwl1000_ht_params = { 
	.base_params = &iwl1000_base_params,			\

	.led_mode = IWL_LED_BLINK



struct iwl_cfg iwl1000_bgn_cfg = {

const struct iwl_cfg iwl1000_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1000 BGN",

	IWL_DEVICE_1000,

	.ht_params = &iwl1000_ht_params,

};



struct iwl_cfg iwl1000_bg_cfg = {

const struct iwl_cfg iwl1000_bg_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1000 BG",

	IWL_DEVICE_1000,

};
@@ -221,13 +221,13 @@ struct iwl_cfg iwl1000_bg_cfg = { 
	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true



struct iwl_cfg iwl100_bgn_cfg = {

const struct iwl_cfg iwl100_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 100 BGN",

	IWL_DEVICE_100,

	.ht_params = &iwl1000_ht_params,

};



struct iwl_cfg iwl100_bg_cfg = {

const struct iwl_cfg iwl100_bg_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 100 BG",

	IWL_DEVICE_100,

};

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

+6 −6
Original line number Diff line number Diff line
@@ -248,13 +248,13 @@ static struct iwl_bt_params iwl2030_bt_params = { 
	.led_mode = IWL_LED_RF_STATE,				\

	.iq_invert = true					\



struct iwl_cfg iwl2000_2bgn_cfg = {

const struct iwl_cfg iwl2000_2bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 2200 BGN",

	IWL_DEVICE_2000,

	.ht_params = &iwl2000_ht_params,

};



struct iwl_cfg iwl2000_2bgn_d_cfg = {

const struct iwl_cfg iwl2000_2bgn_d_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 2200D BGN",

	IWL_DEVICE_2000,

	.ht_params = &iwl2000_ht_params,
@@ -278,7 +278,7 @@ struct iwl_cfg iwl2000_2bgn_d_cfg = { 
	.adv_pm = true,						\

	.iq_invert = true					\



struct iwl_cfg iwl2030_2bgn_cfg = {

const struct iwl_cfg iwl2030_2bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 2230 BGN",

	IWL_DEVICE_2030,

	.ht_params = &iwl2000_ht_params,
@@ -302,13 +302,13 @@ struct iwl_cfg iwl2030_2bgn_cfg = { 
	.rx_with_siso_diversity = true,				\

	.iq_invert = true					\



struct iwl_cfg iwl105_bgn_cfg = {

const struct iwl_cfg iwl105_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 105 BGN",

	IWL_DEVICE_105,

	.ht_params = &iwl2000_ht_params,

};



struct iwl_cfg iwl105_bgn_d_cfg = {

const struct iwl_cfg iwl105_bgn_d_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 105D BGN",

	IWL_DEVICE_105,

	.ht_params = &iwl2000_ht_params,
@@ -333,7 +333,7 @@ struct iwl_cfg iwl105_bgn_d_cfg = { 
	.rx_with_siso_diversity = true,				\

	.iq_invert = true					\



struct iwl_cfg iwl135_bgn_cfg = {

const struct iwl_cfg iwl135_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 135 BGN",

	IWL_DEVICE_135,

	.ht_params = &iwl2000_ht_params,

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

+7 −7
Original line number Diff line number Diff line
@@ -349,7 +349,7 @@ static struct iwl_ht_params iwl5000_ht_params = { 
	.base_params = &iwl5000_base_params,			\

	.led_mode = IWL_LED_BLINK



struct iwl_cfg iwl5300_agn_cfg = {

const struct iwl_cfg iwl5300_agn_cfg = {

	.name = "Intel(R) Ultimate N WiFi Link 5300 AGN",

	IWL_DEVICE_5000,

	/* at least EEPROM 0x11A has wrong info */
@@ -358,7 +358,7 @@ struct iwl_cfg iwl5300_agn_cfg = { 
	.ht_params = &iwl5000_ht_params,

};



struct iwl_cfg iwl5100_bgn_cfg = {

const struct iwl_cfg iwl5100_bgn_cfg = {

	.name = "Intel(R) WiFi Link 5100 BGN",

	IWL_DEVICE_5000,

	.valid_tx_ant = ANT_B,		/* .cfg overwrite */
@@ -366,14 +366,14 @@ struct iwl_cfg iwl5100_bgn_cfg = { 
	.ht_params = &iwl5000_ht_params,

};



struct iwl_cfg iwl5100_abg_cfg = {

const struct iwl_cfg iwl5100_abg_cfg = {

	.name = "Intel(R) WiFi Link 5100 ABG",

	IWL_DEVICE_5000,

	.valid_tx_ant = ANT_B,		/* .cfg overwrite */

	.valid_rx_ant = ANT_AB,		/* .cfg overwrite */

};



struct iwl_cfg iwl5100_agn_cfg = {

const struct iwl_cfg iwl5100_agn_cfg = {

	.name = "Intel(R) WiFi Link 5100 AGN",

	IWL_DEVICE_5000,

	.valid_tx_ant = ANT_B,		/* .cfg overwrite */
@@ -381,7 +381,7 @@ struct iwl_cfg iwl5100_agn_cfg = { 
	.ht_params = &iwl5000_ht_params,

};



struct iwl_cfg iwl5350_agn_cfg = {

const struct iwl_cfg iwl5350_agn_cfg = {

	.name = "Intel(R) WiMAX/WiFi Link 5350 AGN",

	.fw_name_pre = IWL5000_FW_PRE,

	.ucode_api_max = IWL5000_UCODE_API_MAX,
@@ -411,14 +411,14 @@ struct iwl_cfg iwl5350_agn_cfg = { 
	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true



struct iwl_cfg iwl5150_agn_cfg = {

const struct iwl_cfg iwl5150_agn_cfg = {

	.name = "Intel(R) WiMAX/WiFi Link 5150 AGN",

	IWL_DEVICE_5150,

	.ht_params = &iwl5000_ht_params,



};



struct iwl_cfg iwl5150_abg_cfg = {

const struct iwl_cfg iwl5150_abg_cfg = {

	.name = "Intel(R) WiMAX/WiFi Link 5150 ABG",

	IWL_DEVICE_5150,

};

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

+25 −24
Original line number Diff line number Diff line
@@ -354,40 +354,41 @@ static struct iwl_bt_params iwl6000_bt_params = { 
	.need_temp_offset_calib = true,				\

	.led_mode = IWL_LED_RF_STATE



struct iwl_cfg iwl6005_2agn_cfg = {

const struct iwl_cfg iwl6005_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6205 AGN",

	IWL_DEVICE_6005,

	.ht_params = &iwl6000_ht_params,

};



struct iwl_cfg iwl6005_2abg_cfg = {

const struct iwl_cfg iwl6005_2abg_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6205 ABG",

	IWL_DEVICE_6005,

};



struct iwl_cfg iwl6005_2bg_cfg = {

const struct iwl_cfg iwl6005_2bg_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6205 BG",

	IWL_DEVICE_6005,

};



struct iwl_cfg iwl6005_2agn_sff_cfg = {

const struct iwl_cfg iwl6005_2agn_sff_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6205S AGN",

	IWL_DEVICE_6005,

	.ht_params = &iwl6000_ht_params,

};



struct iwl_cfg iwl6005_2agn_d_cfg = {

const struct iwl_cfg iwl6005_2agn_d_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6205D AGN",

	IWL_DEVICE_6005,

	.ht_params = &iwl6000_ht_params,

};



struct iwl_cfg iwl6005_2agn_mow1_cfg = {

const struct iwl_cfg iwl6005_2agn_mow1_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6206 AGN",

	IWL_DEVICE_6005,

	.ht_params = &iwl6000_ht_params,

};

struct iwl_cfg iwl6005_2agn_mow2_cfg = {



const struct iwl_cfg iwl6005_2agn_mow2_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6207 AGN",

	IWL_DEVICE_6005,

	.ht_params = &iwl6000_ht_params,
@@ -409,53 +410,53 @@ struct iwl_cfg iwl6005_2agn_mow2_cfg = { 
	.led_mode = IWL_LED_RF_STATE,				\

	.adv_pm = true						\



struct iwl_cfg iwl6030_2agn_cfg = {

const struct iwl_cfg iwl6030_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6230 AGN",

	IWL_DEVICE_6030,

	.ht_params = &iwl6000_ht_params,

};



struct iwl_cfg iwl6030_2abg_cfg = {

const struct iwl_cfg iwl6030_2abg_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6230 ABG",

	IWL_DEVICE_6030,

};



struct iwl_cfg iwl6030_2bgn_cfg = {

const struct iwl_cfg iwl6030_2bgn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6230 BGN",

	IWL_DEVICE_6030,

	.ht_params = &iwl6000_ht_params,

};



struct iwl_cfg iwl6030_2bg_cfg = {

const struct iwl_cfg iwl6030_2bg_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6230 BG",

	IWL_DEVICE_6030,

};



struct iwl_cfg iwl6035_2agn_cfg = {

const struct iwl_cfg iwl6035_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6235 AGN",

	IWL_DEVICE_6030,

	.ht_params = &iwl6000_ht_params,

};



struct iwl_cfg iwl1030_bgn_cfg = {

const struct iwl_cfg iwl1030_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1030 BGN",

	IWL_DEVICE_6030,

	.ht_params = &iwl6000_ht_params,

};



struct iwl_cfg iwl1030_bg_cfg = {

const struct iwl_cfg iwl1030_bg_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 1030 BG",

	IWL_DEVICE_6030,

};



struct iwl_cfg iwl130_bgn_cfg = {

const struct iwl_cfg iwl130_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 130 BGN",

	IWL_DEVICE_6030,

	.ht_params = &iwl6000_ht_params,

	.rx_with_siso_diversity = true,

};



struct iwl_cfg iwl130_bg_cfg = {

const struct iwl_cfg iwl130_bg_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N 130 BG",

	IWL_DEVICE_6030,

	.rx_with_siso_diversity = true,
@@ -480,18 +481,18 @@ struct iwl_cfg iwl130_bg_cfg = { 
	.pa_type = IWL_PA_INTERNAL,				\

	.led_mode = IWL_LED_BLINK



struct iwl_cfg iwl6000i_2agn_cfg = {

const struct iwl_cfg iwl6000i_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6200 AGN",

	IWL_DEVICE_6000i,

	.ht_params = &iwl6000_ht_params,

};



struct iwl_cfg iwl6000i_2abg_cfg = {

const struct iwl_cfg iwl6000i_2abg_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6200 ABG",

	IWL_DEVICE_6000i,

};



struct iwl_cfg iwl6000i_2bg_cfg = {

const struct iwl_cfg iwl6000i_2bg_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N 6200 BG",

	IWL_DEVICE_6000i,

};
@@ -512,13 +513,13 @@ struct iwl_cfg iwl6000i_2bg_cfg = { 
	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true



struct iwl_cfg iwl6050_2agn_cfg = {

const struct iwl_cfg iwl6050_2agn_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 AGN",

	IWL_DEVICE_6050,

	.ht_params = &iwl6000_ht_params,

};



struct iwl_cfg iwl6050_2abg_cfg = {

const struct iwl_cfg iwl6050_2abg_cfg = {

	.name = "Intel(R) Centrino(R) Advanced-N + WiMAX 6250 ABG",

	IWL_DEVICE_6050,

};
@@ -537,18 +538,18 @@ struct iwl_cfg iwl6050_2abg_cfg = { 
	.led_mode = IWL_LED_BLINK,				\

	.internal_wimax_coex = true



struct iwl_cfg iwl6150_bgn_cfg = {

const struct iwl_cfg iwl6150_bgn_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BGN",

	IWL_DEVICE_6150,

	.ht_params = &iwl6000_ht_params,

};



struct iwl_cfg iwl6150_bg_cfg = {

const struct iwl_cfg iwl6150_bg_cfg = {

	.name = "Intel(R) Centrino(R) Wireless-N + WiMAX 6150 BG",

	IWL_DEVICE_6150,

};



struct iwl_cfg iwl6000_3agn_cfg = {

const struct iwl_cfg iwl6000_3agn_cfg = {

	.name = "Intel(R) Centrino(R) Ultimate-N 6300 AGN",

	.fw_name_pre = IWL6000_FW_PRE,

	.ucode_api_max = IWL6000_UCODE_API_MAX,

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

+41 −41
Original line number Diff line number Diff line
@@ -68,46 +68,46 @@ 
 * This file declares the config structures for all devices.

 */



extern struct iwl_cfg iwl5300_agn_cfg;

extern struct iwl_cfg iwl5100_agn_cfg;

extern struct iwl_cfg iwl5350_agn_cfg;

extern struct iwl_cfg iwl5100_bgn_cfg;

extern struct iwl_cfg iwl5100_abg_cfg;

extern struct iwl_cfg iwl5150_agn_cfg;

extern struct iwl_cfg iwl5150_abg_cfg;

extern struct iwl_cfg iwl6005_2agn_cfg;

extern struct iwl_cfg iwl6005_2abg_cfg;

extern struct iwl_cfg iwl6005_2bg_cfg;

extern struct iwl_cfg iwl6005_2agn_sff_cfg;

extern struct iwl_cfg iwl6005_2agn_d_cfg;

extern struct iwl_cfg iwl6005_2agn_mow1_cfg;

extern struct iwl_cfg iwl6005_2agn_mow2_cfg;

extern struct iwl_cfg iwl1030_bgn_cfg;

extern struct iwl_cfg iwl1030_bg_cfg;

extern struct iwl_cfg iwl6030_2agn_cfg;

extern struct iwl_cfg iwl6030_2abg_cfg;

extern struct iwl_cfg iwl6030_2bgn_cfg;

extern struct iwl_cfg iwl6030_2bg_cfg;

extern struct iwl_cfg iwl6000i_2agn_cfg;

extern struct iwl_cfg iwl6000i_2abg_cfg;

extern struct iwl_cfg iwl6000i_2bg_cfg;

extern struct iwl_cfg iwl6000_3agn_cfg;

extern struct iwl_cfg iwl6050_2agn_cfg;

extern struct iwl_cfg iwl6050_2abg_cfg;

extern struct iwl_cfg iwl6150_bgn_cfg;

extern struct iwl_cfg iwl6150_bg_cfg;

extern struct iwl_cfg iwl1000_bgn_cfg;

extern struct iwl_cfg iwl1000_bg_cfg;

extern struct iwl_cfg iwl100_bgn_cfg;

extern struct iwl_cfg iwl100_bg_cfg;

extern struct iwl_cfg iwl130_bgn_cfg;

extern struct iwl_cfg iwl130_bg_cfg;

extern struct iwl_cfg iwl2000_2bgn_cfg;

extern struct iwl_cfg iwl2000_2bgn_d_cfg;

extern struct iwl_cfg iwl2030_2bgn_cfg;

extern struct iwl_cfg iwl6035_2agn_cfg;

extern struct iwl_cfg iwl105_bgn_cfg;

extern struct iwl_cfg iwl105_bgn_d_cfg;

extern struct iwl_cfg iwl135_bgn_cfg;

extern const struct iwl_cfg iwl5300_agn_cfg;

extern const struct iwl_cfg iwl5100_agn_cfg;

extern const struct iwl_cfg iwl5350_agn_cfg;

extern const struct iwl_cfg iwl5100_bgn_cfg;

extern const struct iwl_cfg iwl5100_abg_cfg;

extern const struct iwl_cfg iwl5150_agn_cfg;

extern const struct iwl_cfg iwl5150_abg_cfg;

extern const struct iwl_cfg iwl6005_2agn_cfg;

extern const struct iwl_cfg iwl6005_2abg_cfg;

extern const struct iwl_cfg iwl6005_2bg_cfg;

extern const struct iwl_cfg iwl6005_2agn_sff_cfg;

extern const struct iwl_cfg iwl6005_2agn_d_cfg;

extern const struct iwl_cfg iwl6005_2agn_mow1_cfg;

extern const struct iwl_cfg iwl6005_2agn_mow2_cfg;

extern const struct iwl_cfg iwl1030_bgn_cfg;

extern const struct iwl_cfg iwl1030_bg_cfg;

extern const struct iwl_cfg iwl6030_2agn_cfg;

extern const struct iwl_cfg iwl6030_2abg_cfg;

extern const struct iwl_cfg iwl6030_2bgn_cfg;

extern const struct iwl_cfg iwl6030_2bg_cfg;

extern const struct iwl_cfg iwl6000i_2agn_cfg;

extern const struct iwl_cfg iwl6000i_2abg_cfg;

extern const struct iwl_cfg iwl6000i_2bg_cfg;

extern const struct iwl_cfg iwl6000_3agn_cfg;

extern const struct iwl_cfg iwl6050_2agn_cfg;

extern const struct iwl_cfg iwl6050_2abg_cfg;

extern const struct iwl_cfg iwl6150_bgn_cfg;

extern const struct iwl_cfg iwl6150_bg_cfg;

extern const struct iwl_cfg iwl1000_bgn_cfg;

extern const struct iwl_cfg iwl1000_bg_cfg;

extern const struct iwl_cfg iwl100_bgn_cfg;

extern const struct iwl_cfg iwl100_bg_cfg;

extern const struct iwl_cfg iwl130_bgn_cfg;

extern const struct iwl_cfg iwl130_bg_cfg;

extern const struct iwl_cfg iwl2000_2bgn_cfg;

extern const struct iwl_cfg iwl2000_2bgn_d_cfg;

extern const struct iwl_cfg iwl2030_2bgn_cfg;

extern const struct iwl_cfg iwl6035_2agn_cfg;

extern const struct iwl_cfg iwl105_bgn_cfg;

extern const struct iwl_cfg iwl105_bgn_d_cfg;

extern const struct iwl_cfg iwl135_bgn_cfg;



#endif /* __iwl_pci_h__ */