Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cc313d40 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Greg Kroah-Hartman
Browse files

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



commit 9e80ad37f6788ed52b89a3cfcd593e0aa69b216d upstream.

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.

Tested: QCA6174 hw3.2 PCI with WLAN.RM.2.0-00180-QCARMSWPZ-1
Tested: QCA6174 hw3.2 SDIO with WLAN.RMH.4.4.1-00007-QCARMSWP-1

Fixes: cd93b83a ("ath10k: support for multicast rate control")
Fixes: f279294e9ee2 ("ath10k: add support for configuring management packet rate")
Cc: stable@vger.kernel.org
Reviewed-by: default avatarBrian Norris <briannorris@chromium.org>
Tested-by: default avatarBrian Norris <briannorris@chromium.org>
Tested-by: default avatarClaire Chang <tientzu@chromium.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d0a5000f

drivers/net/wireless/ath/ath10k/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -5622,7 +5622,7 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw, 
	}



	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;