iwlwifi: queue user-initiated scan when doing internal scan
authorJohannes Berg <johannes.berg@intel.com>
Tue, 18 May 2010 09:29:13 +0000 (02:29 -0700)
committerReinette Chatre <reinette.chatre@intel.com>
Sun, 6 Jun 2010 06:20:08 +0000 (23:20 -0700)
commitf84b29ec0a1ab767679d3f2428877b65f94bc3ff
treea507271a8575e324872929484a73512d3af578bd
parent0e1654fa2b91324ab91019c7dfabf3518aca54dd
iwlwifi: queue user-initiated scan when doing internal scan

The internal scanning created a problem where
when userspace tries to scan, the scan gets
rejected. Instead of doing that, queue up the
user-initiated scan when doing an internal
scan.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
drivers/net/wireless/iwlwifi/iwl-core.c
drivers/net/wireless/iwlwifi/iwl-dev.h
drivers/net/wireless/iwlwifi/iwl-scan.c