aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Sternberg <jay.e.sternberg@linux.intel.com>2009-01-19 15:30:33 -0800
committerJohn W. Linville <linville@tuxdriver.com>2009-01-29 16:01:02 -0500
commitcec2d3f38c11f4c7e28ec2a065698653dbccfbb7 (patch)
tree6481a1795e4dbf23d66ea1e451984f248f7a6ec5
parentf82d8d9724b6054b63fb3a0108937064029b2c00 (diff)
downloadkernel_samsung_smdk4412-cec2d3f38c11f4c7e28ec2a065698653dbccfbb7.zip
kernel_samsung_smdk4412-cec2d3f38c11f4c7e28ec2a065698653dbccfbb7.tar.gz
kernel_samsung_smdk4412-cec2d3f38c11f4c7e28ec2a065698653dbccfbb7.tar.bz2
iwlwifi: remove static from 5000 structures
remove static from config structures which will be used by new hardware that is similar to 5000. This way the new devices can use them without the new structures having to be stored in the already overloaded iwl-5000.c file. Signed-off-by: Jay Sternberg <jay.e.sternberg@linux.intel.com> Signed-off-by: Reinette Chatre <reinette.chatre@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-5000.c4
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-dev.h4
2 files changed, 6 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-5000.c b/drivers/net/wireless/iwlwifi/iwl-5000.c
index a35af67..04c2585 100644
--- a/drivers/net/wireless/iwlwifi/iwl-5000.c
+++ b/drivers/net/wireless/iwlwifi/iwl-5000.c
@@ -1528,13 +1528,13 @@ static struct iwl_lib_ops iwl5000_lib = {
},
};
-static struct iwl_ops iwl5000_ops = {
+struct iwl_ops iwl5000_ops = {
.lib = &iwl5000_lib,
.hcmd = &iwl5000_hcmd,
.utils = &iwl5000_hcmd_utils,
};
-static struct iwl_mod_params iwl50_mod_params = {
+struct iwl_mod_params iwl50_mod_params = {
.num_of_queues = IWL50_NUM_QUEUES,
.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,
.amsdu_size_8K = 1,
diff --git a/drivers/net/wireless/iwlwifi/iwl-dev.h b/drivers/net/wireless/iwlwifi/iwl-dev.h
index 9dc6e3c..2602944 100644
--- a/drivers/net/wireless/iwlwifi/iwl-dev.h
+++ b/drivers/net/wireless/iwlwifi/iwl-dev.h
@@ -58,6 +58,10 @@ extern struct iwl_cfg iwl5100_bg_cfg;
extern struct iwl_cfg iwl5100_abg_cfg;
extern struct iwl_cfg iwl5150_agn_cfg;
+/* shared structures from iwl-5000.c */
+extern struct iwl_mod_params iwl50_mod_params;
+extern struct iwl_ops iwl5000_ops;
+
/* CT-KILL constants */
#define CT_KILL_THRESHOLD 110 /* in Celsius */