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

Commit c55385f5 authored Oct 24, 2014 by Luciano Coelho Committed by Emmanuel Grumbach Nov 24, 2014

iwlwifi: mvm: add support for net detect



Add the net detect WoWLAN flag to indicate support and use the
nd_config from the WoWLAN configuration to start net detect, if it is
set.  The WoWLAN configuration takes precedence over the debugfs
configuration.

Signed-off-by: Luciano Coelho <luciano.coelho@intel.com>
Reviewed-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

parent 686e7fe1

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

+5 −3

Original line number	Diff line number	Diff line
		@@ -1030,12 +1030,14 @@ static int __iwl_mvm_suspend(struct ieee80211_hw *hw,
		vif, mvmvif, ap_sta);
		if (ret)
		goto out;
		} else if (mvm->nd_config) {
		} else if (wowlan->nd_config \|\| mvm->nd_config) {
		ret = iwl_mvm_switch_to_d3(mvm);
		if (ret)
		goto out;

		ret = iwl_mvm_scan_offload_start(mvm, vif, mvm->nd_config,
		ret = iwl_mvm_scan_offload_start(
		mvm, vif,
		wowlan->nd_config ?: mvm->nd_config,
		&mvm->nd_ies);
		if (ret)
		goto out;

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -467,7 +467,8 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
		mvm->wowlan.flags = WIPHY_WOWLAN_MAGIC_PKT \|
		WIPHY_WOWLAN_DISCONNECT \|
		WIPHY_WOWLAN_EAP_IDENTITY_REQ \|
		WIPHY_WOWLAN_RFKILL_RELEASE;
		WIPHY_WOWLAN_RFKILL_RELEASE \|
		WIPHY_WOWLAN_NET_DETECT;
		if (!iwlwifi_mod_params.sw_crypto)
		mvm->wowlan.flags \|= WIPHY_WOWLAN_SUPPORTS_GTK_REKEY \|
		WIPHY_WOWLAN_GTK_REKEY_FAILURE \|
		@@ -476,6 +477,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
		mvm->wowlan.n_patterns = IWL_WOWLAN_MAX_PATTERNS;
		mvm->wowlan.pattern_min_len = IWL_WOWLAN_MIN_PATTERN_LEN;
		mvm->wowlan.pattern_max_len = IWL_WOWLAN_MAX_PATTERN_LEN;
		mvm->wowlan.max_nd_match_sets = IWL_SCAN_MAX_PROFILES;
		mvm->wowlan.tcp = &iwl_mvm_wowlan_tcp_support;
		hw->wiphy->wowlan = &mvm->wowlan;
		}