From: Johannes Berg <johannes.berg@intel.com>
Date: Tue, 18 May 2010 09:29:13 +0000 (-0700)
Subject: iwlwifi: queue user-initiated scan when doing internal scan
X-Git-Tag: v2.6.36-rc1~571^2~615^2~15
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f84b29ec0a1ab767679d3f2428877b65f94bc3ff;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed