aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAyala Beker <ayala.beker@intel.com>2016-02-03 08:36:52 -0500
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2016-04-12 03:03:16 -0400
commitcd49727e1a2bccc4ff008dde24c2f8430dd9e368 (patch)
tree3cc86961b7cd4aa07396778be035f5e5f20836d8
parentd34475b964b01067ed25187c4f52d8bdf2c0e113 (diff)
iwlwifi: mvm: avoid to WARN about gscan capabilities
Gscan capabilities were updated with new capabilities supported by the device. Update GSCAN capabilities TLV and avoid to WARN if the firmware does not have the new capabilities. Signed-off-by: Ayala Beker <ayala.beker@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-rw-r--r--drivers/net/wireless/intel/iwlwifi/iwl-drv.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index f899666acb41..33d0d51e32e9 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -1060,11 +1060,18 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
1060 return -EINVAL; 1060 return -EINVAL;
1061 } 1061 }
1062 1062
1063 if (WARN(fw_has_capa(capa, IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT) && 1063 /*
1064 !gscan_capa, 1064 * If ucode advertises that it supports GSCAN but GSCAN
1065 "GSCAN is supported but capabilities TLV is unavailable\n")) 1065 * capabilities TLV is not present, or if it has an old format,
1066 * warn and continue without GSCAN.
1067 */
1068 if (fw_has_capa(capa, IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT) &&
1069 !gscan_capa) {
1070 IWL_DEBUG_INFO(drv,
1071 "GSCAN is supported but capabilities TLV is unavailable\n");
1066 __clear_bit((__force long)IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT, 1072 __clear_bit((__force long)IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT,
1067 capa->_capa); 1073 capa->_capa);
1074 }
1068 1075
1069 return 0; 1076 return 0;
1070 1077