summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-09-15 15:37:02 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-09-15 15:37:02 -0400
commit8ea9ac0a47a179bf404b4f451e5e82cffe11940d (patch)
tree13f313c34a63e745865b0bef0863cd8d2f05aa32 /net
parent31dda0ae933bb9fea9cfe000b698c41af0417cac (diff)
parent282cdb325aea4ebbc42ce753b47cc96145eb54bc (diff)
downloadlinux-sh-8ea9ac0a47a179bf404b4f451e5e82cffe11940d.tar.gz
Merge branch 'master' of git://git.infradead.org/users/linville/wireless into for-davem
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/sta_info.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 3db78b696c5c..21070e9bc8d0 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--;