pull request: iwlwifi-next 2014-05-22

[Emmanuel Grumbach <egrumbach@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 2560 bytes --]

Hi John,

This pull request is intended for 3.16.

The regular amount of housekeeping here. I merged iwlwifi-fixes.git to be able to add the patch you didn't want in wireless.git at that stage of the -rc cycle.
Luca has a few preparations for CSA implementation and also what seems to be a bugfix for P2P but hasn't caused issues we could notice.

Please pull.

The following changes since commit af7c603eb476216f1c27d82b802f0ce879c54ab3:

  iwlwifi: fix LED support Kconfig dependencies (2014-05-15 19:56:18 +0300)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git for-john

for you to fetch changes up to 999609f1206a14039db534058b251c6d5ab39322:

  iwlwifi: mvm: remove vif argument from power_update_mac (2014-05-22 10:11:17 +0300)

----------------------------------------------------------------
Arik Nemtsov (1):
      iwlwifi: mvm: remove vif argument from power_update_mac

Avri Altman (2):
      iwlwifi: mvm: Remove redundant initialization
      iwlwifi: mvm: don't filter out the first beacon

Emmanuel Grumbach (6):
      iwlwifi: mvm: don't allow diversity if BT Coex / TT forbid it
      iwlwifi: mvm: disable beacon filtering
      Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
      iwlwifi: mvm: disable reduced Tx power when not applicable
      iwlwifi: mvm: remove debugfs hook for reduced tx power
      iwlwifi: mvm: make iwl_mvm_update_beacon_abort static

Luciano Coelho (4):
      iwlwifi: mvm: update power after phy_ctxt is NULL when unassigning chanctx
      iwlwifi: mvm: enable MAC_FILTER_IN_BEACON when forced_assoc_off is set
      iwlwifi: mvm: set the MAC_FILTER_IN_BEACON flag also for P2P
      iwlwifi: mvm: pass force_assoc_off all the way down to avoid hacks

 drivers/net/wireless/iwlwifi/mvm/coex.c        |  12 +-
 drivers/net/wireless/iwlwifi/mvm/d3.c          |   8 +-
 drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c |  44 +-----
 drivers/net/wireless/iwlwifi/mvm/mac-ctxt.c    |  26 ++--
 drivers/net/wireless/iwlwifi/mvm/mac80211.c    |  44 +++---
 drivers/net/wireless/iwlwifi/mvm/mvm.h         |  16 +-
 drivers/net/wireless/iwlwifi/mvm/phy-ctxt.c    |   3 +-
 drivers/net/wireless/iwlwifi/mvm/power.c       | 162 +++++++++-----------
 drivers/net/wireless/iwlwifi/mvm/scan.c        |   2 +-
 drivers/net/wireless/iwlwifi/mvm/sta.h         |   3 -
 drivers/net/wireless/iwlwifi/mvm/utils.c       |  51 ++++--
 11 files changed, 169 insertions(+), 202 deletions(-)


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 901 bytes --]