aboutsummaryrefslogtreecommitdiff
path: root/drivers/net
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-12-07 09:02:21 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-12-07 15:09:53 -0500
commit15062e6a8524f5977f2cbdf6e3eb2f144262f74e (patch)
tree264d7fec9152ea4ce7cb176be94dc7a5e332093a /drivers/net
parent162d12de656bc76786ba5fad6dac7bd238de9657 (diff)
downloadlinux-linaro-15062e6a8524f5977f2cbdf6e3eb2f144262f74e.tar.gz
mac80211: fix another race in aggregation start
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.) Cc: stable@vger.kernel.org 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>
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions