Commit 44c866a0 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 34a0a202 f212b43c

drivers/net/wireless/iwlwifi/Makefile

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

obj-$(CONFIG_IWLAGN)	+= iwlagn.o

iwlagn-objs		:= iwl-agn.o iwl-agn-rs.o iwl-agn-led.o

iwlagn-objs		:= iwl-agn.o iwl-agn-rs.o

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

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

iwlagn-objs		+= iwl-agn-tt.o iwl-agn-sta.o iwl-agn-eeprom.o

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

+1 −10
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#include "iwl-agn.h"

#include "iwl-helpers.h"

#include "iwl-agn-hw.h"

#include "iwl-agn-led.h"

#include "iwl-agn-debugfs.h"



/* Highest firmware API version supported */
@@ -196,7 +195,7 @@ static struct iwl_lib_ops iwl1000_lib = { 
			EEPROM_REG_BAND_4_CHANNELS,

			EEPROM_REG_BAND_5_CHANNELS,

			EEPROM_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REG_BAND_52_HT40_CHANNELS

			EEPROM_REGULATORY_BAND_NO_HT40,

		},

		.acquire_semaphore = iwlcore_eeprom_acquire_semaphore,

		.release_semaphore = iwlcore_eeprom_release_semaphore,
@@ -215,19 +214,12 @@ static struct iwl_lib_ops iwl1000_lib = { 
	},

	.txfifo_flush = iwlagn_txfifo_flush,

	.dev_txfifo_flush = iwlagn_dev_txfifo_flush,

	.tt_ops = {

		.lower_power_detection = iwl_tt_is_low_power_state,

		.tt_power_mode = iwl_tt_current_power_mode,

		.ct_kill_check = iwl_check_for_ct_kill,

	}

};



static const struct iwl_ops iwl1000_ops = {

	.lib = &iwl1000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static struct iwl_base_params iwl1000_base_params = {
@@ -244,7 +236,6 @@ static struct iwl_base_params iwl1000_base_params = { 
	.chain_noise_scale = 1000,

	.wd_timeout = IWL_DEF_WD_TIMEOUT,

	.max_event_log_size = 128,

	.ucode_tracing = true,

};

static struct iwl_ht_params iwl1000_ht_params = {

	.ht_greenfield_support = true,

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

+1 −17
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include "iwl-helpers.h"

#include "iwl-agn-hw.h"

#include "iwl-6000-hw.h"

#include "iwl-agn-led.h"

#include "iwl-agn-debugfs.h"



/* Highest firmware API version supported */
@@ -279,7 +278,7 @@ static struct iwl_lib_ops iwl2000_lib = { 
			EEPROM_REG_BAND_4_CHANNELS,

			EEPROM_REG_BAND_5_CHANNELS,

			EEPROM_6000_REG_BAND_24_HT40_CHANNELS,

			EEPROM_REG_BAND_52_HT40_CHANNELS

			EEPROM_REGULATORY_BAND_NO_HT40,

		},

		.acquire_semaphore = iwlcore_eeprom_acquire_semaphore,

		.release_semaphore = iwlcore_eeprom_release_semaphore,
@@ -299,43 +298,30 @@ static struct iwl_lib_ops iwl2000_lib = { 
	},

	.txfifo_flush = iwlagn_txfifo_flush,

	.dev_txfifo_flush = iwlagn_dev_txfifo_flush,

	.tt_ops = {

		.lower_power_detection = iwl_tt_is_low_power_state,

		.tt_power_mode = iwl_tt_current_power_mode,

		.ct_kill_check = iwl_check_for_ct_kill,

	}

};



static const struct iwl_ops iwl2000_ops = {

	.lib = &iwl2000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static const struct iwl_ops iwl2030_ops = {

	.lib = &iwl2000_lib,

	.hcmd = &iwlagn_bt_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static const struct iwl_ops iwl200_ops = {

	.lib = &iwl2000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static const struct iwl_ops iwl230_ops = {

	.lib = &iwl2000_lib,

	.hcmd = &iwlagn_bt_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static struct iwl_base_params iwl2000_base_params = {
@@ -353,7 +339,6 @@ static struct iwl_base_params iwl2000_base_params = { 
	.chain_noise_scale = 1000,

	.wd_timeout = IWL_DEF_WD_TIMEOUT,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.shadow_reg_enable = true,

};
@@ -373,7 +358,6 @@ static struct iwl_base_params iwl2030_base_params = { 
	.chain_noise_scale = 1000,

	.wd_timeout = IWL_LONG_WD_TIMEOUT,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.shadow_reg_enable = true,

};

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

+0 −16
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#include "iwl-sta.h"

#include "iwl-helpers.h"

#include "iwl-agn.h"

#include "iwl-agn-led.h"

#include "iwl-agn-hw.h"

#include "iwl-5000-hw.h"

#include "iwl-agn-debugfs.h"
@@ -384,11 +383,6 @@ static struct iwl_lib_ops iwl5000_lib = { 
	},

	.txfifo_flush = iwlagn_txfifo_flush,

	.dev_txfifo_flush = iwlagn_dev_txfifo_flush,

	.tt_ops = {

		.lower_power_detection = iwl_tt_is_low_power_state,

		.tt_power_mode = iwl_tt_current_power_mode,

		.ct_kill_check = iwl_check_for_ct_kill,

	}

};



static struct iwl_lib_ops iwl5150_lib = {
@@ -436,27 +430,18 @@ static struct iwl_lib_ops iwl5150_lib = { 
	},

	.txfifo_flush = iwlagn_txfifo_flush,

	.dev_txfifo_flush = iwlagn_dev_txfifo_flush,

	.tt_ops = {

		.lower_power_detection = iwl_tt_is_low_power_state,

		.tt_power_mode = iwl_tt_current_power_mode,

		.ct_kill_check = iwl_check_for_ct_kill,

	}

};



static const struct iwl_ops iwl5000_ops = {

	.lib = &iwl5000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static const struct iwl_ops iwl5150_ops = {

	.lib = &iwl5150_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static struct iwl_base_params iwl5000_base_params = {
@@ -470,7 +455,6 @@ static struct iwl_base_params iwl5000_base_params = { 
	.chain_noise_scale = 1000,

	.wd_timeout = IWL_LONG_WD_TIMEOUT,

	.max_event_log_size = 512,

	.ucode_tracing = true,

};

static struct iwl_ht_params iwl5000_ht_params = {

	.ht_greenfield_support = true,

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

+0 −22
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
#include "iwl-helpers.h"

#include "iwl-agn-hw.h"

#include "iwl-6000-hw.h"

#include "iwl-agn-led.h"

#include "iwl-agn-debugfs.h"



/* Highest firmware API version supported */
@@ -324,11 +323,6 @@ static struct iwl_lib_ops iwl6000_lib = { 
	},

	.txfifo_flush = iwlagn_txfifo_flush,

	.dev_txfifo_flush = iwlagn_dev_txfifo_flush,

	.tt_ops = {

		.lower_power_detection = iwl_tt_is_low_power_state,

		.tt_power_mode = iwl_tt_current_power_mode,

		.ct_kill_check = iwl_check_for_ct_kill,

	}

};



static struct iwl_lib_ops iwl6030_lib = {
@@ -378,11 +372,6 @@ static struct iwl_lib_ops iwl6030_lib = { 
	},

	.txfifo_flush = iwlagn_txfifo_flush,

	.dev_txfifo_flush = iwlagn_dev_txfifo_flush,

	.tt_ops = {

		.lower_power_detection = iwl_tt_is_low_power_state,

		.tt_power_mode = iwl_tt_current_power_mode,

		.ct_kill_check = iwl_check_for_ct_kill,

	}

};



static struct iwl_nic_ops iwl6050_nic_ops = {
@@ -397,34 +386,26 @@ static const struct iwl_ops iwl6000_ops = { 
	.lib = &iwl6000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static const struct iwl_ops iwl6050_ops = {

	.lib = &iwl6000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.nic = &iwl6050_nic_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static const struct iwl_ops iwl6150_ops = {

	.lib = &iwl6000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.nic = &iwl6150_nic_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static const struct iwl_ops iwl6030_ops = {

	.lib = &iwl6030_lib,

	.hcmd = &iwlagn_bt_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.ieee80211_ops = &iwlagn_hw_ops,

};



static struct iwl_base_params iwl6000_base_params = {
@@ -442,7 +423,6 @@ static struct iwl_base_params iwl6000_base_params = { 
	.chain_noise_scale = 1000,

	.wd_timeout = IWL_DEF_WD_TIMEOUT,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.shadow_reg_enable = true,

};
@@ -461,7 +441,6 @@ static struct iwl_base_params iwl6050_base_params = { 
	.chain_noise_scale = 1500,

	.wd_timeout = IWL_DEF_WD_TIMEOUT,

	.max_event_log_size = 1024,

	.ucode_tracing = true,

	.shadow_reg_enable = true,

};

static struct iwl_base_params iwl6000_g2_base_params = {
@@ -479,7 +458,6 @@ static struct iwl_base_params iwl6000_g2_base_params = { 
	.chain_noise_scale = 1000,

	.wd_timeout = IWL_LONG_WD_TIMEOUT,

	.max_event_log_size = 512,

	.ucode_tracing = true,

	.shadow_reg_enable = true,

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE