iwlwifi: mvm: add support for net detect

[cascardo/linux.git] / drivers / net / wireless / iwlwifi / mvm / d3.c

diff --git a/drivers/net/wireless/iwlwifi/mvm/d3.c b/drivers/net/wireless/iwlwifi/mvm/d3.c
index 0fc72fc..3c66028 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/iwlwifi/mvm/d3.c
@@ -1030,13 +1030,15 @@ 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,
-                                                &mvm->nd_ies);
+               ret = iwl_mvm_scan_offload_start(
+                       mvm, vif,
+                       wowlan->nd_config ?: mvm->nd_config,
+                       &mvm->nd_ies);
                if (ret)
                        goto out;
        } else {