Messages in this thread Patch in this message | ![/](/images/icornerl.gif) | | From | Greg Kroah-Hartman <> | Subject | [PATCH 4.4 27/50] iwlwifi: mvm: inc pending frames counter also when txing non-sta | Date | Mon, 14 Mar 2016 10:50:45 -0700 |
| |
4.4-stable review patch. If anyone has any objections, please let me know.
------------------
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 @@ -421,6 +421,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; }
| ![\](/images/icornerr.gif) |