diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-09-06 12:47:39 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-09-13 14:18:38 -0400 |
| commit | 4bae7d976976fa52d345805ba686934cd548343e (patch) | |
| tree | 506f76621e94c4505b4ee018c920cd74ed2bb314 /net | |
| parent | bac2555c6d86387132930af4d14cb47c4dd3f4f7 (diff) | |
| download | linux-3.10-4bae7d976976fa52d345805ba686934cd548343e.tar.gz linux-3.10-4bae7d976976fa52d345805ba686934cd548343e.tar.bz2 linux-3.10-4bae7d976976fa52d345805ba686934cd548343e.zip | |
mac80211: fix missing sta_lock in __sta_info_destroy
Since my commit 34e895075e21be3e21e71d6317440d1ee7969ad0
("mac80211: allow station add/remove to sleep") there is
a race in mac80211 when it clears the TIM bit because a
sleeping station disconnected, the spinlock isn't held
around the relevant code any more. Use the right API to
acquire the spinlock correctly.
Cc: stable@kernel.org [2.6.34+]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/sta_info.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 3db78b696c5..21070e9bc8d 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -665,7 +665,7 @@ static int __must_check __sta_info_destroy(struct sta_info *sta) BUG_ON(!sdata->bss); atomic_dec(&sdata->bss->num_sta_ps); - __sta_info_clear_tim_bit(sdata->bss, sta); + sta_info_clear_tim_bit(sta); } local->num_sta--; |