Hi Kalle, Here is my first pull request for 4.2. As usual, details in the tag. Please pull - thanks! The following changes since commit 6c373ca89399c5a3f7ef210ad8f63dc3437da345: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next (2015-04-15 09:00:47 -0700) 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-03 for you to fetch changes up to 05c3274d56ee783cb291a779ec2b369e9d172450: iwlwifi: mvm: include wildcard SSID in scans (2015-05-03 22:18:33 +0300) ---------------------------------------------------------------- * major rework of the scan code (Luca) * some work on the thermal code (Chaya Rachel) * some work on the firwmare debugging infrastructure ---------------------------------------------------------------- Alexander Bondar (1): iwlwifi: mvm: Avoid signal based decisions if ave beacon RSSI is 0 Arik Nemtsov (1): iwlwifi: mvm: iterate all interfaces during HW recovery cleanup Avraham Stern (1): iwlwifi: mvm: fix scan iteration complete notification handling Avri Altman (1): iwlwifi: mvm: fix Tx Power firmware API Chaya Rachel Ivgi (1): iwlwifi: mvm: make thermal throttling values configurable per NIC family David Spinadel (2): iwlwifi: mvm: remove deprecated command IDs iwlwifi: mvm: include wildcard SSID in scans Eliad Peller (1): iwlwifi: mvm: avoid use-after-free on iwl_mvm_d0i3_enable_tx() [BUGFIX] Emmanuel Grumbach (6): iwlwifi: mvm: don't stop the FW monitor too early iwlwifi: mvm: fix typo in CONFIG option Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next iwlwifi: mvm: allow scheduled scan for all the firmwares iwlwifi: clarify the device / firmware mapping in Kconfig iwlwifi: allow to limit the size of the external buffer for firmware debugging Eran Harary (1): iwlwifi: mvm: don't power off the device between INIT and OPER firmwares Eyal Shapira (1): iwlwifi: rs: cleanup last_txrate_idx Johannes Berg (2): iwlwifi: mvm: force quota update update after FW restart iwlwifi: mvm: don't reset key index on HW restart Liad Kaufman (4): iwlwifi: pcie: prevent using unmapped memory in fw monitor iwlwifi: rs: remove code duplication when filling lq cmd iwlwifi: pcie: support marbh fw dbg mode iwlwifi: rs: remove unneeded check of average tpt in window Luciano Coelho (28): iwlwifi: mvm: add scan parameters debugging info iwlwifi: mvm: don't increase max_out_time when low priority scan is requested iwlwifi: mvm: convert scan_status to a bitmap iwlwifi: mvm: don't wait for scan stopped work when cancelling scans iwlwifi: mvm: check if scan can be started before cancelling other scans iwlwifi: mvm: generalize the other-scan stopping code iwlwifi: mvm: rename unified_scan symbols to just scan iwlwifi: mvm: move scan code from mac80211.c to scan.c iwlwifi: mvm: differentiate net-detect from sched scan iwlwifi: mvm: some clean ups in fw-api-scan.h iwlwifi: mvm: always use iwl_mvm_scan_size to calculate the scan size iwlwifi: mvm: combine scan size checks into a common function iwlwifi: mvm: combine parts of UMAC and LMAC scans iwlwifi: mvm: combine parts of UMAC and LMAC sched scans iwlwifi: mvm: add common scan params to thw iwl_mvm_scan_params struct iwlwifi: mvm: combine ssid_bitmap setting for regular scans iwlwifi: mvm: revert order of SSIDs for sched scans iwlwifi: mvm: combine SSID functions for sched and regular scans iwlwifi: mvm: rename scan_calc_params to scan_calc_dwell iwlwifi: mvm: combine LMAC and UMAC preq generation iwlwifi: mvm: add number of scan iterations and multiplier to params iwlwifi: mvm: combine LMAC scans into one iwlwifi: mvm: trim sched scan delay down to 16-bit for LMAC as well iwlwifi: mvm: combine UMAC scans into one iwlwifi: mvm: move all UMAC scan flags setting into the relevant function iwlwifi: mvm: move all LMAC scan flags into a single funtion iwlwifi: mvm: rename generic_scan_cmd functions to dwell iwlwifi: mvm: remove some unused stuff from scan.c Matti Gottlieb (1): iwlwifi: mvm: ROC: Reduce the aux roc max delay drivers/net/wireless/iwlwifi/Kconfig | 12 +- drivers/net/wireless/iwlwifi/iwl-7000.c | 23 ++++ drivers/net/wireless/iwlwifi/iwl-config.h | 44 +++++++ drivers/net/wireless/iwlwifi/iwl-fw-file.h | 10 +- drivers/net/wireless/iwlwifi/iwl-prph.h | 3 + drivers/net/wireless/iwlwifi/iwl-trans.h | 41 ++++--- drivers/net/wireless/iwlwifi/mvm/d3.c | 9 +- drivers/net/wireless/iwlwifi/mvm/fw-api-power.h | 34 ++++++ drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 100 +++------------ drivers/net/wireless/iwlwifi/mvm/fw-api.h | 20 --- drivers/net/wireless/iwlwifi/mvm/fw.c | 69 ++++------- drivers/net/wireless/iwlwifi/mvm/mac80211.c | 183 +++++++++++----------------- drivers/net/wireless/iwlwifi/mvm/mvm.h | 110 ++++++----------- drivers/net/wireless/iwlwifi/mvm/ops.c | 19 ++- drivers/net/wireless/iwlwifi/mvm/rs.c | 20 +-- drivers/net/wireless/iwlwifi/mvm/rs.h | 2 - drivers/net/wireless/iwlwifi/mvm/rx.c | 5 + drivers/net/wireless/iwlwifi/mvm/scan.c | 990 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------- drivers/net/wireless/iwlwifi/mvm/tt.c | 40 ++---- drivers/net/wireless/iwlwifi/pcie/trans.c | 94 +++++++++++---- 20 files changed, 879 insertions(+), 949 deletions(-) ��.n��������+%������w��{.n�����{���zW����ܨ}���Ơz�j:+v�����w����ޙ��&�)ߡ�a����z�ޗ���ݢj��w�f
