iwlwifi: mvm: enable pre-scan passive to active (26e05cc3) · Commits · 戴 / test

drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -138,6 +138,8 @@ struct iwl_ssid_ie {
		*@SCAN_FLAGS_DELAYED_SCAN_LOWBAND:
		*@SCAN_FLAGS_DELAYED_SCAN_HIGHBAND:
		*@SCAN_FLAGS_FRAGMENTED_SCAN:
		*@SCAN_FLAGS_PASSIVE2ACTIVE: use active scan on channels that was active
		* in the past hour, even if they are marked as passive.
		*/
		enum iwl_scan_flags {
		SCAN_FLAGS_PERIODIC_SCAN = BIT(0),
		@@ -145,6 +147,7 @@ enum iwl_scan_flags {
		SCAN_FLAGS_DELAYED_SCAN_LOWBAND = BIT(2),
		SCAN_FLAGS_DELAYED_SCAN_HIGHBAND = BIT(3),
		SCAN_FLAGS_FRAGMENTED_SCAN = BIT(4),
		SCAN_FLAGS_PASSIVE2ACTIVE = BIT(5),
		};

		/**
		@@ -179,7 +182,7 @@ enum iwl_scan_type {
		* @quiet_time: in msecs, dwell this time for active scan on quiet channels
		* @quiet_plcp_th: quiet PLCP threshold (channel is quiet if less than
		* this number of packets were received (typically 1)
		* @passive2active: is auto switching from passive to active allowed (0 or 1)
		* @passive2active: is auto switching from passive to active during scan allowed
		* @rxchain_sel_flags: RXON_RX_CHAIN_*
		* @max_out_time: in usecs, max out of serving channel time
		* @suspend_time: how long to pause scan when returning to service channel:

+2 −0

Original line number	Diff line number	Diff line
		@@ -306,10 +306,12 @@ int iwl_mvm_scan_request(struct iwl_mvm *mvm,
		*/
		if (req->n_ssids > 0) {
		cmd->passive2active = cpu_to_le16(1);
		cmd->scan_flags \|= SCAN_FLAGS_PASSIVE2ACTIVE;
		ssid = req->ssids[0].ssid;
		ssid_len = req->ssids[0].ssid_len;
		} else {
		cmd->passive2active = 0;
		cmd->scan_flags &= ~SCAN_FLAGS_PASSIVE2ACTIVE;
		}

		iwl_mvm_scan_fill_ssids(cmd, req);