]> git.baikalelectronics.ru Git - kernel.git/commit
mac80211: don't reconfigure sched scan in case of wowlan
authorEliad Peller <eliad@wizery.com>
Sun, 25 Oct 2015 08:59:33 +0000 (10:59 +0200)
committerJohannes Berg <johannes.berg@intel.com>
Tue, 3 Nov 2015 09:42:05 +0000 (10:42 +0100)
commit7da7448e392554f4c435536af337731424e8c70e
tree0f8e7a81bc3843836a4557cb8adbe5d9a34ff34f
parentc877763af3b7dadb8cb0f8c4579c9a76f202848a
mac80211: don't reconfigure sched scan in case of wowlan

Scheduled scan has to be reconfigured only if wowlan wasn't
configured, since otherwise it should continue to run (with
the 'any' trigger) or be aborted.

The current code will end up asking the driver to start a new
scheduled scan without stopping the previous one, and leaking
some memory (from the previous request.)

Fix this by doing the abort/restart under the proper conditions.

Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
net/mac80211/cfg.c
net/mac80211/ieee80211_i.h
net/mac80211/pm.c
net/mac80211/scan.c
net/mac80211/util.c