Patchwork ath10k: Drop WARN_ON()s that always trigger during system resume

login
register
mail settings
Submitter Rafael J. Wysocki
Date March 1, 2019, 12:51 p.m.
Message ID <3687330.FyvvPAkb64@aspire.rjw.lan>
Download mbox | patch
Permalink /patch/739309/
State New
Headers show

Comments

Rafael J. Wysocki - March 1, 2019, 12:51 p.m.
rom: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

ath10k_mac_vif_chan() always returns an error for the given vif
during system-wide resume which reliably triggers two WARN_ON()s
in ath10k_bss_info_changed() and they are not particularly
useful in that code path, so drop them.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
 drivers/net/wireless/ath/ath10k/mac.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Kalle Valo - March 1, 2019, 1:45 p.m.
"Rafael J. Wysocki" <rjw@rjwysocki.net> writes:

> rom: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

'F' chraracter is missing.

> ath10k_mac_vif_chan() always returns an error for the given vif
> during system-wide resume which reliably triggers two WARN_ON()s
> in ath10k_bss_info_changed() and they are not particularly
> useful in that code path, so drop them.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

And could you CC linux-wireless, please? That way the patchwork will see
it and I can take it directly from there.
Rafael J. Wysocki - March 3, 2019, 5:24 p.m.
On Friday, March 1, 2019 2:45:29 PM CET Kalle Valo wrote:
> "Rafael J. Wysocki" <rjw@rjwysocki.net> writes:
> 
> > rom: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> 'F' chraracter is missing.
> 
> > ath10k_mac_vif_chan() always returns an error for the given vif
> > during system-wide resume which reliably triggers two WARN_ON()s
> > in ath10k_bss_info_changed() and they are not particularly
> > useful in that code path, so drop them.
> >
> > Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> And could you CC linux-wireless, please? That way the patchwork will see
> it and I can take it directly from there.

Done, thank you!

Patch

Index: linux-pm/drivers/net/wireless/ath/ath10k/mac.c
===================================================================
--- linux-pm.orig/drivers/net/wireless/ath/ath10k/mac.c
+++ linux-pm/drivers/net/wireless/ath/ath10k/mac.c
@@ -5705,7 +5705,7 @@  static void ath10k_bss_info_changed(stru
 	}
 
 	if (changed & BSS_CHANGED_MCAST_RATE &&
-	    !WARN_ON(ath10k_mac_vif_chan(arvif->vif, &def))) {
+	    !ath10k_mac_vif_chan(arvif->vif, &def)) {
 		band = def.chan->band;
 		rateidx = vif->bss_conf.mcast_rate[band] - 1;
 
@@ -5743,7 +5743,7 @@  static void ath10k_bss_info_changed(stru
 	}
 
 	if (changed & BSS_CHANGED_BASIC_RATES) {
-		if (WARN_ON(ath10k_mac_vif_chan(vif, &def))) {
+		if (ath10k_mac_vif_chan(vif, &def)) {
 			mutex_unlock(&ar->conf_mutex);
 			return;
 		}