]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
mac80211: synchronize scan off/on-channel and PS states
authorStanislaw Gruszka <sgruszka@redhat.com>
Thu, 20 Dec 2012 13:41:18 +0000 (14:41 +0100)
committerJohannes Berg <johannes.berg@intel.com>
Wed, 16 Jan 2013 14:06:18 +0000 (15:06 +0100)
commitaacde9ee45225f7e0b90960f479aef83c66bfdc0
tree50a7b363fde4cbc30aa0ba22bef4bbe27701c4ea
parent1626e0fa740dec8665a973cf2349405cdfeb46dc
mac80211: synchronize scan off/on-channel and PS states

Since:

commit b23b025fe246f3acc2988eb6d400df34c27cb8ae
Author: Ben Greear <greearb@candelatech.com>
Date:   Fri Feb 4 11:54:17 2011 -0800

    mac80211: Optimize scans on current operating channel.

we do not disable PS while going back to operational channel (on
ieee80211_scan_state_suspend) and deffer that until scan finish.
But since we are allowed to send frames, we can send a frame to AP
without PM bit set, so disable PS on AP side. Then when we switch
to off-channel (in ieee80211_scan_state_resume) we do not enable PS.
Hence we are off-channel with PS disabled, frames are not buffered
by AP.

To fix remove offchannel_ps_disable argument and always enable PS when
going off-channel and disable it when going on-channel, like it was
before.

Cc: stable@vger.kernel.org # 2.6.39+
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Tested-by: Seth Forshee <seth.forshee@canonical.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/ieee80211_i.h
net/mac80211/offchannel.c
net/mac80211/scan.c