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)
commit0d440ea294a00b60ced66c0bc5cb5caa42fd4fbd
tree0f8e7a81bc3843836a4557cb8adbe5d9a34ff34f
parent968a76cef3d1bb9a3b4d135cd788056e742859f3
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