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

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

Merge branch 'wireless-next-2.6' of... 

Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
parents 0521ecf3 89434421

drivers/net/wireless/iwlwifi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ iwlagn-objs += iwl-5000.o 
iwlagn-objs             += iwl-6000.o

iwlagn-objs             += iwl-1000.o

iwlagn-objs             += iwl-2000.o

iwlagn-objs             += iwl-pci.o



iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o

iwlagn-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o

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

+0 −4
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <linux/delay.h>

#include <linux/skbuff.h>

#include <linux/netdevice.h>
@@ -194,8 +192,6 @@ static struct iwl_lib_ops iwl1000_lib = { 
	.temp_ops = {

		.temperature = iwlagn_temperature,

	 },

	.txfifo_flush = iwlagn_txfifo_flush,

	.dev_txfifo_flush = iwlagn_dev_txfifo_flush,

};



static const struct iwl_ops iwl1000_ops = {

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

+1 −19
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <linux/delay.h>

#include <linux/skbuff.h>

#include <linux/netdevice.h>
@@ -76,21 +74,7 @@ static void iwl2000_set_ct_threshold(struct iwl_priv *priv) 
/* NIC configuration for 2000 series */

static void iwl2000_nic_config(struct iwl_priv *priv)

{

	u16 radio_cfg;



	radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);



	/* write radio config values to register */

	if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) <= EEPROM_RF_CONFIG_TYPE_MAX)

	iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,

			EEPROM_RF_CFG_TYPE_MSK(radio_cfg) |

			EEPROM_RF_CFG_STEP_MSK(radio_cfg) |

			EEPROM_RF_CFG_DASH_MSK(radio_cfg));



	/* set CSR_HW_CONFIG_REG for uCode use */

	iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,

		    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |

		    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);

	iwl_rf_config(priv);



	if (priv->cfg->iq_invert)

		iwl_set_bit(priv, CSR_GP_DRIVER_REG,
@@ -204,8 +188,6 @@ static struct iwl_lib_ops iwl2000_lib = { 
	.temp_ops = {

		.temperature = iwlagn_temperature,

	},

	.txfifo_flush = iwlagn_txfifo_flush,

	.dev_txfifo_flush = iwlagn_dev_txfifo_flush,

};



static const struct iwl_ops iwl2000_ops = {

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

+2 −21
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <linux/delay.h>

#include <linux/sched.h>

#include <linux/skbuff.h>
@@ -66,23 +64,10 @@ 
static void iwl5000_nic_config(struct iwl_priv *priv)

{

	unsigned long flags;

	u16 radio_cfg;



	spin_lock_irqsave(&priv->lock, flags);



	radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);

	iwl_rf_config(priv);



	/* write radio config values to register */

	if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) < EEPROM_RF_CONFIG_TYPE_MAX)

		iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,

			    EEPROM_RF_CFG_TYPE_MSK(radio_cfg) |

			    EEPROM_RF_CFG_STEP_MSK(radio_cfg) |

			    EEPROM_RF_CFG_DASH_MSK(radio_cfg));



	/* set CSR_HW_CONFIG_REG for uCode use */

	iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,

		    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |

		    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);

	spin_lock_irqsave(&priv->lock, flags);



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

	 * (PCIe power is lost before PERST# is asserted),
@@ -361,8 +346,6 @@ static struct iwl_lib_ops iwl5000_lib = { 
	.temp_ops = {

		.temperature = iwlagn_temperature,

	 },

	.txfifo_flush = iwlagn_txfifo_flush,

	.dev_txfifo_flush = iwlagn_dev_txfifo_flush,

};



static struct iwl_lib_ops iwl5150_lib = {
@@ -391,8 +374,6 @@ static struct iwl_lib_ops iwl5150_lib = { 
	.temp_ops = {

		.temperature = iwl5150_temperature,

	 },

	.txfifo_flush = iwlagn_txfifo_flush,

	.dev_txfifo_flush = iwlagn_dev_txfifo_flush,

};



static const struct iwl_ops iwl5000_ops = {

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

+1 −21
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ 
#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/pci.h>

#include <linux/dma-mapping.h>

#include <linux/delay.h>

#include <linux/skbuff.h>

#include <linux/netdevice.h>
@@ -97,21 +95,7 @@ static void iwl6150_additional_nic_config(struct iwl_priv *priv) 
/* NIC configuration for 6000 series */

static void iwl6000_nic_config(struct iwl_priv *priv)

{

	u16 radio_cfg;



	radio_cfg = iwl_eeprom_query16(priv, EEPROM_RADIO_CONFIG);



	/* write radio config values to register */

	if (EEPROM_RF_CFG_TYPE_MSK(radio_cfg) <= EEPROM_RF_CONFIG_TYPE_MAX)

		iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,

			    EEPROM_RF_CFG_TYPE_MSK(radio_cfg) |

			    EEPROM_RF_CFG_STEP_MSK(radio_cfg) |

			    EEPROM_RF_CFG_DASH_MSK(radio_cfg));



	/* set CSR_HW_CONFIG_REG for uCode use */

	iwl_set_bit(priv, CSR_HW_IF_CONFIG_REG,

		    CSR_HW_IF_CONFIG_REG_BIT_RADIO_SI |

		    CSR_HW_IF_CONFIG_REG_BIT_MAC_SI);

	iwl_rf_config(priv);



	/* no locking required for register write */

	if (priv->cfg->pa_type == IWL_PA_INTERNAL) {
@@ -301,8 +285,6 @@ static struct iwl_lib_ops iwl6000_lib = { 
	.temp_ops = {

		.temperature = iwlagn_temperature,

	 },

	.txfifo_flush = iwlagn_txfifo_flush,

	.dev_txfifo_flush = iwlagn_dev_txfifo_flush,

};



static struct iwl_lib_ops iwl6030_lib = {
@@ -333,8 +315,6 @@ static struct iwl_lib_ops iwl6030_lib = { 
	.temp_ops = {

		.temperature = iwlagn_temperature,

	 },

	.txfifo_flush = iwlagn_txfifo_flush,

	.dev_txfifo_flush = iwlagn_dev_txfifo_flush,

};



static struct iwl_nic_ops iwl6050_nic_ops = {