3.14-stable patches

added patches:

diff --git a/queue-3.14/iwlwifi-mvm-change-beacon-filter-enablement-condition.patch b/queue-3.14/iwlwifi-mvm-change-beacon-filter-enablement-condition.patch
deleted file mode 100644 (file)
index 6d013fd..0000000
--- a/queue-3.14/iwlwifi-mvm-change-beacon-filter-enablement-condition.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From c63722cfd441bd3a99c65fa4c40bc65d7776e772 Mon Sep 17 00:00:00 2001
-From: Alexander Bondar <alexander.bondar@intel.com>
-Date: Mon, 10 Mar 2014 22:02:26 +0200
-Subject: iwlwifi: mvm: Change beacon filter enablement condition
-
-From: Alexander Bondar <alexander.bondar@intel.com>
-
-commit c63722cfd441bd3a99c65fa4c40bc65d7776e772 upstream.
-
-Enable beacon filter only if at least one beacon from candidate
-AP is received before or after association. Check this condition before
-enabling BF upon secured association completion. Add BF enablement to
-mac80211 event that indicates beacon is received after association.
-Too early beacon filtering enablement can lead to disconnection due to
-missing AP's beacon after association.
-
-Signed-off-by: Alexander Bondar <alexander.bondar@intel.com>
-Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/net/wireless/iwlwifi/mvm/mac80211.c |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
---- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c
-+++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c
-@@ -971,6 +971,7 @@ static void iwl_mvm_bss_info_changed_sta
-                */
-               iwl_mvm_remove_time_event(mvm, mvmvif,
-                                         &mvmvif->time_event_data);
-+              WARN_ON(iwl_mvm_enable_beacon_filter(mvm, vif, CMD_SYNC));
-       } else if (changes & (BSS_CHANGED_PS | BSS_CHANGED_P2P_PS |
-                             BSS_CHANGED_QOS)) {
-               ret = iwl_mvm_power_update_mode(mvm, vif);
-@@ -1304,7 +1305,9 @@ static int iwl_mvm_mac_sta_state(struct
-       } else if (old_state == IEEE80211_STA_ASSOC &&
-                  new_state == IEEE80211_STA_AUTHORIZED) {
-               /* enable beacon filtering */
--              WARN_ON(iwl_mvm_enable_beacon_filter(mvm, vif));
-+              if (vif->bss_conf.dtim_period)
-+                      WARN_ON(iwl_mvm_enable_beacon_filter(mvm, vif,
-+                                                           CMD_SYNC));
-               ret = 0;
-       } else if (old_state == IEEE80211_STA_AUTHORIZED &&
-                  new_state == IEEE80211_STA_ASSOC) {

diff --git a/queue-3.14/series b/queue-3.14/series
index d3182fc4f2ee42002f52c9d12807b6b2b057566b..2bb24349704335d9ff2e4af57c48d99cb3bd08b0 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -24,4 +24,3 @@ iwlwifi-mvm-avoid-searching-unnecessary-columns.patch
 iwlwifi-mvm-rs-fix-and-cleanup-rs_get_rate_action.patch
 iwlwifi-mvm-rs-reinit-rs-if-no-tx-for-a-long-time.patch
 iwlwifi-7000-bump-api-to-9.patch
-iwlwifi-mvm-change-beacon-filter-enablement-condition.patch