Hi Kalle, Here is a pull request for 4.1. Details in the tag. Note that this includes the patches that were pulled by davem. You may want to FF your tree before you pull my bits. The following changes since commit 190f1029757346b72f297729cf8e5c562f2e9d8c: iwlwifi: mvm: don't override passive dwell in case of fragmented scan (2015-03-02 08:20: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-03-12 for you to fetch changes up to 208d271a3f5388672b3d7ec141e975abd84ab3da: Merge branch 'iwlwifi-fixes' into iwlwifi-next (2015-03-12 14:38:26 +0200) ---------------------------------------------------------------- * Location Aware Regulatory was added by Arik * 8000 device family work * Update to the BT Coex firmware API ---------------------------------------------------------------- Andrei Otcheretianski (1): iwlwifi: mvm: Fix ROC removal Arik Nemtsov (12): iwlwifi: mvm: add MCC update FW API iwlwifi: mvm: init country code on init/recovery iwlwifi: create regdomain from mcc_update_cmd response iwlwifi: mvm: consider LAR support during NVM parse iwlwifi: ignore IBSS flag as regulatory NO-IR indication iwlwifi: mvm: LAR: Add chub mcc change notify command iwlwifi: nvm: init correct nvm channel list for 8000 devices iwlwifi: allow disabling LAR via module param iwlwifi: use correct NVM offset for LAR enable for new NVMs iwlwifi: mvm: reflect TDLS pm state in mvmvif->pm_enabled iwlwifi: don't allow the FW to return invalid ch indices iwlwifi: mvm: don't init MCC during CT-kill Eliad Peller (3): iwlwifi: don't declare support for 5ghz if not supported iwlwifi: use IWL_DEFAULT_MAX_TX_POWER for max_eirp iwlwifi: disable 11ac if 11n is disabled Emmanuel Grumbach (21): iwlwifi: fix max_ht_ampdu_exponent for older devices iwlwifi: mvm: BT Coex - fix a NULL pointer exception iwlwifi: mvm: fix compilation with IWLWIFI_DEBUGFS not set iwlwifi: dvm: drop VO packets when mac80211 tells us to iwlwifi: fix max_ht_ampdu_exponent for older devices iwlwifi: bump API to 13 for devices that use iwlmvm iwlwifi: mvm: remove IWL_UCODE_TLV_API_DISABLE_STA_TX iwlwifi: mvm: remove IWL_UCODE_TLV_API_SF_NO_DUMMY_NOTIF iwlwifi: mvm: BT Coex - disable RRC by default iwlwifi: mvm: always update the quota after association iwlwifi: pcie: speed up the Tx DMA stop flow iwlwifi: pcie: include more registers in the prph dump iwlwifi: fix smatch warning: warn: inconsistent indenting iwlwifi: mvm: remove unneeded include iwl-fw-error-dump.h iwlwifi: mvm: fix identation iwlwifi: pcie: allow the op_mode to freeze the stuck queue timer iwlwifi: mvm: freeze the non-shared queues when a station goes to sleep iwlwifi: mvm: fix force NMI for 8000 iwlwifi: mvm: BT Coex - update the new API iwlwifi: update copyright to include 2015 Merge branch 'iwlwifi-fixes' into iwlwifi-next Eran Harary (5): iwlwifi: mvm: support new PHY_SKU nvm section for family 8000 B0 iwlwifi: mvm: take the MAC address from HW registers iwlwifi: mvm: support family 8000 B2/C steps iwlwifi: trans: Take ownership on secure machine before FW load iwlwifi: mvm: Always enable the smart FIFO Eyal Shapira (4): iwlwifi: mvm: rs: fix BT Coex check to look at the correct ant iwlwifi: mvm: disable beamformer unless FW supports it iwlwifi: mvm: rs: improve ss_params debug print iwlwifi: mvm: rs: update Tx statistics when using fixed rate Johannes Berg (4): iwlwifi: mvm: disconnect if CSA time event fails scheduling iwlwifi: mvm: remove warning on station exhaustion iwlwifi: mvm: clarify time event end handling iwlwifi: mvm: simplify iwl_mvm_get_wakeup_status() return Jonathan Doron (2): iwlwifi: mvm: support LAR updates from BIOS iwlwifi: mvm: set LAR MCC on D3/D0 transitions Luciano Coelho (3): iwlwifi: mvm: call ieee80211_scan_completed() even if scan abort fails iwlwifi: mvm: don't try to stop scans that are not running anymore iwlwifi: mvm: don't double unlock the mutex in __iwl_mvm_resume() Matti Gottlieb (2): iwlwifi: change last 5ghz channel to 165 & add support for 8000 family iwlwifi: iwlmvm: LAR: disable LAR support due to NVM vs TLV conflict Oren Givon (2): iwlwifi: add new 8260 series PCI IDs iwlwifi: add more new 8260 series PCI IDs drivers/net/wireless/iwlwifi/dvm/mac80211.c | 17 ++++--- drivers/net/wireless/iwlwifi/dvm/rs.c | 7 +-- drivers/net/wireless/iwlwifi/dvm/tx.c | 6 +-- drivers/net/wireless/iwlwifi/iwl-1000.c | 6 ++- drivers/net/wireless/iwlwifi/iwl-2000.c | 13 +++-- drivers/net/wireless/iwlwifi/iwl-5000.c | 6 ++- drivers/net/wireless/iwlwifi/iwl-6000.c | 18 ++++--- drivers/net/wireless/iwlwifi/iwl-7000.c | 8 +-- drivers/net/wireless/iwlwifi/iwl-8000.c | 4 +- drivers/net/wireless/iwlwifi/iwl-debug.h | 2 + drivers/net/wireless/iwlwifi/iwl-drv.c | 22 ++++---- drivers/net/wireless/iwlwifi/iwl-drv.h | 2 +- drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h | 1 + drivers/net/wireless/iwlwifi/iwl-fw-file.h | 8 +-- drivers/net/wireless/iwlwifi/iwl-io.c | 2 + drivers/net/wireless/iwlwifi/iwl-modparams.h | 2 + drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 411 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------- drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | 19 ++++++- drivers/net/wireless/iwlwifi/iwl-prph.h | 27 ++++++++++ drivers/net/wireless/iwlwifi/iwl-trans.h | 15 ++++++ drivers/net/wireless/iwlwifi/mvm/coex.c | 223 +-------------------------------------------------------------------------------- drivers/net/wireless/iwlwifi/mvm/coex_legacy.c | 64 +++++++++++++++++++++++- drivers/net/wireless/iwlwifi/mvm/d3.c | 19 +++++-- drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 1 - drivers/net/wireless/iwlwifi/mvm/debugfs.c | 26 +++------- drivers/net/wireless/iwlwifi/mvm/fw-api-coex.h | 47 ----------------- drivers/net/wireless/iwlwifi/mvm/fw-api.h | 107 ++++++++++++++++++++++++++++++++++++++- drivers/net/wireless/iwlwifi/mvm/fw.c | 10 ++++ drivers/net/wireless/iwlwifi/mvm/mac80211.c | 220 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------- drivers/net/wireless/iwlwifi/mvm/mvm.h | 65 +++++++++++++++++++----- drivers/net/wireless/iwlwifi/mvm/nvm.c | 290 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- drivers/net/wireless/iwlwifi/mvm/ops.c | 11 ++-- drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c | 2 + drivers/net/wireless/iwlwifi/mvm/power.c | 6 ++- drivers/net/wireless/iwlwifi/mvm/quota.c | 3 +- drivers/net/wireless/iwlwifi/mvm/rs.c | 96 +++++++++++++++++++++++++++-------- drivers/net/wireless/iwlwifi/mvm/scan.c | 13 +++-- drivers/net/wireless/iwlwifi/mvm/sf.c | 67 +++++++++++++++++++++---- drivers/net/wireless/iwlwifi/mvm/sta.c | 5 +- drivers/net/wireless/iwlwifi/mvm/time-event.c | 31 +++++++----- drivers/net/wireless/iwlwifi/mvm/utils.c | 2 +- drivers/net/wireless/iwlwifi/pcie/drv.c | 27 +++++++++- drivers/net/wireless/iwlwifi/pcie/internal.h | 4 ++ drivers/net/wireless/iwlwifi/pcie/trans.c | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++----- drivers/net/wireless/iwlwifi/pcie/tx.c | 63 ++++++++++++++++------- 45 files changed, 1567 insertions(+), 588 deletions(-) ��.n��������+%������w��{.n�����{���zW����ܨ}���Ơz�j:+v�����w����ޙ��&�)ߡ�a����z�ޗ���ݢj��w�f
