Hi John, This is a pull request intended for 3.15 release. Alex fixes the scan by disabling the fragmented scan. David prevents scan offload while associated, the firmware seems not to like it. I fix a stupid bug I made in BT Coex, and fix a bad #ifdef clause in rate scaling. Along with that there is a fix for a NULL pointer exception that can happen if we load the driver and our ISR gets called because the interrupt line is shared. The fix has been tested by the reporter. Please pull. The following changes since commit a6bc92803e7f765e02c923cf37c8e280e729642a: iwlwifi: mvm: BT Coex - fix Look Up Table (2014-04-13 16:51:07 +0300) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git master for you to fetch changes up to 83f7a85f1134c6e914453f5747435415a23d516b: iwlwifi: pcie: disable interrupts upon PCIe alloc (2014-05-07 22:54:32 +0300) ---------------------------------------------------------------- Alexander Bondar (1): iwlwifi: mvm: several fixes in scan David Spinadel (1): iwlwifi: mvm: do no sched scan while associated Emmanuel Grumbach (3): iwlwifi: mvm: BT Coex - fix validity flags during init iwlwifi: mvm: rs - s/CPTCFG/CONFIG iwlwifi: pcie: disable interrupts upon PCIe alloc drivers/net/wireless/iwlwifi/mvm/coex.c | 6 +++--- drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 8 ++++---- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 5 +++++ drivers/net/wireless/iwlwifi/mvm/mvm.h | 3 +++ drivers/net/wireless/iwlwifi/mvm/rs.c | 2 +- drivers/net/wireless/iwlwifi/mvm/scan.c | 53 ++++++++++++----------------------------------------- drivers/net/wireless/iwlwifi/mvm/utils.c | 19 +++++++++++++++++++ drivers/net/wireless/iwlwifi/pcie/trans.c | 10 ++++++---- 8 files changed, 53 insertions(+), 53 deletions(-)
Attachment:
signature.asc
Description: OpenPGP digital signature