diff options
author | Stanislaw Gruszka <sgruszka@redhat.com> | 2011-03-14 09:15:06 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-03-29 15:45:14 -0400 |
commit | 3bda50e3eaf58a4b9c4ce34204e5faa15c8b1b97 (patch) | |
tree | de30eb6325daef159748858326e4dfe1853b84c2 /drivers/net/wireless | |
parent | 499fe9a419d43410be576bcc825658997b6ce822 (diff) |
iwl3945: do not deprecate software scan
Software scanning can be used for workaround some performance problems,
so do not deprecate it.
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Acked-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/iwlegacy/iwl3945-base.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/wireless/iwlegacy/iwl3945-base.c b/drivers/net/wireless/iwlegacy/iwl3945-base.c index ab87e1b73529..b6c52095bc1a 100644 --- a/drivers/net/wireless/iwlegacy/iwl3945-base.c +++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c | |||
@@ -3960,8 +3960,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e | |||
3960 | * "the hard way", rather than using device's scan. | 3960 | * "the hard way", rather than using device's scan. |
3961 | */ | 3961 | */ |
3962 | if (iwl3945_mod_params.disable_hw_scan) { | 3962 | if (iwl3945_mod_params.disable_hw_scan) { |
3963 | dev_printk(KERN_DEBUG, &(pdev->dev), | 3963 | IWL_DEBUG_INFO(priv, "Disabling hw_scan\n"); |
3964 | "sw scan support is deprecated\n"); | ||
3965 | iwl3945_hw_ops.hw_scan = NULL; | 3964 | iwl3945_hw_ops.hw_scan = NULL; |
3966 | } | 3965 | } |
3967 | 3966 | ||
@@ -4280,8 +4279,7 @@ MODULE_PARM_DESC(swcrypto, | |||
4280 | "using software crypto (default 1 [software])"); | 4279 | "using software crypto (default 1 [software])"); |
4281 | module_param_named(disable_hw_scan, iwl3945_mod_params.disable_hw_scan, | 4280 | module_param_named(disable_hw_scan, iwl3945_mod_params.disable_hw_scan, |
4282 | int, S_IRUGO); | 4281 | int, S_IRUGO); |
4283 | MODULE_PARM_DESC(disable_hw_scan, | 4282 | MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 0)"); |
4284 | "disable hardware scanning (default 0) (deprecated)"); | ||
4285 | #ifdef CONFIG_IWLWIFI_LEGACY_DEBUG | 4283 | #ifdef CONFIG_IWLWIFI_LEGACY_DEBUG |
4286 | module_param_named(debug, iwlegacy_debug_level, uint, S_IRUGO | S_IWUSR); | 4284 | module_param_named(debug, iwlegacy_debug_level, uint, S_IRUGO | S_IWUSR); |
4287 | MODULE_PARM_DESC(debug, "debug output mask"); | 4285 | MODULE_PARM_DESC(debug, "debug output mask"); |