pull request: iwlwifi 2014-05-21

pull request: iwlwifi 2014-05-21

[Emmanuel Grumbach]

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

Hi John,

A race has been discovered in the beacon filtering code. Since the fix is too big for 3.15, I disable here the feature.

Please pull, thanks.

The following changes since commit b538b8ce76f69f7fa225bc0817bbb361b877ea23:

  iwlwifi: mvm: prevent sched scan while not idle (2014-05-13 15:05:32 +0300)

are available in the git repository at:

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

for you to fetch changes up to 7bacc782270ff7db3b9f29fa5d24ad2ee1e8e81d:

  iwlwifi: mvm: disable beacon filtering (2014-05-21 12:45:34 +0300)

----------------------------------------------------------------
Emmanuel Grumbach (1):
      iwlwifi: mvm: disable beacon filtering

 drivers/net/wireless/iwlwifi/mvm/mac80211.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


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

[PATCH] iwlwifi: mvm: disable beacon filtering

[Emmanuel Grumbach]

From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

This feature has been causing trouble - disable it for now.

Cc: <stable@vger.kernel.org> [3.13+]
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
 drivers/net/wireless/iwlwifi/mvm/mac80211.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
index b41dc84..8735ef1 100644
--- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
@@ -826,7 +826,7 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,
 	if (ret)
 		goto out_remove_mac;
 
-	if (!mvm->bf_allowed_vif &&
+	if (!mvm->bf_allowed_vif && false &&
 	    vif->type == NL80211_IFTYPE_STATION && !vif->p2p &&
 	    mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_BF_UPDATED){
 		mvm->bf_allowed_vif = mvmvif;
-- 
1.8.3.2