Skip to content

Commit afb7070

Browse files
committed
wifi: iwlwifi: mld: reduce scope for uninitialized variable
JIRA: https://issues.redhat.com/browse/RHEL-89168 commit 99f201a Author: Yedidya Benshimol <[email protected]> Date: Tue Apr 1 06:45:54 2025 +0300 wifi: iwlwifi: mld: reduce scope for uninitialized variable 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 <[email protected]> Signed-off-by: Miri Korenblit <[email protected]> Link: https://patch.msgid.link/20250401064530.769f76a9ad6e.I69e8f194997eb3a20e40d27fdc31002d5753d905@changeid Signed-off-by: Johannes Berg <[email protected]> Signed-off-by: Jose Ignacio Tornos Martinez <[email protected]>
1 parent d918145 commit afb7070

File tree

1 file changed

+3
-5
lines changed
  • drivers/net/wireless/intel/iwlwifi/mld

1 file changed

+3
-5
lines changed

drivers/net/wireless/intel/iwlwifi/mld/d3.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1895,7 +1895,6 @@ int iwl_mld_wowlan_resume(struct iwl_mld *mld)
18951895
int link_id;
18961896
int ret;
18971897
bool fw_err = false;
1898-
bool keep_connection;
18991898

19001899
lockdep_assert_wiphy(mld->wiphy);
19011900

@@ -1965,19 +1964,18 @@ int iwl_mld_wowlan_resume(struct iwl_mld *mld)
19651964
iwl_mld_process_netdetect_res(mld, bss_vif, &resume_data);
19661965
mld->netdetect = false;
19671966
} else {
1968-
keep_connection =
1967+
bool keep_connection =
19691968
iwl_mld_process_wowlan_status(mld, bss_vif,
19701969
resume_data.wowlan_status);
19711970

19721971
/* EMLSR state will be cleared if the connection is not kept */
19731972
if (keep_connection)
19741973
iwl_mld_unblock_emlsr(mld, bss_vif,
19751974
IWL_MLD_EMLSR_BLOCKED_WOWLAN);
1975+
else
1976+
ieee80211_resume_disconnect(bss_vif);
19761977
}
19771978

1978-
if (!mld->netdetect && !keep_connection)
1979-
ieee80211_resume_disconnect(bss_vif);
1980-
19811979
goto out;
19821980

19831981
err:

0 commit comments

Comments
 (0)