summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-12-07 09:02:21 +0100
committerRohan Somvanshi <rsomvanshi@nvidia.com>2012-01-11 09:25:08 -0800
commitae4e74ce84045b33347bfa3291a891887e80e857 (patch)
tree2972fedfef6de7b5b373a301e831d48383b7f1f6 /sound
parenta5059ed60e37ce3c2f4a1bada2efabf58ab8eaeb (diff)
mac80211: fix another race in aggregation start
commit 15062e6a8524f5977f2cbdf6e3eb2f144262f74e upstream. Emmanuel noticed that when mac80211 stops the queues for aggregation that can leave a packet pending. This packet will be given to the driver after the AMPDU callback, but as a non-aggregated packet which messes up the sequence number etc. I also noticed by looking at the code that if packets are being processed while we clear the WANT_START bit, they might see it cleared already and queue up on tid_tx->pending. If the driver then rejects the new aggregation session we leak the packet. Fix both of these issues by changing this code to not stop the queues at all. Instead, let packets queue up on the tid_tx->pending queue instead of letting them get to the driver, and add code to recover properly in case the driver rejects the session. (The patch looks large because it has to move two functions to before their new use.) Reported-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Change-Id: Ic5bebbd132f1d56ef3d99143f5386d58b4da318e Reviewed-on: http://git-master/r/74166 Reviewed-by: Varun Wadekar <vwadekar@nvidia.com> Tested-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'sound')
0 files changed, 0 insertions, 0 deletions