diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-03-09 09:16:35 +0100 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2012-04-16 14:34:44 -0700 |
| commit | 0479c19d9fd29eceb21111a3fe4a4a00b3037cf5 (patch) | |
| tree | 4278582c681983d2aea5d39be6e8d1d60746d805 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | 84965795b2908f2e0be929e71b5bf3b7c6ad5329 (diff) | |
| download | linux-0479c19d9fd29eceb21111a3fe4a4a00b3037cf5.tar.gz linux-0479c19d9fd29eceb21111a3fe4a4a00b3037cf5.tar.bz2 linux-0479c19d9fd29eceb21111a3fe4a4a00b3037cf5.zip | |
iwlwifi: remove uCode alternatives mechanism
We've never released firmware using the alternatives
mechanism and our build process makes that difficult
anyway. This means that in every file we have ever
built (except maybe by hand for testing) the listed
alternative was 0. Make the alternative field in the
TLVs part of the TLV number (thus expanding that to
32 bits); this gives us more TLV numbers (not really
needed) and more importantly protects against rogue
firmware files that actually do use the alternatives
mechanism -- those will now be rejected since they
don't contain any valid TLVs.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 6cea8a79bbe0..427f63c4fe3d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -2409,12 +2409,6 @@ MODULE_PARM_DESC(amsdu_size_8K, "enable 8K amsdu size"); 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(ucode_alternative, - iwlagn_mod_params.wanted_ucode_alternative, - int, S_IRUGO); -MODULE_PARM_DESC(ucode_alternative, - "specify ucode alternative to use from ucode file"); - module_param_named(antenna_coupling, iwlagn_mod_params.ant_coupling, int, S_IRUGO); MODULE_PARM_DESC(antenna_coupling, |