OSDN Git Service

mac80211: fix RX aggregation locking
authorJohannes Berg <johannes.berg@intel.com>
Mon, 29 Nov 2010 10:09:16 +0000 (11:09 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 29 Nov 2010 20:30:30 +0000 (15:30 -0500)
commitdd318575ff0aae91ac4cbcc5b60c184e59267212
tree140a0104b99b8edef7b961b4de9182e092782cf9
parent8b7f8532d15631776ce8bec2bbbc58f6aad738d1
mac80211: fix RX aggregation locking

The RX aggregation locking documentation was
wrong, which led Christian to also code the
timer timeout handling for it somewhat wrongly.

Fix the documentation, the two places that
need to hold the reorder lock across accesses
to the structure, and the debugfs code that
should just use RCU.

Also, remove acquiring the sta->lock across
reorder timeouts since it isn't necessary, and
change a few places to GFP_KERNEL because the
code path here doesn't need atomic allocations
as I noticed when reviewing all this.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Christian Lamparter <chunkeey@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/agg-rx.c
net/mac80211/debugfs_sta.c
net/mac80211/rx.c
net/mac80211/sta_info.h