diff options
author | David S. Miller <davem@davemloft.net> | 2010-11-29 19:19:09 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-29 19:19:09 (GMT) |
commit | 77148625e10d0fda50d05e92d199c0df17b66e9a (patch) | |
tree | fdb5bb1e06933dc8891a3c4d3c93c371801d8b37 /net/mac80211/rx.c | |
parent | a41778694806ac1ccd4b1dafed1abef8d5ba98ac (diff) | |
parent | 51cce8a590c4696d62bfacc63378d1036084cef7 (diff) | |
download | linux-fsl-qoriq-77148625e10d0fda50d05e92d199c0df17b66e9a.tar.xz |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r-- | net/mac80211/rx.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 902b03ee..d2fcd22 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -1102,8 +1102,6 @@ static void ap_sta_ps_end(struct sta_info *sta) atomic_dec(&sdata->bss->num_sta_ps); - clear_sta_flags(sta, WLAN_STA_PS_STA); - #ifdef CONFIG_MAC80211_VERBOSE_PS_DEBUG printk(KERN_DEBUG "%s: STA %pM aid %d exits power save mode\n", sdata->name, sta->sta.addr, sta->sta.aid); |