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

Commit 536a3eee authored by Emmanuel Grumbach's avatar Emmanuel Grumbach
Browse files

iwlwifi: remove IWL_UCODE_TLV_FLAGS_SCHED_SCAN flag 



All the supported firmwares have this flag set.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 3afec639

drivers/net/wireless/iwlwifi/iwl-fw.h

+0 −2
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ 
 *	from the probe request template.

 * @IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_SMALL: new NS offload (small version)

 * @IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_LARGE: new NS offload (large version)

 * @IWL_UCODE_TLV_FLAGS_SCHED_SCAN: this uCode image supports scheduled scan.

 * @IWL_UCODE_TLV_FLAGS_STA_KEY_CMD: new ADD_STA and ADD_STA_KEY command API

 * @IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD: support device wide power command

 *	containing CAM (Continuous Active Mode) indication.
@@ -107,7 +106,6 @@ enum iwl_ucode_tlv_flag { 
	IWL_UCODE_TLV_FLAGS_NO_BASIC_SSID	= BIT(12),

	IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_SMALL	= BIT(15),

	IWL_UCODE_TLV_FLAGS_NEW_NSOFFL_LARGE	= BIT(16),

	IWL_UCODE_TLV_FLAGS_SCHED_SCAN		= BIT(17),

	IWL_UCODE_TLV_FLAGS_STA_KEY_CMD		= BIT(19),

	IWL_UCODE_TLV_FLAGS_DEVICE_PS_CMD	= BIT(20),

	IWL_UCODE_TLV_FLAGS_P2P_PM		= BIT(21),

drivers/net/wireless/iwlwifi/mvm/mac80211.c

+5 −8
Original line number Diff line number Diff line
@@ -362,14 +362,11 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
	else

		hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;



	if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_SCHED_SCAN) {

	hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_SCHED_SCAN;

	hw->wiphy->max_sched_scan_ssids = PROBE_OPTION_MAX;

	hw->wiphy->max_match_sets = IWL_SCAN_MAX_PROFILES;

	/* we create the 802.11 header and zero length SSID IE. */

		hw->wiphy->max_sched_scan_ie_len =

					SCAN_OFFLOAD_PROBE_REQ_SIZE - 24 - 2;

	}

	hw->wiphy->max_sched_scan_ie_len = SCAN_OFFLOAD_PROBE_REQ_SIZE - 24 - 2;



	hw->wiphy->features |= NL80211_FEATURE_P2P_GO_CTWIN |

			       NL80211_FEATURE_P2P_GO_OPPPS;