Hi Kalle, this is the same pull request for 4.2 with the typo fixed and without the patches that are now targeted to 4.1 Thanks The following changes since commit bbbe8c8c596b3784a2ed08772900e827f8ba72c5: mac80211: add missing documentation for rate_ctrl_lock (2015-05-06 16:00:32 +0200) 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-05-28 for you to fetch changes up to 8b2b9fbf7e4e1b2e866239d46248431f719ba2c1: iwlwifi: mvm: clean interfaces on drv_stop (2015-05-28 13:36:54 +0300) ---------------------------------------------------------------- Andrei Otcheretianski (1): iwlwifi: mvm: Configure agg. queue before assigning it to STA Arik Nemtsov (1): iwlwifi: mvm: clean interfaces on drv_stop Avraham Stern (3): iwlwifi: mvm: print scanned channel list on scan iteration complete notification iwlwifi: mvm: add UMAC scan iteration complete notification iwlwifi: mvm: add support for 8 level scan priority API Avri Altman (2): iwlwifi: pcie: don't disable the busmaster DMA clock for family 8000 iwlwifi: pcie: Remove redundant check for family type Eliad Peller (3): iwlwifi: mvm: avoid use-after-free on iwl_mvm_d0i3_enable_tx() iwlwifi: mvm: fix ROC reference accounting iwlwifi: tracing: add rx cmd header fields Emmanuel Grumbach (12): iwlwifi: mvm: forbid MIMO on devices that don't support it iwlwifi: 7000: modify the firmware name for 3165 iwlwifi: mvm: fix MLME trigger iwlwifi: mvm: BT Coex - duplicate the command if sent ASYNC Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next iwlwifi: bump API to 14 iwlwifi: pcie: simplify return value iwlwifi: mvm: BT Coex - remove useless code iwlwifi: mvm: BT Coex - allocate a short command on the stack iwlwifi: mvm: BT Coex - fix shared antenna check with new API Merge tag 'mac80211-next-for-davem-2015-05-06' into iwlwifi-next iwlwifi: mvm: implement the BlockAck related debug triggers Eran Harary (1): iwlwifi: 8000: fallback to default NVM file Haim Dreyfuss (1): iwlwifi: mvm: Free fw_status after use to avoid memory leak Ido Yariv (1): iwlwifi: update thermal throttling values for 8000 devices Johannes Berg (3): iwlwifi: refactor common transport alloc/init code iwlwifi: mvm: advertise randomised netdetect MAC address iwlwifi: mvm: handle device start failure correctly Liad Kaufman (1): iwlwifi: nvm: force mac from otp in case nvm mac is reserved Luciano Coelho (18): iwlwifi: mvm: take the UCODE_DOWN reference when resuming iwlwifi: mvm: clean net-detect info if device was reset during suspend iwlwifi: pcie: don't call set_pwr functions for family 8000 iwlwifi: mvm: small fix in a comment about UMAC scan schedules iwlwifi: mvm: remove the UMAC specific scan types iwlwifi: mvm: fix the net-detect SSIDs report order iwlwifi: mvm: make iwl_mvm_config_sched_scan_profiles() static iwlwifi: mvm: reorganize scan stopping functions iwlwifi: mvm: don't stop regular scans when going out of idle state iwlwifi: mvm: combine part of the scan stop flows iwlwifi: mvm: rename umac scan stop function iwlwifi: mvm: rename some LMAC-specific scan functions iwlwifi: mvm: refactor UMAC scan UID handling iwlwifi: mvm: remove code that stops multiple UMAC scans of a type iwlwifi: mvm: combine UMAC and LMAC scan_stop functions iwlwifi: mvm: combine regular and sched scan stop functions iwlwifi: mvm: make UMAC scans use the stopping scan status iwlwifi: mvm: treat scan races also on UMAC scans Matti Gottlieb (1): iwlwifi: mvm: Add debugfs entry for Tx power limit Nicholas Krause (1): iwlwifi: Remove use of the deprecacted PTR_RET drivers/net/wireless/iwlwifi/Kconfig | 13 +- drivers/net/wireless/iwlwifi/Makefile | 1 + drivers/net/wireless/iwlwifi/iwl-7000.c | 41 ++++- drivers/net/wireless/iwlwifi/iwl-8000.c | 70 +++++--- drivers/net/wireless/iwlwifi/iwl-config.h | 44 +++++ drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h | 15 +- drivers/net/wireless/iwlwifi/iwl-drv.c | 6 +- drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c | 5 + drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | 3 + drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h | 6 +- drivers/net/wireless/iwlwifi/iwl-fw-file.h | 40 ++++- drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 30 +++- drivers/net/wireless/iwlwifi/iwl-prph.h | 3 + drivers/net/wireless/iwlwifi/iwl-trans.c | 113 ++++++++++++ drivers/net/wireless/iwlwifi/iwl-trans.h | 61 ++++--- drivers/net/wireless/iwlwifi/mvm/coex.c | 81 ++------- drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 2 +- drivers/net/wireless/iwlwifi/mvm/d3.c | 43 +++-- drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 21 ++- drivers/net/wireless/iwlwifi/mvm/debugfs.c | 5 +- drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 34 ++++ drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 134 ++++++-------- drivers/net/wireless/iwlwifi/mvm/fw-api.h | 25 +-- drivers/net/wireless/iwlwifi/mvm/fw.c | 67 +++---- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 364 +++++++++++++++++++++++--------------- drivers/net/wireless/iwlwifi/mvm/mvm.h | 140 ++++++--------- drivers/net/wireless/iwlwifi/mvm/nvm.c | 8 +- drivers/net/wireless/iwlwifi/mvm/ops.c | 45 +++-- drivers/net/wireless/iwlwifi/mvm/rs.c | 23 +-- drivers/net/wireless/iwlwifi/mvm/rs.h | 2 - drivers/net/wireless/iwlwifi/mvm/rx.c | 5 + drivers/net/wireless/iwlwifi/mvm/scan.c | 1370 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------- drivers/net/wireless/iwlwifi/mvm/sta.c | 14 +- drivers/net/wireless/iwlwifi/mvm/time-event.c | 15 +- drivers/net/wireless/iwlwifi/mvm/tt.c | 40 +---- drivers/net/wireless/iwlwifi/mvm/tx.c | 31 +++- drivers/net/wireless/iwlwifi/pcie/trans.c | 156 +++++++++-------- drivers/net/wireless/iwlwifi/pcie/tx.c | 2 - 38 files changed, 1618 insertions(+), 1460 deletions(-) create mode 100644 drivers/net/wireless/iwlwifi/iwl-trans.c ��.n��������+%������w��{.n�����{���zW����ܨ}���Ơz�j:+v�����w����ޙ��&�)ߡ�a����z�ޗ���ݢj��w�f
