Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72645eff authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlwifi: schedule to deprecate software scan support 



Hardware scan is the prefer method for all iwlwifi devices;
especially for dual-mode functions. Schedule to deprecate the
software scan support in kernel 2.6.40

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 46bf6958

Documentation/feature-removal-schedule.txt

+10 −0
Original line number Diff line number Diff line
@@ -563,3 +563,13 @@ Why: superseded by acpi_sleep=nonvs 
Who:	Rafael J. Wysocki <rjw@sisk.pl>



----------------------------



What:	iwlwifi disable_hw_scan module parameters

When:	2.6.40

Why:	Hareware scan is the prefer method for iwlwifi devices for

	scanning operation. Remove software scan support for all the

	iwlwifi devices.



Who:	Wey-Yi Guy <wey-yi.w.guy@intel.com>



----------------------------

drivers/net/wireless/iwlwifi/iwl-agn.c

+4 −4
Original line number Diff line number Diff line
@@ -4296,9 +4296,8 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* Disabling hardware scan means that mac80211 will perform scans

	 * "the hard way", rather than using device's scan. */

	if (cfg->mod_params->disable_hw_scan) {

		if (iwl_debug_level & IWL_DL_INFO)

		dev_printk(KERN_DEBUG, &(pdev->dev),

				   "Disabling hw_scan\n");

			"sw scan support is deprecated\n");

		iwl_hw_ops.hw_scan = NULL;

	}
@@ -4905,7 +4904,8 @@ module_param_named(fw_restart, iwlagn_mod_params.restart_fw, int, S_IRUGO); 
MODULE_PARM_DESC(fw_restart, "restart firmware in case of error");

module_param_named(

	disable_hw_scan, iwlagn_mod_params.disable_hw_scan, int, S_IRUGO);

MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 0)");

MODULE_PARM_DESC(disable_hw_scan,

		 "disable hardware scanning (default 0) (deprecated)");



module_param_named(ucode_alternative, iwlagn_wanted_ucode_alternative, int,

		   S_IRUGO);

drivers/net/wireless/iwlwifi/iwl3945-base.c

+3 −2
Original line number Diff line number Diff line
@@ -3966,7 +3966,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e 
	 * "the hard way", rather than using device's scan.

	 */

	if (iwl3945_mod_params.disable_hw_scan) {

		IWL_DEBUG_INFO(priv, "Disabling hw_scan\n");

		IWL_ERR(priv, "sw scan support is deprecated\n");

		iwl3945_hw_ops.hw_scan = NULL;

	}
@@ -4291,7 +4291,8 @@ MODULE_PARM_DESC(debug, "debug output mask"); 
#endif

module_param_named(disable_hw_scan, iwl3945_mod_params.disable_hw_scan,

		   int, S_IRUGO);

MODULE_PARM_DESC(disable_hw_scan, "disable hardware scanning (default 0)");

MODULE_PARM_DESC(disable_hw_scan,

		 "disable hardware scanning (default 0) (deprecated)");

module_param_named(fw_restart3945, iwl3945_mod_params.restart_fw, int, S_IRUGO);

MODULE_PARM_DESC(fw_restart3945, "restart firmware in case of error");