Преглед изворни кода

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>
Jay Sternberg пре 16 година
родитељ
комит
cec2d3f38c
2 измењених фајлова са 6 додато и 2 уклоњено
  1. 2 2
      drivers/net/wireless/iwlwifi/iwl-5000.c
  2. 4 0
      drivers/net/wireless/iwlwifi/iwl-dev.h

+ 2 - 2
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,
 	.lib = &iwl5000_lib,
 	.hcmd = &iwl5000_hcmd,
 	.hcmd = &iwl5000_hcmd,
 	.utils = &iwl5000_hcmd_utils,
 	.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_queues = IWL50_NUM_QUEUES,
 	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,
 	.num_of_ampdu_queues = IWL50_NUM_AMPDU_QUEUES,
 	.amsdu_size_8K = 1,
 	.amsdu_size_8K = 1,

+ 4 - 0
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 iwl5100_abg_cfg;
 extern struct iwl_cfg iwl5150_agn_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 */
 /* CT-KILL constants */
 #define CT_KILL_THRESHOLD	110 /* in Celsius */
 #define CT_KILL_THRESHOLD	110 /* in Celsius */