Skip to content

Commit

Permalink
wifi: iwlwifi: mld: reduce scope for uninitialized variable
Browse files Browse the repository at this point in the history
After resuming from D3, keeping the connection or disconnecting
isn't relevant for the case of netdetect.
Reduce the scope of the keep_connection indicator to wowlan only.

Fixes: d1e879e ("wifi: iwlwifi: add iwlmld sub-driver")
Signed-off-by: Yedidya Benshimol <yedidya.ben.shimol@intel.com>
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://patch.msgid.link/20250401064530.769f76a9ad6e.I69e8f194997eb3a20e40d27fdc31002d5753d905@changeid
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Yedidya Benshimol authored and Johannes Berg committed Apr 2, 2025
1 parent 1a9239b commit 99f201a
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions drivers/net/wireless/intel/iwlwifi/mld/d3.c
Original file line number Diff line number Diff line change
Expand Up @@ -1895,7 +1895,6 @@ int iwl_mld_wowlan_resume(struct iwl_mld *mld)
int link_id;
int ret;
bool fw_err = false;
bool keep_connection;

lockdep_assert_wiphy(mld->wiphy);

Expand Down Expand Up @@ -1965,19 +1964,18 @@ int iwl_mld_wowlan_resume(struct iwl_mld *mld)
iwl_mld_process_netdetect_res(mld, bss_vif, &resume_data);
mld->netdetect = false;
} else {
keep_connection =
bool keep_connection =
iwl_mld_process_wowlan_status(mld, bss_vif,
resume_data.wowlan_status);

/* EMLSR state will be cleared if the connection is not kept */
if (keep_connection)
iwl_mld_unblock_emlsr(mld, bss_vif,
IWL_MLD_EMLSR_BLOCKED_WOWLAN);
else
ieee80211_resume_disconnect(bss_vif);
}

if (!mld->netdetect && !keep_connection)
ieee80211_resume_disconnect(bss_vif);

goto out;

err:
Expand Down

0 comments on commit 99f201a

Please sign in to comment.