Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git [Linux 5.1]

Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git [Linux 5.1]

This Linux kernel change "Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git" is included in the Linux 5.1 release. This change is authored by Kalle Valo <kvalo [at] codeaurora.org> on Mon Apr 29 19:33:33 2019 +0300. The commit for this change in Linux stable tree is 7a0f8ad (patch). Other info about this change: Merge: 5c40353 9e80ad3

Merge ath-current from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git

ath.git fixes for 5.1. Major changes:

ath10k

* fix locking problem with crashdump

* fix warnings during suspend and resume

There is no are 0 lines of Linux source code added/deleted in this change. Code changes to Linux kernel are as follows.

 drivers/net/wireless/ath/ath10k/mac.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 41e89db..9c703d2 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -5774,7 +5774,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;

@@ -5812,7 +5812,7 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw,
    }

    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;
        }

Leave a Reply

Your email address will not be published. Required fields are marked *