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 23:34:44 +0200 |
| commit | 0479c19d9fd29eceb21111a3fe4a4a00b3037cf5 (patch) | |
| tree | 4278582c681983d2aea5d39be6e8d1d60746d805 /drivers/net/wireless/iwlwifi/iwl-shared.h | |
| parent | iwlwifi: remove no_sleep_autoadjust (diff) | |
| download | linux-0479c19d9fd29eceb21111a3fe4a4a00b3037cf5.tar.xz 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-shared.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-shared.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h index 00543d90544c..8c962c1dee98 100644 --- a/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/drivers/net/wireless/iwlwifi/iwl-shared.h @@ -129,7 +129,6 @@ extern struct iwl_mod_params iwlagn_mod_params; * @debug_level: levels are IWL_DL_* * @ant_coupling: antenna coupling in dB, default = 0 * @bt_ch_announce: BT channel inhibition, default = enable - * @wanted_ucode_alternative: ucode alternative to use, default = 1 * @auto_agg: enable agg. without check, default = true */ struct iwl_mod_params { @@ -147,7 +146,6 @@ struct iwl_mod_params { u32 debug_level; int ant_coupling; bool bt_ch_announce; - int wanted_ucode_alternative; bool auto_agg; }; |