diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2015-12-03 17:23:43 +0200 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2015-12-03 17:23:43 +0200 |
| commit | 2abcd3d40d2cae8d4698ba4b0f4d6c793dda6f8b (patch) | |
| tree | f66b28bb0c1853d65e4b37db1c49128845769f11 /drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | |
| parent | f1b4b51184109305e4e5b7a047faa5270a953ee8 (diff) | |
| parent | 863558168d55e992ad6999736e5115ee0268a762 (diff) | |
Merge tag 'iwlwifi-next-for-kalle-2015-12-01' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
* BT coex improvements (Avri, Moshe)
* D3 operation bugfixes (Luca, Eliad)
* Rate control improvements (Eyal)
* Firmware debugging infra improvements (Golan)
* Ground work for multi Rx (Johannes)
* Various security fixes (Johannes)
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c index acc3d186c5c1..b395854a94d9 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c @@ -26,7 +26,7 @@ * in the file called COPYING. * * Contact Information: - * Intel Linux Wireless <ilw@linux.intel.com> + * Intel Linux Wireless <linuxwifi@intel.com> * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497 * * BSD LICENSE @@ -766,7 +766,7 @@ void iwl_init_ht_hw_capab(const struct iwl_cfg *cfg, if (cfg->ht_params->ldpc) ht_info->cap |= IEEE80211_HT_CAP_LDPC_CODING; - if (iwlwifi_mod_params.amsdu_size_8K) + if (iwlwifi_mod_params.amsdu_size >= IWL_AMSDU_8K) ht_info->cap |= IEEE80211_HT_CAP_MAX_AMSDU; ht_info->ampdu_factor = cfg->max_ht_ampdu_exponent; |