aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c8
-rw-r--r--drivers/net/wireless/iwlwifi/iwl3945-base.c5
2 files changed, 7 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index e23c554b73a..e7dc8b92db6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -4296,9 +4296,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
4296 /* Disabling hardware scan means that mac80211 will perform scans 4296 /* Disabling hardware scan means that mac80211 will perform scans
4297 * "the hard way", rather than using device's scan. */ 4297 * "the hard way", rather than using device's scan. */
4298 if (cfg->mod_params->disable_hw_scan) { 4298 if (cfg->mod_params->disable_hw_scan) {
4299 if (iwl_debug_level & IWL_DL_INFO) 4299 dev_printk(KERN_DEBUG, &(pdev->dev),
4300 dev_printk(KERN_DEBUG, &(pdev->dev), 4300 "sw scan support is deprecated\n");
4301 "Disabling hw_scan\n");
4302 iwl_hw_ops.hw_scan = NULL; 4301 iwl_hw_ops.hw_scan = NULL;
4303 } 4302 }
4304 4303
@@ -4905,7 +4904,8 @@ module_param_named(fw_restart, iwlagn_mod_params.restart_fw, int, S_IRUGO);
4905MODULE_PARM_DESC(fw_restart, "restart firmware in case of error"); 4904MODULE_PARM_DESC(fw_restart, "restart firmware in case of error");
4906module_param_named( 4905module_param_named(
4907 disable_hw_scan, iwlagn_mod_params.disable_hw_scan, int, S_IRUGO); 4906 disable_hw_scan, iwlagn_mod_params.disable_hw_scan, int, S_IRUGO);
4908MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 0)"); 4907MODULE_PARM_DESC(disable_hw_scan,
4908 "disable hardware scanning (default 0) (deprecated)");
4909 4909
4910module_param_named(ucode_alternative, iwlagn_wanted_ucode_alternative, int, 4910module_param_named(ucode_alternative, iwlagn_wanted_ucode_alternative, int,
4911 S_IRUGO); 4911 S_IRUGO);
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index 116777122a7..8b6aa3d38db 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -3966,7 +3966,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
3966 * "the hard way", rather than using device's scan. 3966 * "the hard way", rather than using device's scan.
3967 */ 3967 */
3968 if (iwl3945_mod_params.disable_hw_scan) { 3968 if (iwl3945_mod_params.disable_hw_scan) {
3969 IWL_DEBUG_INFO(priv, "Disabling hw_scan\n"); 3969 IWL_ERR(priv, "sw scan support is deprecated\n");
3970 iwl3945_hw_ops.hw_scan = NULL; 3970 iwl3945_hw_ops.hw_scan = NULL;
3971 } 3971 }
3972 3972
@@ -4291,7 +4291,8 @@ MODULE_PARM_DESC(debug, "debug output mask");
4291#endif 4291#endif
4292module_param_named(disable_hw_scan, iwl3945_mod_params.disable_hw_scan, 4292module_param_named(disable_hw_scan, iwl3945_mod_params.disable_hw_scan,
4293 int, S_IRUGO); 4293 int, S_IRUGO);
4294MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 0)"); 4294MODULE_PARM_DESC(disable_hw_scan,
4295 "disable hardware scanning (default 0) (deprecated)");
4295module_param_named(fw_restart3945, iwl3945_mod_params.restart_fw, int, S_IRUGO); 4296module_param_named(fw_restart3945, iwl3945_mod_params.restart_fw, int, S_IRUGO);
4296MODULE_PARM_DESC(fw_restart3945, "restart firmware in case of error"); 4297MODULE_PARM_DESC(fw_restart3945, "restart firmware in case of error");
4297 4298