From: Ilan Peer Date: Sun, 28 Apr 2013 05:18:28 +0000 (+0300) Subject: iwlwifi: mvm: Always use SCAN_TYPE_FORCED X-Git-Tag: v3.9.5~112 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=321964d0b629c6c7ed43bb4eee990bab1561d9b7;p=people%2Fms%2Flinux.git iwlwifi: mvm: Always use SCAN_TYPE_FORCED commit f70ed7b330ce769828d402f920fb13da6c13ea63 upstream. The FW AUX framework does not handle well cases where time events fail to be scheduled (and as a result issues assert 0x3330). Until a proper fix is in place, WA this by always setting the scan type to SCAN_TYPE_FORCED. Signed-off-by: Ilan Peer Reviewed-by: Emmanuel Grumbach Signed-off-by: Johannes Berg Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c index 9b21b92aa8d1..5c52faa54b3a 100644 --- a/drivers/net/wireless/iwlwifi/mvm/scan.c +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c @@ -298,6 +298,12 @@ int iwl_mvm_scan_request(struct iwl_mvm *mvm, else cmd->type = cpu_to_le32(SCAN_TYPE_FORCED); + /* + * TODO: This is a WA due to a bug in the FW AUX framework that does not + * properly handle time events that fail to be scheduled + */ + cmd->type = cpu_to_le32(SCAN_TYPE_FORCED); + cmd->repeats = cpu_to_le32(1); /*