> > Commit e3d4bc8cc0230e8dc8033484666f03f87392a8c4 upstream. > > Backported for 3.9-stable. Reinstated IWL_FIRST_AMPDU_QUEUE which was > obsoleted by IWL_MVM_FIRST_AGG_QUEUE in 398e8c6 3.10-rc1. And adjusted > context. > > From: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx> > > Move the counter for non-AMPDU frames to mvm. It is needed for the drain > flow which happens once the ieee80211_sta has been freed, so keeping it in > iwl_mvm_sta which is embed into ieee80211_sta is not a good idea. > > Also, since its purpose it to remove the STA in the fw only after all the frames > for this station have exited the shared Tx queues, we need to decrement it in > the reclaim flow. This flow can happen after ieee80211_sta has been removed, > which means that we have no iwl_mvm_sta there. So we can't know what is the > vif type. Hence, we know audit these frames for all the vif types. > In order to avoid spawning sta_drained_wk all the time, we now check that we > are in a flow in which draining might happen - only when mvmsta is NULL. This > is better than previous code that would spawn sta_drained_wk all the time in > AP mode. > > Cc: stable@xxxxxxxxxxxxxxx [3.9] > Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@xxxxxxxxx> > Reviewed-by: Ilan Peer <ilan.peer@xxxxxxxxx> > Reviewed-by: Johannes Berg <johannes.berg@xxxxxxxxx> > Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx> > Signed-off-by: Lingzhu Xiang <lxiang@xxxxxxxxxx> > Thanks! --------------------------------------------------------------------- A member of the Intel Corporation group of companies This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. -- 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