diff options
| author | Kalle Valo <kvalo@codeaurora.org> | 2015-06-03 12:15:51 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@codeaurora.org> | 2015-06-03 12:15:51 +0300 |
| commit | 1690faef645ea8725fafdfe6451cf7828a676ad8 (patch) | |
| tree | 28c603dfe317c62d858e86cb6f80c8a98307d57d /drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | |
| parent | fa2ab6971844141add8d98a73a0a9679f9067bb5 (diff) | |
| parent | 5f4c02e2b8c9251c827abf87c4ead4496c67492a (diff) | |
| download | talos-obmc-linux-1690faef645ea8725fafdfe6451cf7828a676ad8.tar.gz talos-obmc-linux-1690faef645ea8725fafdfe6451cf7828a676ad8.zip | |
Merge tag 'iwlwifi-next-for-kalle-2015-06-03' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
* a few fixes (re-enablement of interrupts for certain new
platforms that have special power states)
* Rework completely the RBD allocation model towards new
multi RX hardware.
* cleanups
* scan reworks continuation (Luca)
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c index 41ff85de7334..21302b6f2bfd 100644 --- a/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c +++ b/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c @@ -6,6 +6,7 @@ * GPL LICENSE SUMMARY * * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved. + * Copyright(c) 2015 Intel Mobile Communications GmbH * * This program is free software; you can redistribute it and/or modify * it under the terms of version 2 of the GNU General Public License as @@ -31,6 +32,7 @@ * BSD LICENSE * * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved. + * Copyright(c) 2015 Intel Mobile Communications GmbH * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -748,6 +750,9 @@ void iwl_init_ht_hw_capab(const struct iwl_cfg *cfg, return; } + if (data->sku_cap_mimo_disabled) + rx_chains = 1; + ht_info->ht_supported = true; ht_info->cap = IEEE80211_HT_CAP_DSSSCCK40; |
