Hi John,
This is a pull request for 3.13.
I have here a few fixes for BT Coex. One of them is a NULL pointer
dereference. Another one avoids to enable a feature that can make the
firmware unhappy since the firmware isn't ready for it yet. WE also
avoid a WARNING that can be triggered upon association in not-so-bad
cases even if the association succeeded. We add support for new NICs
(not yet on the market) and bump the API so that 3.13 will be able to
work with the new firmware that will be out soon hopefully.
I also have a boundary check from Johannes.
I reset my tree to wireless/master as the time of this writing. I did
that mainly because I needed the changes that were in -next before 3.12
went out even if 3.13-rc1 isn't out yet. I plan to rebase my tree on
3.13-rc2 (or 3.13-rc1 if this pull request makes it to 3.13-rc1 but that
seems unlikely).
Tell me if you have any issues.
The following changes since commit 3b1bace9960b0acbcb5d0ca194077f03df7cc2c0:
brcmfmac: fix possible memory leak (2013-11-18 15:13:01 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-fixes.git
for-john
for you to fetch changes up to 8c5ec2eb4a10c588969e6a67239bcabd9a2bf04f:
iwlwifi: bump required firmware API version for 3160/7260 (2013-11-19
22:32:56 +0200)
----------------------------------------------------------------
Emmanuel Grumbach (5):
iwlwifi: pcie: refactor a bit the interrupt coalescing
iwlwifi: mvm: BT Coex - don't enable MULTI_PRIO_LUT
iwlwifi: mvm: BT Coex fix another NULL pointer dereference
iwlwifi: mvm: don't WARN about unsuccessful time event
iwlwifi: bump required firmware API version for 3160/7260
Johannes Berg (1):
iwlwifi: mvm: check sta_id/drain values in debugfs
Oren Givon (1):
iwlwifi: add new HW - 7265 series
drivers/net/wireless/iwlwifi/iwl-7000.c | 29
+++++++++++++++++++++++--
drivers/net/wireless/iwlwifi/iwl-config.h | 5 +++++
drivers/net/wireless/iwlwifi/iwl-csr.h | 5 +----
drivers/net/wireless/iwlwifi/mvm/bt-coex.c | 6 ++++-
drivers/net/wireless/iwlwifi/mvm/debugfs.c | 4 ++++
drivers/net/wireless/iwlwifi/mvm/time-event.c | 7 ++++--
drivers/net/wireless/iwlwifi/pcie/drv.c | 22 +++++++++++++++++++
drivers/net/wireless/iwlwifi/pcie/rx.c | 4 ++++
drivers/net/wireless/iwlwifi/pcie/trans.c | 3 ---
9 files changed, 73 insertions(+), 12 deletions(-)
Attachment:
signature.asc
Description: OpenPGP digital signature
