diff options
-rw-r--r-- | drivers/net/wireless/iwmc3200wifi/main.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwmc3200wifi/main.c b/drivers/net/wireless/iwmc3200wifi/main.c index 0ffb04111a42..7f34d6dd3c41 100644 --- a/drivers/net/wireless/iwmc3200wifi/main.c +++ b/drivers/net/wireless/iwmc3200wifi/main.c | |||
@@ -68,7 +68,6 @@ static struct iwm_conf def_iwm_conf = { | |||
68 | .ct_kill_exit = 110, | 68 | .ct_kill_exit = 110, |
69 | .reset_on_fatal_err = 1, | 69 | .reset_on_fatal_err = 1, |
70 | .auto_connect = 1, | 70 | .auto_connect = 1, |
71 | .wimax_not_present = 0, | ||
72 | .enable_qos = 1, | 71 | .enable_qos = 1, |
73 | .mode = UMAC_MODE_BSS, | 72 | .mode = UMAC_MODE_BSS, |
74 | 73 | ||
@@ -94,6 +93,10 @@ static int modparam_reset; | |||
94 | module_param_named(reset, modparam_reset, bool, 0644); | 93 | module_param_named(reset, modparam_reset, bool, 0644); |
95 | MODULE_PARM_DESC(reset, "reset on firmware errors (default 0 [not reset])"); | 94 | MODULE_PARM_DESC(reset, "reset on firmware errors (default 0 [not reset])"); |
96 | 95 | ||
96 | static int modparam_wimax_enable = 1; | ||
97 | module_param_named(wimax_enable, modparam_wimax_enable, bool, 0644); | ||
98 | MODULE_PARM_DESC(wimax_enable, "Enable wimax core (default 1 [wimax enabled])"); | ||
99 | |||
97 | int iwm_mode_to_nl80211_iftype(int mode) | 100 | int iwm_mode_to_nl80211_iftype(int mode) |
98 | { | 101 | { |
99 | switch (mode) { | 102 | switch (mode) { |
@@ -486,7 +489,7 @@ static int iwm_config_boot_params(struct iwm_priv *iwm) | |||
486 | int ret; | 489 | int ret; |
487 | 490 | ||
488 | /* check Wimax is off and config debug monitor */ | 491 | /* check Wimax is off and config debug monitor */ |
489 | if (iwm->conf.wimax_not_present) { | 492 | if (!modparam_wimax_enable) { |
490 | u32 data1 = 0x1f; | 493 | u32 data1 = 0x1f; |
491 | u32 addr1 = 0x606BE258; | 494 | u32 addr1 = 0x606BE258; |
492 | 495 | ||