diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2011-09-06 12:47:39 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:40:28 -0700 |
| commit | e74aa3593a0026ea78b3997c3b7748f536e17f66 (patch) | |
| tree | d709f7031fb2eae91eefa79552cb6dbf87f0dad6 /net/mac80211 | |
| parent | 377a4a241c44d46335b45e00c8a66d39b072fd2f (diff) | |
| download | kernel_samsung_smdk4412-e74aa3593a0026ea78b3997c3b7748f536e17f66.zip kernel_samsung_smdk4412-e74aa3593a0026ea78b3997c3b7748f536e17f66.tar.gz kernel_samsung_smdk4412-e74aa3593a0026ea78b3997c3b7748f536e17f66.tar.bz2 | |
mac80211: fix missing sta_lock in __sta_info_destroy
commit 4bae7d976976fa52d345805ba686934cd548343e upstream.
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.
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>
Diffstat (limited to 'net/mac80211')
| -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 b83870b..ca7bf10 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c @@ -669,7 +669,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--; |