]> www.infradead.org Git - users/jedix/linux-maple.git/commit
mac80211: don't stop a single aggregation session twice
authorJohannes Berg <johannes.berg@intel.com>
Thu, 24 Nov 2011 19:06:14 +0000 (20:06 +0100)
committerMaxim Uvarov <maxim.uvarov@oracle.com>
Fri, 16 Dec 2011 01:14:26 +0000 (17:14 -0800)
commit4fb51035bd255771c587c529f6bc25a716edd582
tree42e4839b97c56d27ce8dcc68ebe1ba6618e54139
parenta9d0902b84b9c4c81adcef0c76cf24b5c9531b87
mac80211: don't stop a single aggregation session twice

commit 24f50a9d165745fd0701c6e089d35f58a229ea69 upstream.

Nikolay noticed (by code review) that mac80211 can
attempt to stop an aggregation session while it is
already being stopped. So to fix it, check whether
stop is already being done and bail out if so.

Also move setting the STOPPING state into the lock
so things are properly atomic.

Reported-by: Nikolay Martynov <mar.kolya@gmail.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>
net/mac80211/agg-tx.c