delete iwlwifi-mvm-inc-pending-frames-counter-also-when-txing-non-sta.patch from...

diff --git a/queue-3.10/iwlwifi-mvm-inc-pending-frames-counter-also-when-txing-non-sta.patch b/queue-3.10/iwlwifi-mvm-inc-pending-frames-counter-also-when-txing-non-sta.patch
deleted file mode 100644 (file)
index fc3ca02..0000000
--- a/queue-3.10/iwlwifi-mvm-inc-pending-frames-counter-also-when-txing-non-sta.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From fb896c44f88a75843a072cd6961b1615732f7811 Mon Sep 17 00:00:00 2001
-From: Liad Kaufman <liad.kaufman@intel.com>
-Date: Sun, 14 Feb 2016 15:32:58 +0200
-Subject: iwlwifi: mvm: inc pending frames counter also when txing non-sta
-
-From: Liad Kaufman <liad.kaufman@intel.com>
-
-commit fb896c44f88a75843a072cd6961b1615732f7811 upstream.
-
-Until this patch, when TXing non-sta the pending_frames counter
-wasn't increased, but it WAS decreased in
-iwl_mvm_rx_tx_cmd_single(), what makes it negative in certain
-conditions. This in turn caused much trouble when we need to
-remove the station since we won't be waiting forever until
-pending_frames gets 0. In certain cases, we were exhausting
-the station table even in BSS mode, because we had a lot of
-stale stations.
-
-Increase the counter also in iwl_mvm_tx_skb_non_sta() after a
-successful TX to avoid this outcome.
-
-Signed-off-by: Liad Kaufman <liad.kaufman@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/tx.c |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/drivers/net/wireless/iwlwifi/mvm/tx.c
-+++ b/drivers/net/wireless/iwlwifi/mvm/tx.c
-@@ -340,6 +340,15 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mv
-               return -1;
-       }
- 
-+      /*
-+       * Increase the pending frames counter, so that later when a reply comes
-+       * in and the counter is decreased - we don't start getting negative
-+       * values.
-+       * Note that we don't need to make sure it isn't agg'd, since we're
-+       * TXing non-sta
-+       */
-+      atomic_inc(&mvm->pending_frames[sta_id]);
-+
-       return 0;
- }
- 

diff --git a/queue-3.10/series b/queue-3.10/series
index aad31b6263e2a38b935e42834dff72eeb38ded81..fdcf9032dbea99cc25489822fcc15c4166b92ee5 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -3,7 +3,6 @@ tracing-fix-check-for-cpu-online-when-event-is-disabled.patch
 asoc-wm8994-fix-enum-ctl-accesses-in-a-wrong-type.patch
 asoc-wm8958-fix-enum-ctl-accesses-in-a-wrong-type.patch
 wext-fix-message-delay-ordering.patch
-iwlwifi-mvm-inc-pending-frames-counter-also-when-txing-non-sta.patch
 mac80211-fix-use-of-uninitialised-values-in-rx-aggregation.patch
 mac80211-minstrel_ht-set-default-tx-aggregation-timeout-to-0.patch
 powerpc-fix-dedotify-for-binutils-2.26.patch

diff --git a/queue-3.14/iwlwifi-mvm-inc-pending-frames-counter-also-when-txing-non-sta.patch b/queue-3.14/iwlwifi-mvm-inc-pending-frames-counter-also-when-txing-non-sta.patch
deleted file mode 100644 (file)
index c57a0dc..0000000
--- a/queue-3.14/iwlwifi-mvm-inc-pending-frames-counter-also-when-txing-non-sta.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From fb896c44f88a75843a072cd6961b1615732f7811 Mon Sep 17 00:00:00 2001
-From: Liad Kaufman <liad.kaufman@intel.com>
-Date: Sun, 14 Feb 2016 15:32:58 +0200
-Subject: iwlwifi: mvm: inc pending frames counter also when txing non-sta
-
-From: Liad Kaufman <liad.kaufman@intel.com>
-
-commit fb896c44f88a75843a072cd6961b1615732f7811 upstream.
-
-Until this patch, when TXing non-sta the pending_frames counter
-wasn't increased, but it WAS decreased in
-iwl_mvm_rx_tx_cmd_single(), what makes it negative in certain
-conditions. This in turn caused much trouble when we need to
-remove the station since we won't be waiting forever until
-pending_frames gets 0. In certain cases, we were exhausting
-the station table even in BSS mode, because we had a lot of
-stale stations.
-
-Increase the counter also in iwl_mvm_tx_skb_non_sta() after a
-successful TX to avoid this outcome.
-
-Signed-off-by: Liad Kaufman <liad.kaufman@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/tx.c |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/drivers/net/wireless/iwlwifi/mvm/tx.c
-+++ b/drivers/net/wireless/iwlwifi/mvm/tx.c
-@@ -341,6 +341,15 @@ int iwl_mvm_tx_skb_non_sta(struct iwl_mv
-               return -1;
-       }
- 
-+      /*
-+       * Increase the pending frames counter, so that later when a reply comes
-+       * in and the counter is decreased - we don't start getting negative
-+       * values.
-+       * Note that we don't need to make sure it isn't agg'd, since we're
-+       * TXing non-sta
-+       */
-+      atomic_inc(&mvm->pending_frames[sta_id]);
-+
-       return 0;
- }
- 

diff --git a/queue-3.14/series b/queue-3.14/series
index dd577f6c48b64b35a16940945a0355a548dfa2cf..c1ccaa7cdb41d3b2623bd94c28d915044b4db936 100644 (file)
--- a/queue-3.14/series
+++ b/queue-3.14/series
@@ -4,7 +4,6 @@ tracing-fix-check-for-cpu-online-when-event-is-disabled.patch
 asoc-wm8994-fix-enum-ctl-accesses-in-a-wrong-type.patch
 asoc-wm8958-fix-enum-ctl-accesses-in-a-wrong-type.patch
 wext-fix-message-delay-ordering.patch
-iwlwifi-mvm-inc-pending-frames-counter-also-when-txing-non-sta.patch
 mac80211-fix-use-of-uninitialised-values-in-rx-aggregation.patch
 mac80211-minstrel_ht-set-default-tx-aggregation-timeout-to-0.patch
 powerpc-fix-dedotify-for-binutils-2.26.patch