On Fri, Mar 11, 2016 at 11:03:55PM -0800, Greg Kroah-Hartman wrote: > > This is a note to let you know that I've just added the patch titled > > iwlwifi: mvm: inc pending frames counter also when txing non-sta > > to the 3.10-stable tree which can be found at: > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > The filename of the patch is: > iwlwifi-mvm-inc-pending-frames-counter-also-when-txing-non-sta.patch > and it can be found in the queue-3.10 subdirectory. > > If you, or anyone else, feels it should not be added to the stable tree, > please let <stable@xxxxxxxxxxxxxxx> know about it. Please note that this patch was tagged for stable 3.18+. Cheers, -- Luís > > > From fb896c44f88a75843a072cd6961b1615732f7811 Mon Sep 17 00:00:00 2001 > From: Liad Kaufman <liad.kaufman@xxxxxxxxx> > 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@xxxxxxxxx> > > 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@xxxxxxxxx> > Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx> > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > --- > 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; > } > > > > Patches currently in stable-queue which might be from liad.kaufman@xxxxxxxxx are > > queue-3.10/iwlwifi-mvm-inc-pending-frames-counter-also-when-txing-non-sta.patch > -- > To unsubscribe from this list: send the line "unsubscribe stable" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html