Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd49727e authored by Ayala Beker's avatar Ayala Beker Committed by Emmanuel Grumbach
Browse files

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: default avatarAyala Beker <ayala.beker@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent d34475b9

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+10 −3
Original line number Diff line number Diff line
@@ -1060,11 +1060,18 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv, 
		return -EINVAL;

	}



	if (WARN(fw_has_capa(capa, IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT) &&

		 !gscan_capa,

		 "GSCAN is supported but capabilities TLV is unavailable\n"))

	/*

	 * If ucode advertises that it supports GSCAN but GSCAN

	 * capabilities TLV is not present, or if it has an old format,

	 * warn and continue without GSCAN.

	 */

	if (fw_has_capa(capa, IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT) &&

	    !gscan_capa) {

		IWL_DEBUG_INFO(drv,

			       "GSCAN is supported but capabilities TLV is unavailable\n");

		__clear_bit((__force long)IWL_UCODE_TLV_CAPA_GSCAN_SUPPORT,

			    capa->_capa);

	}



	return 0;