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

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-tx.c
parents 77b7023a 5ee0a58d

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

+3 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <net/mac80211.h>

#include <linux/etherdevice.h>

#include <asm/unaligned.h>

#include <linux/stringify.h>



#include "iwl-eeprom.h"

#include "iwl-dev.h"
@@ -53,10 +54,10 @@ 
#define IWL100_UCODE_API_MIN 5



#define IWL1000_FW_PRE "iwlwifi-1000-"

#define IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE #api ".ucode"

#define IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE __stringify(api) ".ucode"



#define IWL100_FW_PRE "iwlwifi-100-"

#define IWL100_MODULE_FIRMWARE(api) IWL100_FW_PRE #api ".ucode"

#define IWL100_MODULE_FIRMWARE(api) IWL100_FW_PRE __stringify(api) ".ucode"





/*

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

+4 −3
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <net/mac80211.h>

#include <linux/etherdevice.h>

#include <asm/unaligned.h>

#include <linux/stringify.h>



#include "iwl-eeprom.h"

#include "iwl-dev.h"
@@ -56,13 +57,13 @@ 
#define IWL105_UCODE_API_MIN 5



#define IWL2030_FW_PRE "iwlwifi-2030-"

#define IWL2030_MODULE_FIRMWARE(api) IWL2030_FW_PRE #api ".ucode"

#define IWL2030_MODULE_FIRMWARE(api) IWL2030_FW_PRE __stringify(api) ".ucode"



#define IWL2000_FW_PRE "iwlwifi-2000-"

#define IWL2000_MODULE_FIRMWARE(api) IWL2000_FW_PRE #api ".ucode"

#define IWL2000_MODULE_FIRMWARE(api) IWL2000_FW_PRE __stringify(api) ".ucode"



#define IWL105_FW_PRE "iwlwifi-105-"

#define IWL105_MODULE_FIRMWARE(api) IWL105_FW_PRE #api ".ucode"

#define IWL105_MODULE_FIRMWARE(api) IWL105_FW_PRE __stringify(api) ".ucode"



static void iwl2000_set_ct_threshold(struct iwl_priv *priv)

{

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

+3 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <net/mac80211.h>

#include <linux/etherdevice.h>

#include <asm/unaligned.h>

#include <linux/stringify.h>



#include "iwl-eeprom.h"

#include "iwl-dev.h"
@@ -55,10 +56,10 @@ 
#define IWL5150_UCODE_API_MIN 1



#define IWL5000_FW_PRE "iwlwifi-5000-"

#define IWL5000_MODULE_FIRMWARE(api) IWL5000_FW_PRE #api ".ucode"

#define IWL5000_MODULE_FIRMWARE(api) IWL5000_FW_PRE __stringify(api) ".ucode"



#define IWL5150_FW_PRE "iwlwifi-5150-"

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

#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)

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

+5 −4
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <net/mac80211.h>

#include <linux/etherdevice.h>

#include <asm/unaligned.h>

#include <linux/stringify.h>



#include "iwl-eeprom.h"

#include "iwl-dev.h"
@@ -56,16 +57,16 @@ 
#define IWL6000G2_UCODE_API_MIN 4



#define IWL6000_FW_PRE "iwlwifi-6000-"

#define IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE #api ".ucode"

#define IWL6000_MODULE_FIRMWARE(api) IWL6000_FW_PRE __stringify(api) ".ucode"



#define IWL6050_FW_PRE "iwlwifi-6050-"

#define IWL6050_MODULE_FIRMWARE(api) IWL6050_FW_PRE #api ".ucode"

#define IWL6050_MODULE_FIRMWARE(api) IWL6050_FW_PRE __stringify(api) ".ucode"



#define IWL6005_FW_PRE "iwlwifi-6000g2a-"

#define IWL6005_MODULE_FIRMWARE(api) IWL6005_FW_PRE #api ".ucode"

#define IWL6005_MODULE_FIRMWARE(api) IWL6005_FW_PRE __stringify(api) ".ucode"



#define IWL6030_FW_PRE "iwlwifi-6000g2b-"

#define IWL6030_MODULE_FIRMWARE(api) IWL6030_FW_PRE #api ".ucode"

#define IWL6030_MODULE_FIRMWARE(api) IWL6030_FW_PRE __stringify(api) ".ucode"



static void iwl6000_set_ct_threshold(struct iwl_priv *priv)

{

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

+2 −1
Original line number Diff line number Diff line
@@ -1704,6 +1704,7 @@ int iwl_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
	struct iwl_rxon_context *ctx = iwl_rxon_ctx_from_vif(vif);

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

	struct iwl_rxon_context *tmp;

	enum nl80211_iftype newviftype = newtype;

	u32 interface_modes;

	int err;
@@ -1759,7 +1760,7 @@ int iwl_mac_change_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 


	/* success */

	iwl_teardown_interface(priv, vif, true);

	vif->type = newtype;

	vif->type = newviftype;

	vif->p2p = newp2p;

	err = iwl_setup_interface(priv, ctx);

	WARN_ON(err);