Hi Kalle, Here is another pull request for 3.20. Let me know if you have issues. Note that I had to merge iwlwifi-fixes because of dependencies and it also fixes a conflict. I merged mac80211-next because of a dependency on a patch there. Thanks! The following changes since commit c1e140bf79d817d4a7aa9932eb98b0359c87af33: mac80211: delete the assoc/auth timer upon suspend (2015-01-19 18:59:20 +0100) are available in the git repository at: https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git tags/iwlwifi-next-for-kalle-2015-01-22 for you to fetch changes up to 0b83795a110248db8f8e7c289a27b3b71b0bb35a: iwlwifi: mvm: fix rx chains configuration in phy ctxt cmd (2015-01-22 22:17:22 +0200) ---------------------------------------------------------------- * more work for new devices (4165 / 8260) * cleanups / improvemnts in rate control * fixes for TDLS * major statistics work from Johannes - more to come * improvements for the fw error dump infrastructure * usual amount of small fixes here and there (scan, D0i3 etc...) ---------------------------------------------------------------- Alexander Bondar (1): iwlwifi: mvm: Add debugfs entry to enable scan offload notification Arik Nemtsov (1): iwlwifi: pcie: correctly define 7265-D cfg David Spinadel (4): iwlwifi: mvm: add a flag to enable match found notification iwlwifi: mvm: scan dwell time corrections iwlwifi: mvm: fix EBS on single scan iwlwifi: mvm: scan dwell time corrections Emmanuel Grumbach (16): iwlwifi: 7000: fix reported firmware name for 7265D iwlwifi: bump firmware API for mvm devices to 12 iwlwifi: mvm: drop non VO frames when flushing iwlwifi: mvm: abort scheduled scan upon RFKILL iwlwifi: mvm: allow to collect debug data from non-sleepable context iwlwifi: mvm: rs: allow to disable MIMO for P2P only iwlwifi: remove unused TLV capability flags iwlwifi: mvm: let the firmware configure the scheduler iwlwifi: correctly set the NMI register Merge tag 'tags/mac80211-next-for-davem-2015-01-19' into iwlwifi-next Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next iwlwifi: mvm: BT Coex - fine tune the MPLUT register iwlwifi: mvm: add support for new LTR command Revert "iwlwifi: mvm: drop non VO frames when flushing" iwlwifi: mvm: BT Coex - set all the co-running values to 0 iwlwifi: mvm: really disable TDLS queues Eran Harary (3): iwlwifi: mvm: add print of he nvm version iwlwifi: mvm: support family 8000 C step iwlwifi: pcie: support secured boot flow for family 8000 B step Eyal Shapira (10): iwlwifi: mvm: fix Rx with both chains iwlwifi: mvm: fix out of bounds access to tid_to_mac80211_ac iwlwifi: mvm: set the tx cmd tid for BAR frame correctly iwlwifi: mvm: validate tid and sta_id in ba_notif iwlwifi: mvm: don't indicate no BA if STA was in powersave iwlwifi: mvm: rs: repeat initial legacy rates in LQ table iwlwifi: mvm: rs: cleanup unuseful and overflowing traces iwlwifi: mvm: rs: use STBC regardless of power save mode iwlwifi: mvm: rs: refactor ht/vht init iwlwifi: mvm: use a new API for enabling STBC Haim Dreyfuss (1): iwlwifi: mvm: set max_out_time equal to frag_passive_dwell in fragmented scan Ido Yariv (1): iwlwifi: mvm: add support for dumping a secondary SRAM Ilan Peer (1): iwlwifi: mvm: Do not consider invalid HW queues in queue mask Johannes Berg (7): iwlwifi: mvm: add debugfs file for misbehaving U-APSD AP iwlwifi: mvm: sync statistics firmware API iwlwifi: mvm: move statistics API to new header file iwlwifi: mvm: generate statistics debugfs code iwlwifi: mvm: move U-APSD decision to authentication iwlwifi: pcie: init ref_lock iwlwifi: mvm: rs: remove stats argument from functions John W. Linville (1): iwlwifi: mvm: document switch case fall-through in iwl_mvm_send_sta_key Liad Kaufman (4): iwlwifi: mvm: make sure state isn't in d0i3 when collecting fw dbg iwlwifi: mvm: make sure state isn't in d0i3 when stopping fw monitor iwlwifi: mvm: add rxf and txf to dump data iwlwifi: mvm: fix rx chains configuration in phy ctxt cmd Luciano Coelho (1): iwlwifi: mvm: ignore temperature updates in the RX statistics notification Oren Givon (1): iwlwifi: add new config and PCI IDs for 4165 series drivers/net/wireless/iwlwifi/dvm/main.c | 24 +--- drivers/net/wireless/iwlwifi/dvm/tt.c | 13 +- drivers/net/wireless/iwlwifi/iwl-7000.c | 29 +++- drivers/net/wireless/iwlwifi/iwl-8000.c | 33 ++++- drivers/net/wireless/iwlwifi/iwl-config.h | 15 +- drivers/net/wireless/iwlwifi/iwl-csr.h | 2 + drivers/net/wireless/iwlwifi/iwl-drv.c | 85 ++---------- drivers/net/wireless/iwlwifi/iwl-drv.h | 1 - drivers/net/wireless/iwlwifi/iwl-fh.h | 1 + drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h | 43 +++++- drivers/net/wireless/iwlwifi/iwl-fw-file.h | 22 ++- drivers/net/wireless/iwlwifi/iwl-fw.h | 4 + drivers/net/wireless/iwlwifi/iwl-io.c | 10 +- drivers/net/wireless/iwlwifi/iwl-modparams.h | 2 + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 6 + drivers/net/wireless/iwlwifi/iwl-prph.h | 26 +++- drivers/net/wireless/iwlwifi/iwl-trans.h | 21 +++ drivers/net/wireless/iwlwifi/mvm/coex.c | 20 +-- drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 20 +-- drivers/net/wireless/iwlwifi/mvm/constants.h | 33 ++++- drivers/net/wireless/iwlwifi/mvm/d3.c | 51 ++++++- drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 33 ++++- drivers/net/wireless/iwlwifi/mvm/debugfs.c | 247 ++++++++++++++++++++------------ drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 20 ++- drivers/net/wireless/iwlwifi/mvm/fw-api-rs.h | 15 +- drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 9 +- drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h | 277 ++++++++++++++++++++++++++++++++++++ drivers/net/wireless/iwlwifi/mvm/fw-api-tx.h | 39 ++++++ drivers/net/wireless/iwlwifi/mvm/fw-api.h | 301 +++++---------------------------------- drivers/net/wireless/iwlwifi/mvm/fw.c | 116 ++++++++++++++-- drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c | 14 +- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 340 ++++++++++++++++++++++++++++++++++++++------- drivers/net/wireless/iwlwifi/mvm/mvm.h | 67 ++++++++- drivers/net/wireless/iwlwifi/mvm/nvm.c | 4 +- drivers/net/wireless/iwlwifi/mvm/ops.c | 55 +++++--- drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 4 +- drivers/net/wireless/iwlwifi/mvm/rs.c | 340 ++++++++++++++++++++++++--------------------- drivers/net/wireless/iwlwifi/mvm/rs.h | 39 ------ drivers/net/wireless/iwlwifi/mvm/rx.c | 10 +- drivers/net/wireless/iwlwifi/mvm/scan.c | 116 ++++++++++++---- drivers/net/wireless/iwlwifi/mvm/sta.c | 29 ++-- drivers/net/wireless/iwlwifi/mvm/tt.c | 7 +- drivers/net/wireless/iwlwifi/mvm/tx.c | 31 ++++- drivers/net/wireless/iwlwifi/mvm/utils.c | 75 +++++----- drivers/net/wireless/iwlwifi/pcie/drv.c | 10 +- drivers/net/wireless/iwlwifi/pcie/internal.h | 8 ++ drivers/net/wireless/iwlwifi/pcie/trans.c | 90 ++++++++++-- drivers/net/wireless/iwlwifi/pcie/tx.c | 48 +++++-- 48 files changed, 1887 insertions(+), 918 deletions(-) create mode 100644 drivers/net/wireless/iwlwifi/mvm/fw-api-stats.h ��.n��������+%������w��{.n�����{���zW����ܨ}���Ơz�j:+v�����w����ޙ��&�)ߡ�a����z�ޗ���ݢj��w�f
