* [PATCH] iwlwifi: mld: fix building with CONFIG_PM_SLEEP disabled
@ 2025-03-25 8:43 Arnd Bergmann
2025-03-30 4:49 ` Korenblit, Miriam Rachel
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2025-03-25 8:43 UTC (permalink / raw)
To: Miri Korenblit
Cc: Arnd Bergmann, Johannes Berg, Emmanuel Grumbach, Benjamin Berg,
Anjaneyulu, linux-wireless, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
The newly added driver causes multiple build problems when CONFIG_PM_SLEEP is
disabled:
drivers/net/wireless/intel/iwlwifi/mld/mac80211.c:1982:12: error: 'iwl_mld_resume' defined but not used [-Werror=unused-function]
1982 | static int iwl_mld_resume(struct ieee80211_hw *hw)
| ^~~~~~~~~~~~~~
drivers/net/wireless/intel/iwlwifi/mld/mac80211.c:1960:1: error: 'iwl_mld_suspend' defined but not used [-Werror=unused-function]
1960 | iwl_mld_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
| ^~~~~~~~~~~~~~~
drivers/net/wireless/intel/iwlwifi/mld/mac80211.c:1946:13: error: 'iwl_mld_set_wakeup' defined but not used [-Werror=unused-function]
1946 | static void iwl_mld_set_wakeup(struct ieee80211_hw *hw, bool enabled)
| ^~~~~~~~~~~~~~~~~~
drivers/net/wireless/intel/iwlwifi/mld/mac80211.c: In function 'iwl_mld_mac80211_start':
drivers/net/wireless/intel/iwlwifi/mld/mac80211.c:504:20: error: 'ret' is used uninitialized [-Werror=uninitialized]
504 | if (!in_d3 || ret) {
| ^~
drivers/net/wireless/intel/iwlwifi/mld/mac80211.c:478:13: note: 'ret' was declared here
478 | int ret;
| ^~~
Hide the unused functions and make sure the 'ret' variable is not used
before the initialization.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
index 6851064b82da..0b5bc5abb82d 100644
--- a/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
@@ -501,7 +501,7 @@ int iwl_mld_mac80211_start(struct ieee80211_hw *hw)
iwl_mld_restart_cleanup(mld);
}
- if (!in_d3 || ret) {
+ if (!in_d3) {
ret = iwl_mld_start_fw(mld);
if (ret)
goto error;
@@ -537,7 +537,8 @@ void iwl_mld_mac80211_stop(struct ieee80211_hw *hw, bool suspend)
/* if the suspend flow fails the fw is in error. Stop it here, and it
* will be started upon wakeup
*/
- if (!suspend || iwl_mld_no_wowlan_suspend(mld))
+ if (!suspend ||
+ (IS_ENABLED(CONFIG_PM_SLEEP) && iwl_mld_no_wowlan_suspend(mld)))
iwl_mld_stop_fw(mld);
/* HW is stopped, no more coming RX. OTOH, the worker can't run as the
@@ -1943,6 +1944,7 @@ static void iwl_mld_sta_rc_update(struct ieee80211_hw *hw,
}
}
+#ifdef CONFIG_PM_SLEEP
static void iwl_mld_set_wakeup(struct ieee80211_hw *hw, bool enabled)
{
struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw);
@@ -1994,6 +1996,7 @@ static int iwl_mld_resume(struct ieee80211_hw *hw)
return 0;
}
+#endif
static int iwl_mld_alloc_ptk_pn(struct iwl_mld *mld,
struct iwl_mld_sta *mld_sta,
--
2.39.5
^ permalink raw reply [flat|nested] 3+ messages in thread* RE: [PATCH] iwlwifi: mld: fix building with CONFIG_PM_SLEEP disabled
2025-03-25 8:43 [PATCH] iwlwifi: mld: fix building with CONFIG_PM_SLEEP disabled Arnd Bergmann
@ 2025-03-30 4:49 ` Korenblit, Miriam Rachel
2025-04-06 13:54 ` Lukas Wunner
0 siblings, 1 reply; 3+ messages in thread
From: Korenblit, Miriam Rachel @ 2025-03-30 4:49 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Arnd Bergmann, Berg, Johannes, Grumbach, Emmanuel, Berg,
Benjamin, Anjaneyulu, Pagadala Yesu, linux-wireless,
linux-kernel
> -----Original Message-----
> From: Arnd Bergmann <arnd@kernel.org>
> Sent: Tuesday, 25 March 2025 10:44
> To: Korenblit, Miriam Rachel <miriam.rachel.korenblit@intel.com>
> Cc: Arnd Bergmann <arnd@arndb.de>; Berg, Johannes
> <johannes.berg@intel.com>; Grumbach, Emmanuel
> <emmanuel.grumbach@intel.com>; Berg, Benjamin <benjamin.berg@intel.com>;
> Anjaneyulu, Pagadala Yesu <pagadala.yesu.anjaneyulu@intel.com>; linux-
> wireless@vger.kernel.org; linux-kernel@vger.kernel.org
> Subject: [PATCH] iwlwifi: mld: fix building with CONFIG_PM_SLEEP disabled
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> The newly added driver causes multiple build problems when CONFIG_PM_SLEEP
> is
> disabled:
>
> drivers/net/wireless/intel/iwlwifi/mld/mac80211.c:1982:12: error:
> 'iwl_mld_resume' defined but not used [-Werror=unused-function]
> 1982 | static int iwl_mld_resume(struct ieee80211_hw *hw)
> | ^~~~~~~~~~~~~~
> drivers/net/wireless/intel/iwlwifi/mld/mac80211.c:1960:1: error:
> 'iwl_mld_suspend' defined but not used [-Werror=unused-function]
> 1960 | iwl_mld_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan
> *wowlan)
> | ^~~~~~~~~~~~~~~
> drivers/net/wireless/intel/iwlwifi/mld/mac80211.c:1946:13: error:
> 'iwl_mld_set_wakeup' defined but not used [-Werror=unused-function]
> 1946 | static void iwl_mld_set_wakeup(struct ieee80211_hw *hw, bool enabled)
> | ^~~~~~~~~~~~~~~~~~
> drivers/net/wireless/intel/iwlwifi/mld/mac80211.c: In function
> 'iwl_mld_mac80211_start':
> drivers/net/wireless/intel/iwlwifi/mld/mac80211.c:504:20: error: 'ret' is used
> uninitialized [-Werror=uninitialized]
> 504 | if (!in_d3 || ret) {
> | ^~
> drivers/net/wireless/intel/iwlwifi/mld/mac80211.c:478:13: note: 'ret' was
> declared here
> 478 | int ret;
> | ^~~
>
> Hide the unused functions and make sure the 'ret' variable is not used before the
> initialization.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
> b/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
> index 6851064b82da..0b5bc5abb82d 100644
> --- a/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
> +++ b/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
> @@ -501,7 +501,7 @@ int iwl_mld_mac80211_start(struct ieee80211_hw *hw)
> iwl_mld_restart_cleanup(mld);
> }
>
> - if (!in_d3 || ret) {
> + if (!in_d3) {
Then where do you handle the in_d3 && ret case?
> ret = iwl_mld_start_fw(mld);
> if (ret)
> goto error;
> @@ -537,7 +537,8 @@ void iwl_mld_mac80211_stop(struct ieee80211_hw *hw,
> bool suspend)
> /* if the suspend flow fails the fw is in error. Stop it here, and it
> * will be started upon wakeup
> */
> - if (!suspend || iwl_mld_no_wowlan_suspend(mld))
> + if (!suspend ||
> + (IS_ENABLED(CONFIG_PM_SLEEP) &&
> iwl_mld_no_wowlan_suspend(mld)))
> iwl_mld_stop_fw(mld);
>
> /* HW is stopped, no more coming RX. OTOH, the worker can't run as the
> @@ -1943,6 +1944,7 @@ static void iwl_mld_sta_rc_update(struct
> ieee80211_hw *hw,
> }
> }
>
> +#ifdef CONFIG_PM_SLEEP
> static void iwl_mld_set_wakeup(struct ieee80211_hw *hw, bool enabled) {
> struct iwl_mld *mld = IWL_MAC80211_GET_MLD(hw); @@ -1994,6
> +1996,7 @@ static int iwl_mld_resume(struct ieee80211_hw *hw)
>
> return 0;
> }
> +#endif
>
> static int iwl_mld_alloc_ptk_pn(struct iwl_mld *mld,
> struct iwl_mld_sta *mld_sta,
> --
> 2.39.5
>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] iwlwifi: mld: fix building with CONFIG_PM_SLEEP disabled
2025-03-30 4:49 ` Korenblit, Miriam Rachel
@ 2025-04-06 13:54 ` Lukas Wunner
0 siblings, 0 replies; 3+ messages in thread
From: Lukas Wunner @ 2025-04-06 13:54 UTC (permalink / raw)
To: Korenblit, Miriam Rachel
Cc: Arnd Bergmann, Arnd Bergmann, Berg, Johannes, Grumbach, Emmanuel,
Berg, Benjamin, Anjaneyulu, Pagadala Yesu, linux-wireless,
linux-kernel
On Sun, Mar 30, 2025 at 04:49:38AM +0000, Korenblit, Miriam Rachel wrote:
> > From: Arnd Bergmann <arnd@kernel.org>
> > Sent: Tuesday, 25 March 2025 10:44
> >
> > The newly added driver causes multiple build problems when CONFIG_PM_SLEEP
> > is disabled:
[...]
> > --- a/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
> > +++ b/drivers/net/wireless/intel/iwlwifi/mld/mac80211.c
> > @@ -501,7 +501,7 @@ int iwl_mld_mac80211_start(struct ieee80211_hw *hw)
> > iwl_mld_restart_cleanup(mld);
> > }
> >
> > - if (!in_d3 || ret) {
> > + if (!in_d3) {
>
> Then where do you handle the in_d3 && ret case?
That seems to be a valid objection, yet Arnd's patch is now
commit 44605365f935 in wireless.git:
https://git.kernel.org/wireless/wireless/c/44605365f935
I'm proposing this v2:
https://lore.kernel.org/r/f435bd9c8186176ffa12fd3650fac71cacdeebe1.1743946314.git.lukas@wunner.de/
If wireless.git/main is a rebasing branch, consider replacing the
above-linked commit with the new version. If it is not a rebasing
branch, let me know and I'll send a patch reinstating only the ret
in the if-condition.
Thanks,
Lukas
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2025-04-06 13:54 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-03-25 8:43 [PATCH] iwlwifi: mld: fix building with CONFIG_PM_SLEEP disabled Arnd Bergmann
2025-03-30 4:49 ` Korenblit, Miriam Rachel
2025-04-06 13:54 ` Lukas Wunner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®