Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

iwlwifi: dynamically determine lib_ops 



Having the pointer to lib_ops in the config
makes it impossible to split the driver into
different modules. Determine the ops based on
the device family enumeration to get rid of
the direct pointer.

Also move all the opmode specific code from
the iwl-[1256]000.c files into a new file
iwl-agn-devices.c so that the former only
have configuration data now.

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 a141e6a0

drivers/net/wireless/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ iwlwifi-objs += iwl-agn-tt.o iwl-agn-sta.o iwl-agn-rx.o 


iwlwifi-objs		+= iwl-core.o iwl-eeprom.o iwl-power.o

iwlwifi-objs		+= iwl-scan.o iwl-led.o

iwlwifi-objs		+= iwl-agn-rxon.o

iwlwifi-objs		+= iwl-agn-rxon.o iwl-agn-devices.o

iwlwifi-objs		+= iwl-5000.o

iwlwifi-objs		+= iwl-6000.o

iwlwifi-objs		+= iwl-1000.o

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

+2 −110
Original line number Diff line number Diff line
@@ -24,26 +24,11 @@ 
 *

 *****************************************************************************/



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/delay.h>

#include <linux/skbuff.h>

#include <linux/netdevice.h>

#include <net/mac80211.h>

#include <linux/etherdevice.h>

#include <asm/unaligned.h>

#include <linux/stringify.h>



#include "iwl-eeprom.h"

#include "iwl-dev.h"

#include "iwl-core.h"

#include "iwl-io.h"

#include "iwl-agn.h"

#include "iwl-agn-hw.h"

#include "iwl-shared.h"

#include "iwl-config.h"

#include "iwl-cfg.h"

#include "iwl-prph.h"

#include "iwl-dev.h" /* still needed */



/* Highest firmware API version supported */

#define IWL1000_UCODE_API_MAX 6
@@ -64,97 +49,6 @@ 
#define IWL100_MODULE_FIRMWARE(api) IWL100_FW_PRE __stringify(api) ".ucode"





/*

 * For 1000, use advance thermal throttling critical temperature threshold,

 * but legacy thermal management implementation for now.

 * This is for the reason of 1000 uCode using advance thermal throttling API

 * but not implement ct_kill_exit based on ct_kill exit temperature

 * so the thermal throttling will still based on legacy thermal throttling

 * management.

 * The code here need to be modified once 1000 uCode has the advanced thermal

 * throttling algorithm in place

 */

static void iwl1000_set_ct_threshold(struct iwl_priv *priv)

{

	/* want Celsius */

	priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD_LEGACY;

	priv->hw_params.ct_kill_exit_threshold = CT_KILL_EXIT_THRESHOLD;

}



/* NIC configuration for 1000 series */

static void iwl1000_nic_config(struct iwl_priv *priv)

{

	/* set CSR_HW_CONFIG_REG for uCode use */

	iwl_set_bit(trans(priv), CSR_HW_IF_CONFIG_REG,

		    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |

		    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);



	/* Setting digital SVR for 1000 card to 1.32V */

	/* locking is acquired in iwl_set_bits_mask_prph() function */

	iwl_set_bits_mask_prph(trans(priv), APMG_DIGITAL_SVR_REG,

				APMG_SVR_DIGITAL_VOLTAGE_1_32,

				~APMG_SVR_VOLTAGE_CONFIG_BIT_MSK);

}



static const struct iwl_sensitivity_ranges iwl1000_sensitivity = {

	.min_nrg_cck = 95,

	.auto_corr_min_ofdm = 90,

	.auto_corr_min_ofdm_mrc = 170,

	.auto_corr_min_ofdm_x1 = 120,

	.auto_corr_min_ofdm_mrc_x1 = 240,



	.auto_corr_max_ofdm = 120,

	.auto_corr_max_ofdm_mrc = 210,

	.auto_corr_max_ofdm_x1 = 155,

	.auto_corr_max_ofdm_mrc_x1 = 290,



	.auto_corr_min_cck = 125,

	.auto_corr_max_cck = 200,

	.auto_corr_min_cck_mrc = 170,

	.auto_corr_max_cck_mrc = 400,

	.nrg_th_cck = 95,

	.nrg_th_ofdm = 95,



	.barker_corr_th_min = 190,

	.barker_corr_th_min_mrc = 390,

	.nrg_th_cca = 62,

};



static void iwl1000_hw_set_hw_params(struct iwl_priv *priv)

{

	priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ);



	priv->hw_params.tx_chains_num =

		num_of_ant(priv->hw_params.valid_tx_ant);

	if (cfg(priv)->rx_with_siso_diversity)

		priv->hw_params.rx_chains_num = 1;

	else

		priv->hw_params.rx_chains_num =

			num_of_ant(priv->hw_params.valid_rx_ant);



	iwl1000_set_ct_threshold(priv);



	/* Set initial sensitivity parameters */

	priv->hw_params.sens = &iwl1000_sensitivity;

}



static struct iwl_lib_ops iwl1000_lib = {

	.set_hw_params = iwl1000_hw_set_hw_params,

	.nic_config = iwl1000_nic_config,

	.eeprom_ops = {

		.regulatory_bands = {

			EEPROM_REG_BAND_1_CHANNELS,

			EEPROM_REG_BAND_2_CHANNELS,

			EEPROM_REG_BAND_3_CHANNELS,

			EEPROM_REG_BAND_4_CHANNELS,

			EEPROM_REG_BAND_5_CHANNELS,

			EEPROM_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REGULATORY_BAND_NO_HT40,

		},

	},

	.temperature = iwlagn_temperature,

};



static const struct iwl_base_params iwl1000_base_params = {

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,
@@ -185,7 +79,6 @@ static const struct iwl_ht_params iwl1000_ht_params = { 
	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\

	.lib = &iwl1000_lib,					\

	.base_params = &iwl1000_base_params,			\

	.led_mode = IWL_LED_BLINK
@@ -210,7 +103,6 @@ const struct iwl_cfg iwl1000_bg_cfg = { 
	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,	\

	.lib = &iwl1000_lib,					\

	.base_params = &iwl1000_base_params,			\

	.led_mode = IWL_LED_RF_STATE,				\

	.rx_with_siso_diversity = true

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

+2 −114
Original line number Diff line number Diff line
@@ -24,25 +24,11 @@ 
 *

 *****************************************************************************/



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/delay.h>

#include <linux/skbuff.h>

#include <linux/netdevice.h>

#include <net/mac80211.h>

#include <linux/etherdevice.h>

#include <asm/unaligned.h>

#include <linux/stringify.h>



#include "iwl-eeprom.h"

#include "iwl-dev.h"

#include "iwl-core.h"

#include "iwl-io.h"

#include "iwl-agn.h"

#include "iwl-agn-hw.h"

#include "iwl-shared.h"

#include "iwl-config.h"

#include "iwl-cfg.h"

#include "iwl-dev.h" /* still needed */



/* Highest firmware API version supported */

#define IWL2030_UCODE_API_MAX 6
@@ -74,100 +60,6 @@ 
#define IWL135_FW_PRE "iwlwifi-135-"

#define IWL135_MODULE_FIRMWARE(api) IWL135_FW_PRE __stringify(api) ".ucode"



static void iwl2000_set_ct_threshold(struct iwl_priv *priv)

{

	/* want Celsius */

	priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD;

	priv->hw_params.ct_kill_exit_threshold = CT_KILL_EXIT_THRESHOLD;

}



/* NIC configuration for 2000 series */

static void iwl2000_nic_config(struct iwl_priv *priv)

{

	iwl_rf_config(priv);



	iwl_set_bit(trans(priv), CSR_GP_DRIVER_REG,

		    CSR_GP_DRIVER_REG_BIT_RADIO_IQ_INVER);

}



static const struct iwl_sensitivity_ranges iwl2000_sensitivity = {

	.min_nrg_cck = 97,

	.auto_corr_min_ofdm = 80,

	.auto_corr_min_ofdm_mrc = 128,

	.auto_corr_min_ofdm_x1 = 105,

	.auto_corr_min_ofdm_mrc_x1 = 192,



	.auto_corr_max_ofdm = 145,

	.auto_corr_max_ofdm_mrc = 232,

	.auto_corr_max_ofdm_x1 = 110,

	.auto_corr_max_ofdm_mrc_x1 = 232,



	.auto_corr_min_cck = 125,

	.auto_corr_max_cck = 175,

	.auto_corr_min_cck_mrc = 160,

	.auto_corr_max_cck_mrc = 310,

	.nrg_th_cck = 97,

	.nrg_th_ofdm = 100,



	.barker_corr_th_min = 190,

	.barker_corr_th_min_mrc = 390,

	.nrg_th_cca = 62,

};



static void iwl2000_hw_set_hw_params(struct iwl_priv *priv)

{

	priv->hw_params.ht40_channel =  BIT(IEEE80211_BAND_2GHZ);



	priv->hw_params.tx_chains_num =

		num_of_ant(priv->hw_params.valid_tx_ant);

	if (cfg(priv)->rx_with_siso_diversity)

		priv->hw_params.rx_chains_num = 1;

	else

		priv->hw_params.rx_chains_num =

			num_of_ant(priv->hw_params.valid_rx_ant);



	iwl2000_set_ct_threshold(priv);



	/* Set initial sensitivity parameters */

	priv->hw_params.sens = &iwl2000_sensitivity;

}



static struct iwl_lib_ops iwl2000_lib = {

	.set_hw_params = iwl2000_hw_set_hw_params,

	.nic_config = iwl2000_nic_config,

	.eeprom_ops = {

		.regulatory_bands = {

			EEPROM_REG_BAND_1_CHANNELS,

			EEPROM_REG_BAND_2_CHANNELS,

			EEPROM_REG_BAND_3_CHANNELS,

			EEPROM_REG_BAND_4_CHANNELS,

			EEPROM_REG_BAND_5_CHANNELS,

			EEPROM_6000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REGULATORY_BAND_NO_HT40,

		},

		.enhanced_txpower = true,

	},

	.temperature = iwlagn_temperature,

};



static struct iwl_lib_ops iwl2030_lib = {

	.set_hw_params = iwl2000_hw_set_hw_params,

	.nic_config = iwl2000_nic_config,

	.eeprom_ops = {

		.regulatory_bands = {

			EEPROM_REG_BAND_1_CHANNELS,

			EEPROM_REG_BAND_2_CHANNELS,

			EEPROM_REG_BAND_3_CHANNELS,

			EEPROM_REG_BAND_4_CHANNELS,

			EEPROM_REG_BAND_5_CHANNELS,

			EEPROM_6000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REGULATORY_BAND_NO_HT40,

		},

		.enhanced_txpower = true,

	},

	.temperature = iwlagn_temperature,

};



static const struct iwl_base_params iwl2000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,
@@ -228,7 +120,6 @@ static const struct iwl_bt_params iwl2030_bt_params = { 
	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.lib = &iwl2000_lib,					\

	.base_params = &iwl2000_base_params,			\

	.need_temp_offset_calib = true,				\

	.temp_offset_v2 = true,					\
@@ -256,7 +147,6 @@ const struct iwl_cfg iwl2000_2bgn_d_cfg = { 
	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.lib = &iwl2030_lib,					\

	.base_params = &iwl2030_base_params,			\

	.bt_params = &iwl2030_bt_params,			\

	.need_temp_offset_calib = true,				\
@@ -280,7 +170,6 @@ const struct iwl_cfg iwl2030_2bgn_cfg = { 
	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.lib = &iwl2000_lib,					\

	.base_params = &iwl2000_base_params,			\

	.need_temp_offset_calib = true,				\

	.temp_offset_v2 = true,					\
@@ -310,7 +199,6 @@ const struct iwl_cfg iwl105_bgn_d_cfg = { 
	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.eeprom_ver = EEPROM_2000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_2000_TX_POWER_VERSION,	\

	.lib = &iwl2030_lib,					\

	.base_params = &iwl2030_base_params,			\

	.bt_params = &iwl2030_bt_params,			\

	.need_temp_offset_calib = true,				\

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

+2 −266
Original line number Diff line number Diff line
@@ -24,28 +24,11 @@ 
 *

 *****************************************************************************/



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/delay.h>

#include <linux/sched.h>

#include <linux/skbuff.h>

#include <linux/netdevice.h>

#include <net/mac80211.h>

#include <linux/etherdevice.h>

#include <asm/unaligned.h>

#include <linux/stringify.h>



#include "iwl-eeprom.h"

#include "iwl-dev.h"

#include "iwl-core.h"

#include "iwl-io.h"

#include "iwl-agn.h"

#include "iwl-agn-hw.h"

#include "iwl-trans.h"

#include "iwl-shared.h"

#include "iwl-config.h"

#include "iwl-cfg.h"

#include "iwl-prph.h"

#include "iwl-dev.h" /* still needed */



/* Highest firmware API version supported */

#define IWL5000_UCODE_API_MAX 5
@@ -61,250 +44,6 @@ 
#define IWL5150_FW_PRE "iwlwifi-5150-"

#define IWL5150_MODULE_FIRMWARE(api) IWL5150_FW_PRE __stringify(api) ".ucode"



/* NIC configuration for 5000 series */

static void iwl5000_nic_config(struct iwl_priv *priv)

{

	iwl_rf_config(priv);



	/* W/A : NIC is stuck in a reset state after Early PCIe power off

	 * (PCIe power is lost before PERST# is asserted),

	 * causing ME FW to lose ownership and not being able to obtain it back.

	 */

	iwl_set_bits_mask_prph(trans(priv), APMG_PS_CTRL_REG,

				APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS,

				~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);

}



static const struct iwl_sensitivity_ranges iwl5000_sensitivity = {

	.min_nrg_cck = 100,

	.auto_corr_min_ofdm = 90,

	.auto_corr_min_ofdm_mrc = 170,

	.auto_corr_min_ofdm_x1 = 105,

	.auto_corr_min_ofdm_mrc_x1 = 220,



	.auto_corr_max_ofdm = 120,

	.auto_corr_max_ofdm_mrc = 210,

	.auto_corr_max_ofdm_x1 = 120,

	.auto_corr_max_ofdm_mrc_x1 = 240,



	.auto_corr_min_cck = 125,

	.auto_corr_max_cck = 200,

	.auto_corr_min_cck_mrc = 200,

	.auto_corr_max_cck_mrc = 400,

	.nrg_th_cck = 100,

	.nrg_th_ofdm = 100,



	.barker_corr_th_min = 190,

	.barker_corr_th_min_mrc = 390,

	.nrg_th_cca = 62,

};



static struct iwl_sensitivity_ranges iwl5150_sensitivity = {

	.min_nrg_cck = 95,

	.auto_corr_min_ofdm = 90,

	.auto_corr_min_ofdm_mrc = 170,

	.auto_corr_min_ofdm_x1 = 105,

	.auto_corr_min_ofdm_mrc_x1 = 220,



	.auto_corr_max_ofdm = 120,

	.auto_corr_max_ofdm_mrc = 210,

	/* max = min for performance bug in 5150 DSP */

	.auto_corr_max_ofdm_x1 = 105,

	.auto_corr_max_ofdm_mrc_x1 = 220,



	.auto_corr_min_cck = 125,

	.auto_corr_max_cck = 200,

	.auto_corr_min_cck_mrc = 170,

	.auto_corr_max_cck_mrc = 400,

	.nrg_th_cck = 95,

	.nrg_th_ofdm = 95,



	.barker_corr_th_min = 190,

	.barker_corr_th_min_mrc = 390,

	.nrg_th_cca = 62,

};



#define IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF	(-5)



static s32 iwl_temp_calib_to_offset(struct iwl_priv *priv)

{

	u16 temperature, voltage;

	__le16 *temp_calib = (__le16 *)iwl_eeprom_query_addr(priv,

				EEPROM_KELVIN_TEMPERATURE);



	temperature = le16_to_cpu(temp_calib[0]);

	voltage = le16_to_cpu(temp_calib[1]);



	/* offset = temp - volt / coeff */

	return (s32)(temperature - voltage / IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF);

}



static void iwl5150_set_ct_threshold(struct iwl_priv *priv)

{

	const s32 volt2temp_coef = IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF;

	s32 threshold = (s32)CELSIUS_TO_KELVIN(CT_KILL_THRESHOLD_LEGACY) -

			iwl_temp_calib_to_offset(priv);



	priv->hw_params.ct_kill_threshold = threshold * volt2temp_coef;

}



static void iwl5000_set_ct_threshold(struct iwl_priv *priv)

{

	/* want Celsius */

	priv->hw_params.ct_kill_threshold = CT_KILL_THRESHOLD_LEGACY;

}



static void iwl5000_hw_set_hw_params(struct iwl_priv *priv)

{

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

					BIT(IEEE80211_BAND_5GHZ);



	priv->hw_params.tx_chains_num =

		num_of_ant(priv->hw_params.valid_tx_ant);

	priv->hw_params.rx_chains_num =

		num_of_ant(priv->hw_params.valid_rx_ant);



	iwl5000_set_ct_threshold(priv);



	/* Set initial sensitivity parameters */

	priv->hw_params.sens = &iwl5000_sensitivity;

}



static void iwl5150_hw_set_hw_params(struct iwl_priv *priv)

{

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

					BIT(IEEE80211_BAND_5GHZ);



	priv->hw_params.tx_chains_num =

		num_of_ant(priv->hw_params.valid_tx_ant);

	priv->hw_params.rx_chains_num =

		num_of_ant(priv->hw_params.valid_rx_ant);



	iwl5150_set_ct_threshold(priv);



	/* Set initial sensitivity parameters */

	priv->hw_params.sens = &iwl5150_sensitivity;

}



static void iwl5150_temperature(struct iwl_priv *priv)

{

	u32 vt = 0;

	s32 offset =  iwl_temp_calib_to_offset(priv);



	vt = le32_to_cpu(priv->statistics.common.temperature);

	vt = vt / IWL_5150_VOLTAGE_TO_TEMPERATURE_COEFF + offset;

	/* now vt hold the temperature in Kelvin */

	priv->temperature = KELVIN_TO_CELSIUS(vt);

	iwl_tt_handler(priv);

}



static int iwl5000_hw_channel_switch(struct iwl_priv *priv,

				     struct ieee80211_channel_switch *ch_switch)

{

	/*

	 * MULTI-FIXME

	 * See iwlagn_mac_channel_switch.

	 */

	struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];

	struct iwl5000_channel_switch_cmd cmd;

	const struct iwl_channel_info *ch_info;

	u32 switch_time_in_usec, ucode_switch_time;

	u16 ch;

	u32 tsf_low;

	u8 switch_count;

	u16 beacon_interval = le16_to_cpu(ctx->timing.beacon_interval);

	struct ieee80211_vif *vif = ctx->vif;

	struct iwl_host_cmd hcmd = {

		.id = REPLY_CHANNEL_SWITCH,

		.len = { sizeof(cmd), },

		.flags = CMD_SYNC,

		.data = { &cmd, },

	};



	cmd.band = priv->band == IEEE80211_BAND_2GHZ;

	ch = ch_switch->channel->hw_value;

	IWL_DEBUG_11H(priv, "channel switch from %d to %d\n",

		      ctx->active.channel, ch);

	cmd.channel = cpu_to_le16(ch);

	cmd.rxon_flags = ctx->staging.flags;

	cmd.rxon_filter_flags = ctx->staging.filter_flags;

	switch_count = ch_switch->count;

	tsf_low = ch_switch->timestamp & 0x0ffffffff;

	/*

	 * calculate the ucode channel switch time

	 * adding TSF as one of the factor for when to switch

	 */

	if ((priv->ucode_beacon_time > tsf_low) && beacon_interval) {

		if (switch_count > ((priv->ucode_beacon_time - tsf_low) /

		    beacon_interval)) {

			switch_count -= (priv->ucode_beacon_time -

				tsf_low) / beacon_interval;

		} else

			switch_count = 0;

	}

	if (switch_count <= 1)

		cmd.switch_time = cpu_to_le32(priv->ucode_beacon_time);

	else {

		switch_time_in_usec =

			vif->bss_conf.beacon_int * switch_count * TIME_UNIT;

		ucode_switch_time = iwl_usecs_to_beacons(priv,

							 switch_time_in_usec,

							 beacon_interval);

		cmd.switch_time = iwl_add_beacon_time(priv,

						      priv->ucode_beacon_time,

						      ucode_switch_time,

						      beacon_interval);

	}

	IWL_DEBUG_11H(priv, "uCode time for the switch is 0x%x\n",

		      cmd.switch_time);

	ch_info = iwl_get_channel_info(priv, priv->band, ch);

	if (ch_info)

		cmd.expect_beacon = is_channel_radar(ch_info);

	else {

		IWL_ERR(priv, "invalid channel switch from %u to %u\n",

			ctx->active.channel, ch);

		return -EFAULT;

	}



	return iwl_dvm_send_cmd(priv, &hcmd);

}



static struct iwl_lib_ops iwl5000_lib = {

	.set_hw_params = iwl5000_hw_set_hw_params,

	.set_channel_switch = iwl5000_hw_channel_switch,

	.nic_config = iwl5000_nic_config,

	.eeprom_ops = {

		.regulatory_bands = {

			EEPROM_REG_BAND_1_CHANNELS,

			EEPROM_REG_BAND_2_CHANNELS,

			EEPROM_REG_BAND_3_CHANNELS,

			EEPROM_REG_BAND_4_CHANNELS,

			EEPROM_REG_BAND_5_CHANNELS,

			EEPROM_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REG_BAND_52_HT40_CHANNELS

		},

	},

	.temperature = iwlagn_temperature,

};



static struct iwl_lib_ops iwl5150_lib = {

	.set_hw_params = iwl5150_hw_set_hw_params,

	.set_channel_switch = iwl5000_hw_channel_switch,

	.nic_config = iwl5000_nic_config,

	.eeprom_ops = {

		.regulatory_bands = {

			EEPROM_REG_BAND_1_CHANNELS,

			EEPROM_REG_BAND_2_CHANNELS,

			EEPROM_REG_BAND_3_CHANNELS,

			EEPROM_REG_BAND_4_CHANNELS,

			EEPROM_REG_BAND_5_CHANNELS,

			EEPROM_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REG_BAND_52_HT40_CHANNELS

		},

	},

	.temperature = iwl5150_temperature,

};



static const struct iwl_base_params iwl5000_base_params = {

	.eeprom_size = IWLAGN_EEPROM_IMG_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,
@@ -330,7 +69,6 @@ static const struct iwl_ht_params iwl5000_ht_params = { 
	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.eeprom_ver = EEPROM_5000_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_5000_TX_POWER_VERSION,	\

	.lib = &iwl5000_lib,					\

	.base_params = &iwl5000_base_params,			\

	.led_mode = IWL_LED_BLINK
@@ -376,7 +114,6 @@ const struct iwl_cfg iwl5350_agn_cfg = { 
	.max_data_size = IWLAGN_RTC_DATA_SIZE,

	.eeprom_ver = EEPROM_5050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,

	.lib = &iwl5000_lib,

	.base_params = &iwl5000_base_params,

	.ht_params = &iwl5000_ht_params,

	.led_mode = IWL_LED_BLINK,
@@ -392,7 +129,6 @@ const struct iwl_cfg iwl5350_agn_cfg = { 
	.max_data_size = IWLAGN_RTC_DATA_SIZE,			\

	.eeprom_ver = EEPROM_5050_EEPROM_VERSION,		\

	.eeprom_calib_ver = EEPROM_5050_TX_POWER_VERSION,	\

	.lib = &iwl5150_lib,					\

	.base_params = &iwl5000_base_params,			\

	.no_xtal_calib = true,					\

	.led_mode = IWL_LED_BLINK,				\

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

+2 −217

File changed.

Preview size limit exceeded, changes collapsed.