iwlwifi: remove static from 5000 structures
authorJay Sternberg <jay.e.sternberg@linux.intel.com>
Mon, 19 Jan 2009 23:30:33 +0000 (15:30 -0800)
committerJohn W. Linville <linville@tuxdriver.com>
Thu, 29 Jan 2009 21:01:02 +0000 (16:01 -0500)
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>
drivers/net/wireless/iwlwifi/iwl-5000.c
drivers/net/wireless/iwlwifi/iwl-dev.h

index a35af671f850ebcfa3a8dc505337c41f789d8e48..04c2585a6341f7c8806aff7e93f515e9897331a1 100644 (file)
@@ -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,
index 9dc6e3cc247e3f95db13623ef201eb6820ae5dd6..2602944a08a3ad75e828adcf66d6d11419600bc0 100644 (file)
@@ -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 */