On Mon, Mar 14, 2016 at 02:16:48PM +0100, Jiri Slaby wrote: > From: Liad Kaufman <liad.kaufman@xxxxxxxxx> > > This patch has been added to the 3.12 stable tree. If you have any > objections, please let us know. > Please note that this patch was tagged for stable 3.18+. Cheers, -- Luís > =============== > > 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: Jiri Slaby <jslaby@xxxxxxx> > --- > drivers/net/wireless/iwlwifi/mvm/tx.c | 9 +++++++++ > 1 file changed, 9 insertions(+) > > diff --git a/drivers/net/wireless/iwlwifi/mvm/tx.c b/drivers/net/wireless/iwlwifi/mvm/tx.c > index c95b4aac1317..cfa221b25ae0 100644 > --- 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_mvm *mvm, struct sk_buff *skb) > 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; > } > > -- > 2.7.3 > > -- > 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