From: Greg Kroah-Hartman Date: Mon, 14 Mar 2016 17:10:31 +0000 (-0700) Subject: delete iwlwifi-mvm-inc-pending-frames-counter-also-when-txing-non-sta.patch from... X-Git-Tag: v4.4.6~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=edf16ec70028a87f1f392641ce3d984f3b2a3a91;p=thirdparty%2Fkernel%2Fstable-queue.git delete iwlwifi-mvm-inc-pending-frames-counter-also-when-txing-non-sta.patch from 3.10 and 3.14 --- 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 index fc3ca029229..00000000000 --- 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 -Date: Sun, 14 Feb 2016 15:32:58 +0200 -Subject: iwlwifi: mvm: inc pending frames counter also when txing non-sta - -From: Liad Kaufman - -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 -Signed-off-by: Emmanuel Grumbach -Signed-off-by: Greg Kroah-Hartman - ---- - 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 aad31b6263e..fdcf9032dbe 100644 --- 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 index c57a0dcc730..00000000000 --- 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 -Date: Sun, 14 Feb 2016 15:32:58 +0200 -Subject: iwlwifi: mvm: inc pending frames counter also when txing non-sta - -From: Liad Kaufman - -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 -Signed-off-by: Emmanuel Grumbach -Signed-off-by: Greg Kroah-Hartman - ---- - 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 dd577f6c48b..c1ccaa7cdb4 100644 --- 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