Commit d896d463 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'wireless-next' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi

parents 0a8a721d 758f555f

drivers/net/wireless/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line 
# WIFI

obj-$(CONFIG_IWLWIFI)	+= iwlwifi.o

iwlwifi-objs		:= iwl-agn.o iwl-agn-rs.o iwl-mac80211.o

iwlwifi-objs		+= iwl-ucode.o iwl-agn-tx.o

iwlwifi-objs		+= iwl-ucode.o iwl-agn-tx.o iwl-debug.o

iwlwifi-objs		+= iwl-agn-lib.o iwl-agn-calib.o iwl-io.o

iwlwifi-objs		+= iwl-agn-tt.o iwl-agn-sta.o iwl-agn-rx.o

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

+5 −5
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ static struct iwl_sensitivity_ranges iwl1000_sensitivity = { 
	.nrg_th_cca = 62,

};



static int iwl1000_hw_set_hw_params(struct iwl_priv *priv)

static void iwl1000_hw_set_hw_params(struct iwl_priv *priv)

{

	if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)
@@ -128,8 +128,6 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) 
			iwlagn_mod_params.num_of_queues;



	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;

	hw_params(priv).max_data_size = IWLAGN_RTC_DATA_SIZE;

	hw_params(priv).max_inst_size = IWLAGN_RTC_INST_SIZE;



	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ);
@@ -146,8 +144,6 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) 


	/* Set initial sensitivity parameters */

	hw_params(priv).sens = &iwl1000_sensitivity;



	return 0;

}



static struct iwl_lib_ops iwl1000_lib = {
@@ -193,6 +189,8 @@ static struct iwl_ht_params iwl1000_ht_params = { 
	.ucode_api_max = IWL1000_UCODE_API_MAX,			\

	.ucode_api_ok = IWL1000_UCODE_API_OK,			\

	.ucode_api_min = IWL1000_UCODE_API_MIN,			\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\

	.lib = &iwl1000_lib,					\
@@ -215,6 +213,8 @@ struct iwl_cfg iwl1000_bg_cfg = { 
	.ucode_api_max = IWL100_UCODE_API_MAX,			\

	.ucode_api_ok = IWL100_UCODE_API_OK,			\

	.ucode_api_min = IWL100_UCODE_API_MIN,			\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\

	.lib = &iwl1000_lib,					\

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

+9 −5
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static struct iwl_sensitivity_ranges iwl2000_sensitivity = { 
	.nrg_th_cca = 62,

};



static int iwl2000_hw_set_hw_params(struct iwl_priv *priv)

static void iwl2000_hw_set_hw_params(struct iwl_priv *priv)

{

	if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)
@@ -124,8 +124,6 @@ static int iwl2000_hw_set_hw_params(struct iwl_priv *priv) 
			iwlagn_mod_params.num_of_queues;



	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;

	hw_params(priv).max_data_size = IWL60_RTC_DATA_SIZE;

	hw_params(priv).max_inst_size = IWL60_RTC_INST_SIZE;



	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ);
@@ -142,8 +140,6 @@ static int iwl2000_hw_set_hw_params(struct iwl_priv *priv) 


	/* Set initial sensitivity parameters */

	hw_params(priv).sens = &iwl2000_sensitivity;



	return 0;

}



static struct iwl_lib_ops iwl2000_lib = {
@@ -242,6 +238,8 @@ static struct iwl_bt_params iwl2030_bt_params = { 
	.ucode_api_max = IWL2000_UCODE_API_MAX,			\

	.ucode_api_ok = IWL2000_UCODE_API_OK,			\

	.ucode_api_min = IWL2000_UCODE_API_MIN,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.lib = &iwl2000_lib,					\
@@ -268,6 +266,8 @@ struct iwl_cfg iwl2000_2bgn_d_cfg = { 
	.ucode_api_max = IWL2030_UCODE_API_MAX,			\

	.ucode_api_ok = IWL2030_UCODE_API_OK,			\

	.ucode_api_min = IWL2030_UCODE_API_MIN,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.lib = &iwl2030_lib,					\
@@ -290,6 +290,8 @@ struct iwl_cfg iwl2030_2bgn_cfg = { 
	.ucode_api_max = IWL105_UCODE_API_MAX,			\

	.ucode_api_ok = IWL105_UCODE_API_OK,			\

	.ucode_api_min = IWL105_UCODE_API_MIN,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.lib = &iwl2000_lib,					\
@@ -318,6 +320,8 @@ struct iwl_cfg iwl105_bgn_d_cfg = { 
	.ucode_api_max = IWL135_UCODE_API_MAX,			\

	.ucode_api_ok = IWL135_UCODE_API_OK,			\

	.ucode_api_min = IWL135_UCODE_API_MIN,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.lib = &iwl2030_lib,					\

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

+8 −10
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static void iwl5000_set_ct_threshold(struct iwl_priv *priv) 
	hw_params(priv).ct_kill_threshold = CT_KILL_THRESHOLD_LEGACY;

}



static int iwl5000_hw_set_hw_params(struct iwl_priv *priv)

static void iwl5000_hw_set_hw_params(struct iwl_priv *priv)

{

	if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)
@@ -170,8 +170,6 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) 
			iwlagn_mod_params.num_of_queues;



	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;

	hw_params(priv).max_data_size = IWLAGN_RTC_DATA_SIZE;

	hw_params(priv).max_inst_size = IWLAGN_RTC_INST_SIZE;



	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |

					BIT(IEEE80211_BAND_5GHZ);
@@ -185,11 +183,9 @@ static int iwl5000_hw_set_hw_params(struct iwl_priv *priv) 


	/* Set initial sensitivity parameters */

	hw_params(priv).sens = &iwl5000_sensitivity;



	return 0;

}



static int iwl5150_hw_set_hw_params(struct iwl_priv *priv)

static void iwl5150_hw_set_hw_params(struct iwl_priv *priv)

{

	if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)
@@ -197,8 +193,6 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv) 
			iwlagn_mod_params.num_of_queues;



	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;

	hw_params(priv).max_data_size = IWLAGN_RTC_DATA_SIZE;

	hw_params(priv).max_inst_size = IWLAGN_RTC_INST_SIZE;



	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |

					BIT(IEEE80211_BAND_5GHZ);
@@ -212,8 +206,6 @@ static int iwl5150_hw_set_hw_params(struct iwl_priv *priv) 


	/* Set initial sensitivity parameters */

	hw_params(priv).sens = &iwl5150_sensitivity;



	return 0;

}



static void iwl5150_temperature(struct iwl_priv *priv)
@@ -356,6 +348,8 @@ static struct iwl_ht_params iwl5000_ht_params = { 
	.fw_name_pre = IWL5000_FW_PRE,				\

	.ucode_api_max = IWL5000_UCODE_API_MAX,			\

	.ucode_api_min = IWL5000_UCODE_API_MIN,			\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,	\

	.lib = &iwl5000_lib,					\
@@ -399,6 +393,8 @@ struct iwl_cfg iwl5350_agn_cfg = { 
	.fw_name_pre = IWL5000_FW_PRE,

	.ucode_api_max = IWL5000_UCODE_API_MAX,

	.ucode_api_min = IWL5000_UCODE_API_MIN,

	.max_inst_size = IWLAGN_RTC_INST_SIZE,

	.max_data_size = IWLAGN_RTC_DATA_SIZE,

	.eeprom_ver = EEPROM_5050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,

	.lib = &iwl5000_lib,
@@ -412,6 +408,8 @@ struct iwl_cfg iwl5350_agn_cfg = { 
	.fw_name_pre = IWL5150_FW_PRE,				\

	.ucode_api_max = IWL5150_UCODE_API_MAX,			\

	.ucode_api_min = IWL5150_UCODE_API_MIN,			\

	.max_inst_size = IWLAGN_RTC_INST_SIZE,			\

	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.eeprom_ver = EEPROM_5050_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,	\

	.lib = &iwl5150_lib,					\

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

+13 −4
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static struct iwl_sensitivity_ranges iwl6000_sensitivity = { 
	.nrg_th_cca = 62,

};



static int iwl6000_hw_set_hw_params(struct iwl_priv *priv)

static void iwl6000_hw_set_hw_params(struct iwl_priv *priv)

{

	if (iwlagn_mod_params.num_of_queues >= IWL_MIN_NUM_QUEUES &&

	    iwlagn_mod_params.num_of_queues <= IWLAGN_NUM_QUEUES)
@@ -145,8 +145,6 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) 
			iwlagn_mod_params.num_of_queues;



	hw_params(priv).max_txq_num = cfg(priv)->base_params->num_of_queues;

	hw_params(priv).max_data_size = IWL60_RTC_DATA_SIZE;

	hw_params(priv).max_inst_size = IWL60_RTC_INST_SIZE;



	hw_params(priv).ht40_channel =  BIT(IEEE80211_BAND_2GHZ) |

					BIT(IEEE80211_BAND_5GHZ);
@@ -165,7 +163,6 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) 
	/* Set initial sensitivity parameters */

	hw_params(priv).sens = &iwl6000_sensitivity;



	return 0;

}



static int iwl6000_hw_channel_switch(struct iwl_priv *priv,
@@ -349,6 +346,8 @@ static struct iwl_bt_params iwl6000_bt_params = { 
	.ucode_api_max = IWL6000G2_UCODE_API_MAX,		\

	.ucode_api_ok = IWL6000G2_UCODE_API_OK,			\

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.eeprom_ver = EEPROM_6005_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_6005_TX_POWER_VERSION,	\

	.lib = &iwl6000_lib,					\
@@ -389,6 +388,8 @@ struct iwl_cfg iwl6005_2agn_d_cfg = { 
	.ucode_api_max = IWL6000G2_UCODE_API_MAX,		\

	.ucode_api_ok = IWL6000G2_UCODE_API_OK,			\

	.ucode_api_min = IWL6000G2_UCODE_API_MIN,		\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.eeprom_ver = EEPROM_6030_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_6030_TX_POWER_VERSION,	\

	.lib = &iwl6030_lib,					\
@@ -458,6 +459,8 @@ struct iwl_cfg iwl130_bg_cfg = { 
	.ucode_api_max = IWL6000_UCODE_API_MAX,			\

	.ucode_api_ok = IWL6000_UCODE_API_OK,			\

	.ucode_api_min = IWL6000_UCODE_API_MIN,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.valid_tx_ant = ANT_BC,		/* .cfg overwrite */	\

	.valid_rx_ant = ANT_BC,		/* .cfg overwrite */	\

	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,		\
@@ -487,6 +490,8 @@ struct iwl_cfg iwl6000i_2bg_cfg = { 
	.fw_name_pre = IWL6050_FW_PRE,				\

	.ucode_api_max = IWL6050_UCODE_API_MAX,			\

	.ucode_api_min = IWL6050_UCODE_API_MIN,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.valid_tx_ant = ANT_AB,		/* .cfg overwrite */	\

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

	.lib = &iwl6000_lib,					\
@@ -512,6 +517,8 @@ struct iwl_cfg iwl6050_2abg_cfg = { 
	.fw_name_pre = IWL6050_FW_PRE,				\

	.ucode_api_max = IWL6050_UCODE_API_MAX,			\

	.ucode_api_min = IWL6050_UCODE_API_MIN,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.lib = &iwl6000_lib,					\

	.additional_nic_config = iwl6150_additional_nic_config,	\

	.eeprom_ver = EEPROM_6150_EEPROM_VERSION,		\
@@ -537,6 +544,8 @@ struct iwl_cfg iwl6000_3agn_cfg = { 
	.ucode_api_max = IWL6000_UCODE_API_MAX,

	.ucode_api_ok = IWL6000_UCODE_API_OK,

	.ucode_api_min = IWL6000_UCODE_API_MIN,

	.max_inst_size = IWL60_RTC_INST_SIZE,

	.max_data_size = IWL60_RTC_DATA_SIZE,

	.eeprom_ver = EEPROM_6000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_6000_TX_POWER_VERSION,

	.lib = &iwl6000_lib,